Skip to content

Commit

Permalink
Merge pull request #556 from KyleAure/update-arquillian-bom
Browse files Browse the repository at this point in the history
  • Loading branch information
@KyleAure
KyleAure authored Aug 16, 2024
2 parents 1a93f01 + 6e272bb commit 765e3f5
Show file tree
Hide file tree
Showing 7 changed files with 159 additions and 80 deletions.
17 changes: 14 additions & 3 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,17 @@ jobs:
java-version: ${{ matrix.java-version }}
distribution: 'temurin'
cache: maven
- name: Build with Maven
#TODO remove -Pstaging once all Jakarta EE 11 dependencies are GA
run: mvn -B -Pstaging package --file pom.xml
- name: Build project
run: mvn -B package --file pom.xml
verify:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- name: Set up JDK 21
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with:
java-version: 21
distribution: 'temurin'
cache: maven
- name: Analyze starters
run: mvn dependency:analyze --file tck-dist/src/main/starter/pom.xml
27 changes: 10 additions & 17 deletions api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,6 @@
<url>https://github.com/jakartaee/concurrency</url>
</scm>

<properties>
<!-- default is the same for backward compatibility reason
Easy to override when building with a system property -->
<spec.version>3.2</spec.version>
</properties>

<dependencies>
<dependency>
<groupId>jakarta.interceptor</groupId>
Expand All @@ -60,7 +54,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -70,7 +63,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<version>${maven.complier.plugin.version}</version>
<configuration>
<source>21</source>
<target>21</target>
Expand All @@ -81,7 +74,7 @@
<plugin>
<groupId>org.glassfish.build</groupId>
<artifactId>spec-version-maven-plugin</artifactId>
<version>2.2</version>
<version>${spec.version.plugin.version}</version>
<configuration>
<spec>
<specVersion>${spec.version}</specVersion>
Expand All @@ -103,7 +96,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.9</version>
<version>${maven.bundle.plugin.version}</version>
<configuration>
<supportedProjectTypes>
<supportedProjectType>jar</supportedProjectType>
Expand Down Expand Up @@ -136,7 +129,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.2</version>
<version>${maven.jar.plugin.version}</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
Expand All @@ -153,7 +146,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.8.0</version>
<version>${maven.javadoc.plugin.version}</version>
<executions>
<execution>
<id>attach-api-javadocs</id>
Expand Down Expand Up @@ -190,7 +183,7 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.1</version>
<version>${maven.source.plugin.version}</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -205,7 +198,7 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.6.0</version>
<version>${build.helper.plugin.version}</version>
<executions>
<execution>
<id>add-resource</id>
Expand All @@ -232,7 +225,7 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>3.4.0</version>
<version>${maven.jxr.plugin.version}</version>
<executions>
<execution>
<goals>
Expand All @@ -244,13 +237,13 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.3.1</version>
<version>${maven.surefire.version}</version>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.6.0</version>
<version>${flatten.maven.plugin.version}</version>
<configuration>
<flattenMode>ossrh</flattenMode>
</configuration>
Expand Down
80 changes: 76 additions & 4 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,26 +68,98 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<spec.version>3.2</spec.version>

<maven.compiler.release>21</maven.compiler.release>
<maven.site.skip>true</maven.site.skip>

<maven.antrun.plugin.version>3.1.0</maven.antrun.plugin.version>
<maven.assembly.plugin.version>3.7.1</maven.assembly.plugin.version>
<maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version>
<maven.checkstyle.plugin.version>3.4.0</maven.checkstyle.plugin.version>
<maven.complier.plugin.version>3.13.0</maven.complier.plugin.version>
<maven.dependency.plugin.version>3.7.0</maven.dependency.plugin.version>
<maven.enforcer.plugin.version>3.5.0</maven.enforcer.plugin.version>
<maven.jar.plugin.version>3.4.2</maven.jar.plugin.version>
<maven.javadoc.plugin.version>3.7.0</maven.javadoc.plugin.version>
<maven.jxr.plugin.version>3.4.0</maven.jxr.plugin.version>
<maven.release.plugin.version>3.1.0</maven.release.plugin.version>
<maven.scm.provider.gitexe.version>2.1.0</maven.scm.provider.gitexe.version>
<maven.source.plugin.version>3.3.1</maven.source.plugin.version>
<maven.surefire.version>3.3.0</maven.surefire.version>

<build.helper.plugin.version>3.6.0</build.helper.plugin.version>
<exec.maven.plugin.version>3.3.0</exec.maven.plugin.version>
<flatten.maven.plugin.version>1.6.0</flatten.maven.plugin.version>
<spec.version.plugin.version>2.2</spec.version.plugin.version>

<checkstyle.version>10.17.0</checkstyle.version>
<checkstyle.excludes></checkstyle.excludes>

<asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
<asciidoctorj.version>2.5.13</asciidoctorj.version>
<asciidoctorj.pdf.version>2.3.17</asciidoctorj.pdf.version>
<jruby.version>9.4.8.0</jruby.version>

<!-- Used in TCK only -->
<junit5.version>5.11.0</junit5.version>
<arquillian.version>1.9.1.Final</arquillian.version>
<arquillian.jakarta.version>10.0.0.Final</arquillian.jakarta.version>
<shrinkwrap.version>1.2.6</shrinkwrap.version>
<shrinkwrap.resolver.version>3.3.0</shrinkwrap.resolver.version>
<sigtest.version>2.3</sigtest.version>

<jakarta.servlet.version>6.1.0</jakarta.servlet.version>
<jakarta.ejb.version>4.0.1</jakarta.ejb.version>
<jakarta.jsp.version>4.0.0</jakarta.jsp.version>
<jakarta.annotation.version>3.0.0</jakarta.annotation.version>
<jakarta.interceptor.version>2.2.0</jakarta.interceptor.version>
<jakarta.cdi.version>4.1.0</jakarta.cdi.version>
<jakarta.concurrent.version>${project.version}</jakarta.concurrent.version>
<jakarta.ejb.version>4.0.1</jakarta.ejb.version>
<jakarta.interceptor.version>2.2.0</jakarta.interceptor.version>
<jakarta.jsp.version>4.0.0</jakarta.jsp.version>
<jakarta.servlet.version>6.1.0</jakarta.servlet.version>

</properties>

<dependencyManagement>
<dependencies>
<!-- BOMs -->
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${junit5.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>${arquillian.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.jakarta</groupId>
<artifactId>arquillian-jakarta-bom</artifactId>
<version>${arquillian.jakarta.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-bom</artifactId>
<version>${shrinkwrap.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-bom</artifactId>
<version>${shrinkwrap.resolver.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- provided -->
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
Expand Down
18 changes: 4 additions & 14 deletions specification/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,12 @@

<properties>
<site.output.dir>${project.build.directory}/staging</site.output.dir>
<maven.site.skip>true</maven.site.skip>

<asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
<asciidoctorj.version>2.5.13</asciidoctorj.version>
<asciidoctorj.pdf.version>2.3.18</asciidoctorj.pdf.version>
<jruby.version>9.4.8.0</jruby.version>

<!-- status: DRAFT, BETA, etc., or blank for final -->
<status>DRAFT</status>

<maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format>
<revisiondate>${maven.build.timestamp}</revisiondate>

<!-- default is the same for backward compatibility reason
Easy to override when building with a system property -->
<spec.version>${project.version}</spec.version>
</properties>

<build>
Expand All @@ -70,7 +60,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.5.0</version>
<version>${maven.enforcer.plugin.version}</version>
<executions>
<execution>
<id>enforce-maven</id>
Expand Down Expand Up @@ -180,7 +170,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.1.1</version>
<version>${maven.release.plugin.version}</version>
<configuration>
<mavenExecutorId>forked-path</mavenExecutorId>
<useReleaseProfile>false</useReleaseProfile>
Expand All @@ -190,7 +180,7 @@
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>2.1.0</version>
<version>${maven.scm.provider.gitexe.version}</version>
</dependency>
</dependencies>
</plugin>
Expand All @@ -201,7 +191,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.7.1</version>
<version>${maven.assembly.plugin.version}</version>
<inherited>false</inherited>
<executions>
<execution>
Expand Down
21 changes: 6 additions & 15 deletions tck-dist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,6 @@
</license>
</licenses>

<properties>
<jakarta.concurrent.version>${project.version}</jakarta.concurrent.version>

<maven.site.skip>true</maven.site.skip>
<asciidoctor-maven.version>3.0.0</asciidoctor-maven.version>
<asciidoctorj-pdf.version>2.3.18</asciidoctorj-pdf.version>
<maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
</properties>

<dependencies>
<dependency>
<groupId>jakarta.enterprise.concurrent</groupId>
Expand All @@ -77,7 +68,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<version>${maven.complier.plugin.version}</version>
<configuration>
<source>21</source>
<target>21</target>
Expand All @@ -87,7 +78,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.7.0</version>
<version>${maven.dependency.plugin.version}</version>
<executions>
<!-- Load TCK dependency location as variable -->
<execution>
Expand Down Expand Up @@ -117,7 +108,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.4.1</version>
<version>${exec.maven.plugin.version}</version>
<executions>
<execution>
<id>generate-asciidoc</id>
Expand All @@ -143,12 +134,12 @@
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>${asciidoctor-maven.version}</version>
<version>${asciidoctor.maven.plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj-pdf</artifactId>
<version>${asciidoctorj-pdf.version}</version>
<version>${asciidoctorj.pdf.version}</version>
</dependency>
</dependencies>
<executions>
Expand Down Expand Up @@ -192,7 +183,7 @@
<!-- Assembly plugin to collect everything into a single distribution -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven-assembly-plugin.version}</version>
<version>${maven.assembly.plugin.version}</version>
<executions>
<execution>
<id>distribution</id>
Expand Down
Loading

0 comments on commit 765e3f5

Please sign in to comment.