Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

On branch edburns-msft-1410-arquillian-version #1441

Merged
merged 2 commits into from
Aug 13, 2024
Merged

On branch edburns-msft-1410-arquillian-version #1441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cc9c8d
On branch edburns-msft-1410-arquillian-version
edburns Aug 7, 2024
38c4539
On branch edburns-msft-1410-arquillian-version Ensure 1.9.1.Final of …
edburns Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@ el/bundle
jakartaeetck-bundles/
/tck-env.cfg
.DS_Store
wip-find.txt
3 changes: 2 additions & 1 deletion cdi-ee-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<maven.compiler.release>17</maven.compiler.release>
<testng.version>7.9.0</testng.version>
<jboss.test.audit.version>2.0.0.Final</jboss.test.audit.version>
<arquillian.version>1.8.0.Final</arquillian.version>
<arquillian.version>1.9.1.Final</arquillian.version>
<arquillian.container.se.api.version>1.0.2.Final</arquillian.container.se.api.version>
<apache.httpclient.version>3.1</apache.httpclient.version>
<htmlunit.version>2.50.0</htmlunit.version>
Expand Down Expand Up @@ -168,6 +168,7 @@
<dependency>
<groupId>org.jboss.shrinkwrap.descriptors</groupId>
<artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
<version>2.0.0</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion core-profile-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<!-- Jakarta EE APIs Core -->
<annotations.api.version>2.1.1</annotations.api.version>
<apache.httpclient.version>3.1</apache.httpclient.version>
<arquillian.container.se.api.version>1.0.1.Final</arquillian.container.se.api.version>

<cdi.api.version>4.0.0</cdi.api.version>
<cdi.tck.version>4.0.6</cdi.tck.version>
<!-- Required for distribution build, should be overriden for each build -->
Expand Down
1 change: 0 additions & 1 deletion glassfish-runner/cdi-model-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<version>1.7.0.Alpha10</version>
<scope>test</scope>
</dependency>

Expand Down
16 changes: 8 additions & 8 deletions glassfish-runner/cdi-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,20 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>1.8.0.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>4.1.0</version>
</dependency>

<dependency>
<groupId>org.jboss.shrinkwrap.descriptors</groupId>
<artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
<version>2.0.0</version>
</dependency>


</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -264,7 +265,6 @@
<dependency>
<groupId>org.jboss.arquillian.testng</groupId>
<artifactId>arquillian-testng-container</artifactId>
<version>1.8.0.Final</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
12 changes: 0 additions & 12 deletions glassfish-runner/concurrency-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,6 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>1.8.0.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- Jakarta EE APIs -->
<dependency>
Expand Down
3 changes: 0 additions & 3 deletions glassfish-runner/javaee-module-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<groupId>org.glassfish</groupId>
<artifactId>standalone-tck</artifactId>
<version>11.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>jakarta</groupId>
<artifactId>glassfish.javaee-module-tck</artifactId>
Expand Down Expand Up @@ -53,7 +52,6 @@
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-container</artifactId>
<version>1.7.0.Alpha10</version>
</dependency>
<dependency>
<groupId>jakarta.platform</groupId>
Expand All @@ -69,7 +67,6 @@
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-spi</artifactId>
<version>1.7.0.Alpha10</version>
</dependency>
<dependency>
<groupId>org.omnifaces.arquillian</groupId>
Expand Down
3 changes: 0 additions & 3 deletions glassfish-runner/jaxrs-platform-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,14 @@
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-container</artifactId>
<version>1.7.0.Final</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-core</artifactId>
<version>1.7.0.Final</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-spi</artifactId>
<version>1.7.0.Alpha10</version>
</dependency>
<dependency>
<groupId>org.omnifaces.arquillian</groupId>
Expand Down
5 changes: 0 additions & 5 deletions glassfish-runner/jsonb-platform-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,13 @@
<groupId>org.glassfish</groupId>
<artifactId>standalone-tck</artifactId>
<version>11.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>jakarta</groupId>
<artifactId>glassfish.jsonb-platform-tck</artifactId>
<version>11.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
<arquillian.junit>1.7.0.Alpha14</arquillian.junit>
<!-- Use JDK17 to run with GF 8.0.0-JDK17-M5 -->
<glassfish.container.version>8.0.0-JDK17-M5</glassfish.container.version>
<!-- Use JDK21 to run with GF 8.0.0-M5 -->
Expand Down Expand Up @@ -77,7 +75,6 @@
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-spi</artifactId>
<version>${arquillian.junit}</version>
</dependency>
<dependency>
<groupId>org.glassfish.main.common</groupId>
Expand All @@ -87,12 +84,10 @@
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-container</artifactId>
<version>${arquillian.junit}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-core</artifactId>
<version>${arquillian.junit}</version>
</dependency>
<dependency>
<groupId>org.omnifaces.arquillian</groupId>
Expand Down
5 changes: 0 additions & 5 deletions glassfish-runner/jsonp-platform-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,13 @@
<groupId>org.glassfish</groupId>
<artifactId>standalone-tck</artifactId>
<version>11.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>jakarta</groupId>
<artifactId>glassfish.jsonp-platform-tck</artifactId>
<version>11.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
<arquillian.junit>1.7.0.Alpha14</arquillian.junit>
<!-- Use JDK17 to run with GF 8.0.0-JDK17-M5 -->
<glassfish.container.version>8.0.0-JDK17-M5</glassfish.container.version>
<!-- Use JDK21 to run with GF 8.0.0-M5 -->
Expand Down Expand Up @@ -77,7 +75,6 @@
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-spi</artifactId>
<version>${arquillian.junit}</version>
</dependency>
<dependency>
<groupId>org.glassfish.main.common</groupId>
Expand All @@ -87,12 +84,10 @@
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-container</artifactId>
<version>${arquillian.junit}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-core</artifactId>
<version>${arquillian.junit}</version>
</dependency>
<dependency>
<groupId>org.omnifaces.arquillian</groupId>
Expand Down
3 changes: 0 additions & 3 deletions glassfish-runner/jsp-platform-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<groupId>org.glassfish</groupId>
<artifactId>standalone-tck</artifactId>
<version>11.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>jakarta</groupId>
<artifactId>glassfish.jsp-tck</artifactId>
Expand Down Expand Up @@ -84,7 +83,6 @@
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-container</artifactId>
<version>1.7.0.Alpha10</version>
</dependency>
<dependency>
<groupId>jakarta.platform</groupId>
Expand All @@ -105,7 +103,6 @@
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-spi</artifactId>
<version>1.7.0.Alpha10</version>
</dependency>
<dependency>
<groupId>org.omnifaces.arquillian</groupId>
Expand Down
3 changes: 0 additions & 3 deletions glassfish-runner/jstl-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<groupId>org.glassfish</groupId>
<artifactId>standalone-tck</artifactId>
<version>11.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>jakarta</groupId>
<artifactId>glassfish.jstl-tck</artifactId>
Expand Down Expand Up @@ -68,7 +67,6 @@
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-container</artifactId>
<version>1.7.0.Alpha10</version>
</dependency>
<dependency>
<groupId>jakarta.platform</groupId>
Expand All @@ -89,7 +87,6 @@
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-spi</artifactId>
<version>1.7.0.Alpha10</version>
</dependency>
<dependency>
<groupId>org.omnifaces.arquillian</groupId>
Expand Down
7 changes: 6 additions & 1 deletion glassfish-runner/pages-tck/pages-tck-run/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,15 @@
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>1.8.0.Final</version>
<version>1.9.1.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
23 changes: 14 additions & 9 deletions glassfish-runner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,24 +45,29 @@

<properties>
<glassfish-artifact-id>glassfish</glassfish-artifact-id>

<glassfish.container.version>7.0.0</glassfish.container.version>
<glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
<jakarta.rest.version>3.1.0</jakarta.rest.version>
<jakarta.rest.version>3.1.0</jakarta.rest.version>
<json.tck.version>2.1.0</json.tck.version>
<json.tck.version>2.1.0</json.tck.version>

<jsonb.tck.version>3.0.0</jsonb.tck.version>

<jsonb.tck.version>3.0.0</jsonb.tck.version>

<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<tck.artifactId>jakarta-restful-ws-tck</tck.artifactId>
<tck.artifactId>jakarta-restful-ws-tck</tck.artifactId>
<arquillian.version>1.9.1.Final</arquillian.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>${arquillian.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>


<repositories>
<repository>
<id>central</id>
Expand Down
7 changes: 0 additions & 7 deletions glassfish-runner/rest-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,6 @@ mvn clean install -Dgroups=security

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>1.8.0.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
Expand Down
17 changes: 16 additions & 1 deletion glassfish-runner/servlet-tck/servlet-tck-run/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,25 @@
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>1.8.0.Final</version>
<version>1.9.1.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
<version>3.3.0</version>
</dependency>

<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven-archive</artifactId>
<version>3.3.0</version>
</dependency>

</dependencies>

</dependencyManagement>

<dependencies>
Expand Down Expand Up @@ -126,6 +140,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions glassfish-runner/websocket-tck/websocket-tck-run/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<packaging>jar</packaging>

<properties>
<arquillian.version>1.9.1.Final</arquillian.version>
<glassfish.home>${glassfish.root}/glassfish8</glassfish.home>
<glassfish.root>${project.build.directory}</glassfish.root>

Expand All @@ -46,7 +47,7 @@
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>1.8.0.Final</version>
<version>${arquillian.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -87,7 +88,6 @@
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-container</artifactId>
<version>1.8.0.Final</version>
<scope>test</scope>
</dependency>

Expand Down
Loading
Loading