Skip to content

Commit

Permalink
Merge pull request jakartaee#267 from smillidge/update-to-3.1
Browse files Browse the repository at this point in the history 
Update for 3.1 spec development cycle
  • Loading branch information
@smillidge
smillidge authored Dec 19, 2022
2 parents f348509 + c64941a commit 714dbdd
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
18 changes: 9 additions & 9 deletions api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>jakarta.enterprise.concurrent</groupId>
<artifactId>jakarta.enterprise.concurrent.parent</artifactId>
<version>3.0.2-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>

<artifactId>jakarta.enterprise.concurrent-api</artifactId>
Expand Down Expand Up @@ -66,8 +66,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<configuration>
<source>11</source>
<target>11</target>
<source>17</source>
<target>17</target>
</configuration>
</plugin>

Expand All @@ -78,7 +78,7 @@
<version>2.1</version>
<configuration>
<spec>
<specVersion>3.0</specVersion>
<specVersion>3.1</specVersion>
<specImplVersion>${project.version}</specImplVersion>
<apiPackage>jakarta.enterprise.concurrent</apiPackage>
</spec>
Expand All @@ -97,7 +97,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.4</version>
<version>5.1.8</version>
<configuration>
<supportedProjectTypes>
<supportedProjectType>jar</supportedProjectType>
Expand Down Expand Up @@ -130,7 +130,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
<version>3.3.0</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
Expand All @@ -155,7 +155,7 @@
<goal>jar</goal>
</goals>
<configuration>
<source>11</source>
<source>17</source>
<quiet>true</quiet>
<additionalJOption>-Xdoclint:none</additionalJOption>
<description>Jakarta Concurrency API documentation</description>
Expand Down Expand Up @@ -226,7 +226,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.2.0</version>
<version>3.3.0</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -265,7 +265,7 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.2.7</version>
<version>1.3.0</version>
<configuration>
<flattenMode>ossrh</flattenMode>
</configuration>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.6</version>
<version>1.0.8</version>
</parent>

<groupId>jakarta.enterprise.concurrent</groupId>
<artifactId>jakarta.enterprise.concurrent.parent</artifactId>
<version>3.0.2-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Jakarta Concurrency</name>
Expand Down Expand Up @@ -68,7 +68,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.release>11</maven.compiler.release>
<maven.compiler.release>17</maven.compiler.release>

<!-- Used in TCK only -->
<testng.version>6.14.3</testng.version>
Expand Down Expand Up @@ -139,7 +139,7 @@
<configuration>
<rules>
<requireMavenVersion>
<version>3.6.0</version>
<version>3.8.0</version>
</requireMavenVersion>
</rules>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion tck-dist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>jakarta.enterprise.concurrent</groupId>
<artifactId>jakarta.enterprise.concurrent.parent</artifactId>
<version>3.0.2-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>

<artifactId>jakarta.enterprise.concurrent-tck-dist</artifactId>
Expand Down
12 changes: 6 additions & 6 deletions tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>jakarta.enterprise.concurrent</groupId>
<artifactId>jakarta.enterprise.concurrent.parent</artifactId>
<version>3.0.2-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>

<artifactId>jakarta.enterprise.concurrent-tck</artifactId>
Expand All @@ -44,7 +44,7 @@
</licenses>

<properties>
<jakarta.concurrent.api.version>3.0.1</jakarta.concurrent.api.version>
<jakarta.concurrent.api.version>3.1.0-SNAPSHOT</jakarta.concurrent.api.version>
<sigtest.version>1.6</sigtest.version>
</properties>

Expand Down Expand Up @@ -122,8 +122,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<configuration>
<source>11</source>
<target>11</target>
<source>17</source>
<target>17</target>
</configuration>
</plugin>
<plugin>
Expand All @@ -143,15 +143,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.0</version>
<version>3.4.1</version>
<executions>
<execution>
<id>attach-api-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<source>11</source>
<source>17</source>
<quiet>true</quiet>
<additionalJOption>-Xdoclint:none</additionalJOption>
</configuration>
Expand Down

0 comments on commit 714dbdd

Please sign in to comment.