Skip to content

Commit

Permalink
Merge pull request #23416 from arjantijms/test_deps
Browse files Browse the repository at this point in the history 
Update test dependencies (junit/testng/easymock)
  • Loading branch information
@arjantijms
arjantijms authored Mar 10, 2021
2 parents 516e786 + 7d1c103 commit 38db39d
Show file tree
Hide file tree
Showing 75 changed files with 78 additions and 105 deletions.
2 changes: 1 addition & 1 deletion appserver/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
<schema2beans.version>6.7</schema2beans.version>
<derby.version>10.15.2.0</derby.version>
<wsdl4j.version>1.5.0</wsdl4j.version>
<easymock.version>3.5</easymock.version>
<easymock.version>4.2</easymock.version>
<maven-rar-plugin.version>2.4</maven-rar-plugin.version>
</properties>

Expand Down
1 change: 0 additions & 1 deletion appserver/tests/admingui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
23 changes: 0 additions & 23 deletions appserver/tests/amx/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,19 +69,6 @@


</plugins>

<!--
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>org/glassfish/admin/amx/cmd/*.properties</include>
<include>org/glassfish/admin/amx/dotted/*.properties</include>
</includes>
</resource>
</resources>
-->

</build>


Expand All @@ -107,20 +94,10 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<!--
<dependency>
<groupId>org.glassfish.tests</groupId>
<artifactId>utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
-->

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>compile</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/appserv-tests/devtests/admin/cli/apps/Zombie/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/appserv-tests/devtests/naming/naming2/context/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/appserv-tests/devtests/security/soteria/common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/appserv-tests/devtests/security/soteria/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...ts/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...ests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 0 additions & 2 deletions appserver/tests/embedded/basic/lifecycle/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
</dependency>
</dependencies>
</profile>
Expand All @@ -77,7 +76,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
</dependency>
<dependency>
<groupId>org.glassfish.main.extras</groupId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/tests/embedded/cdi_basic/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
</dependency>
</dependencies>
</profile>
Expand All @@ -80,7 +80,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
</dependency>
<dependency>
<groupId>org.glassfish.main.extras</groupId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/tests/embedded/cdi_ejb_jpa/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
</dependency>
</dependencies>
</profile>
Expand All @@ -80,7 +80,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
</dependency>
<dependency>
<groupId>org.glassfish.main.extras</groupId>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/embedded/ejb/basic/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/embedded/ejb/ejb-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/embedded/ejb/ejb-main/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/embedded/ejb/remoteejb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions appserver/tests/embedded/glassfish_resources_xml/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
</dependency>
</dependencies>
</profile>
Expand All @@ -80,7 +80,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
</dependency>
<dependency>
<groupId>org.glassfish.main.extras</groupId>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/embedded/inplanted/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
</dependency>
<dependency>
<groupId>org.glassfish.main.web</groupId>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/embedded/maven-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
</dependency>
<dependency>
<groupId>jakarta.faces</groupId>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/embedded/mysql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/embedded/scatteredarchive/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion appserver/tests/embedded/servlet_runs_admin_cmds/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/embedded/static/ejb/simple/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/embedded/static/web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/embedded/utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
</dependency>
</dependencies>
</project>
Loading

0 comments on commit 38db39d

Please sign in to comment.