Update poms, set version to 3.1.0-SNAPSHOT

Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
jakartaee · Nov 14, 2023 · 23ea05e · 23ea05e
1 parent fb77000
commit 23ea05e
Show file tree

Hide file tree

Showing 22 changed files with 96 additions and 89 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2020, 2022 Contributors to Eclipse Foundation. All rights reserved.
+    Copyright (c) 2020, 2023 Contributors to Eclipse Foundation. All rights reserved.
     Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,13 +24,13 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.8</version>
         <relativePath/>
     </parent>
 
     <groupId>jakarta.authentication</groupId>
     <artifactId>jakarta.authentication-api</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
 
     <name>Jakarta Authentication</name>
     <description>
@@ -41,10 +41,10 @@
         Jakarta Authentication consists of several profiles, with each profile telling how a specific container
         (such as Jakarta Servlet) can integrate with- and adapt to this SPI.
     </description>
-    <url>https://github.com/eclipse-ee4j/authentication</url>
+    <url>https://github.com/jakartaee/authentication</url>
     <organization>
         <name>Jakarta Authentication</name>
-        <url>https://github.com/eclipse-ee4j/authentication</url>
+        <url>https://github.com/jakartaee/authentication</url>
     </organization>
     <licenses>
         <license>
@@ -87,21 +87,21 @@
     </contributors>
 
     <scm>
-        <connection>scm:git:ssh://git@github.com/eclipse-ee4j/authentication.git</connection>
-        <developerConnection>scm:git:ssh://git@github.com/eclipse-ee4j/authentication.git</developerConnection>
-        <url>https://github.com/eclipse-ee4j/authentication</url>
+        <connection>scm:git:ssh://git@github.com/jakartaee/authentication.git</connection>
+        <developerConnection>scm:git:ssh://git@github.com/jakartaee/authentication.git</developerConnection>
+        <url>https://github.com/jakartaee/authentication</url>
     </scm>
     <issueManagement>
         <system>github</system>
-        <url>https://github.com/eclipse-ee4j/authentication/issues</url>
+        <url>https://github.com/jakartaee/authentication/issues</url>
     </issueManagement>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
 
     <build>
@@ -141,9 +141,7 @@
         <plugins>
             <!-- Sets minimal Maven version to 3.6.0 -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <id>enforce-maven</id>
@@ -161,13 +159,12 @@
                 </executions>
             </plugin>
 
-            <!-- Restricts the Java version to 11 -->
+            <!-- Restricts the Java version to 21 -->
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.11.0</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <release>21</release>
                     <compilerArgument>-Xlint:unchecked</compilerArgument>
                 </configuration>
             </plugin>
@@ -179,7 +176,7 @@
                 <version>2.1</version>
                 <configuration>
                     <spec>
-                        <specVersion>3.0</specVersion>
+                        <specVersion>3.1</specVersion>
                         <specImplVersion>${project.version}</specImplVersion>
                         <apiPackage>jakarta.security.auth.message</apiPackage>
                     </spec>
@@ -198,7 +195,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>5.1.6</version>
+                <version>5.1.9</version>
                 <configuration>
                     <supportedProjectTypes>
                         <supportedProjectType>jar</supportedProjectType>
@@ -217,7 +214,7 @@
                         <Implementation-Vendor-Id>org.glassfish</Implementation-Vendor-Id>
                         <_include>-${basedir}/osgi.bundle</_include>
                         <_noimportjava>true</_noimportjava>
-                        <_runee>JavaSE-11</_runee>
+                        <_runee>JavaSE-21</_runee>
                     </instructions>
                 </configuration>
                 <executions>
@@ -233,9 +230,7 @@
 
             <!-- Adds the manifest file created by the org.apache.felix:maven-bundle-plugin -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.2</version>
                 <configuration>
                     <archive>
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -250,25 +245,22 @@
                Create Javadoc for API jar
             -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.4.0</version>
                 <executions>
                     <execution>
                         <id>attach-api-javadocs</id>
                         <goals>
                             <goal>jar</goal>
                         </goals>
                         <configuration>
-                            <source>11</source>
                             <additionalJOption>-Xdoclint:none</additionalJOption>
                             <description>Jakarta Authentication API documentation</description>
                             <doctitle>Jakarta Authentication API documentation</doctitle>
                             <windowtitle>Jakarta Authentication API documentation</windowtitle>
                             <header><![CDATA[<br>Jakarta Authentication API v${project.version}]]></header>
                             <bottom><![CDATA[
-Comments to: <a href="mailto:jaspic-dev@eclipse.org">jaspic-dev@eclipse.org</a>.<br>
-Copyright &#169; 2020, 2022 Eclipse Foundation. All rights reserved.<br>
+Comments to: <a href="mailto:es-dev@eclipse.org">es-dev@eclipse.org</a>.<br>
+Copyright &#169; 2020, 2023 Eclipse Foundation. All rights reserved.<br>
 Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.]]>
                             </bottom>
                             <docfilessubdirs>true</docfilessubdirs>
@@ -287,6 +279,33 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.5.0</version>
+                <configuration>
+                    <flattenMode>ossrh</flattenMode>
+                </configuration>
+                <executions>
+                    <!-- enable flattening -->
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <!-- ensure proper cleanup -->
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2020, 2021 Contributors to Eclipse Foundation. All rights reserved.
+    Copyright (c) 2020, 2023 Contributors to Eclipse Foundation. All rights reserved.
     Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,12 +24,12 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.8</version>
     </parent>
 
     <groupId>org.eclipse.ee4j.authentication</groupId>
     <artifactId>authentication-parent</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Jakarta Authentication</name>
@@ -61,18 +61,17 @@
     </modules>
 
     <scm>
-        <connection>scm:git:ssh://git@github.com/eclipse-ee4j/authentication.git</connection>
-        <developerConnection>scm:git:ssh://git@github.com/eclipse-ee4j/authentication.git</developerConnection>
-        <url>https://github.com/eclipse-ee4j/authentication</url>
+        <connection>scm:git:ssh://git@github.com/jakartaee/authentication.git</connection>
+        <developerConnection>scm:git:ssh://git@github.com/jakartaee/authentication.git</developerConnection>
+        <url>https://github.com/jakartaee/authentication</url>
         <tag>HEAD</tag>
     </scm>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.release>21</maven.compiler.release>
     </properties>
 
     <build>
@@ -81,7 +80,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <id>enforce-maven</id>

diff --git a/spec/pom.xml b/spec/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2019, 2022 Contributors to Eclipse Foundation. All rights reserved.
+    Copyright (c) 2019, 2023 Contributors to Eclipse Foundation. All rights reserved.
     
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.authentication</groupId>
         <artifactId>authentication-parent</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>authentication-spec</artifactId>
@@ -31,23 +31,20 @@
     <name>Jakarta Authentication Specification</name>
 
     <scm>
-        <connection>scm:git:git@github.com:eclipse-ee4j/authentication.git</connection>
-        <developerConnection>scm:git:git@github.com:eclipse-ee4j/authentication.git</developerConnection>
-        <url>https://github.com/eclipse-ee4j/authentication</url>
+        <connection>scm:git:git@github.com:jakartaee/authentication.git</connection>
+        <developerConnection>scm:git:git@github.com:jakartaee/authentication.git</developerConnection>
+        <url>https://github.com/jakartaee/authentication</url>
         <tag>HEAD</tag>
     </scm>
     <distributionManagement>
         <site>
-            <url>scm:git:git@github.com:eclipse-ee4j/authentication.git</url>
+            <url>scm:git:git@github.com:jakartaee/authentication.git</url>
         </site>
     </distributionManagement>
 
     <properties>
         <site.output.dir>${project.build.directory}/staging</site.output.dir>
         <maven.site.skip>true</maven.site.skip>
-        <asciidoctorj.version>2.5.4</asciidoctorj.version>
-        <asciidoctorj.pdf.version>2.1.4</asciidoctorj.pdf.version>
-        <jruby.version>9.3.4.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>
@@ -64,22 +61,12 @@
             <plugin>
                 <groupId>org.asciidoctor</groupId>
                 <artifactId>asciidoctor-maven-plugin</artifactId>
-                <version>2.2.2</version>
+                <version>2.2.4</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>org.jruby</groupId>
-                        <artifactId>jruby-complete</artifactId>
-                        <version>${jruby.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj</artifactId>
-                        <version>${asciidoctorj.version}</version>
-                    </dependency>
                     <dependency>
                         <groupId>org.asciidoctor</groupId>
                         <artifactId>asciidoctorj-pdf</artifactId>
-                        <version>${asciidoctorj.pdf.version}</version>
+                        <version>2.3.9</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -156,7 +143,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.6.0</version>
                 <inherited>false</inherited>
                 <executions>
                     <execution>

diff --git a/tck/async-authentication/pom.xml b/tck/async-authentication/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>jakarta-authentication-tck</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>async-authentication</artifactId>

diff --git a/tck/basic-authentication/pom.xml b/tck/basic-authentication/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>jakarta-authentication-tck</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>basic-authentication</artifactId>

diff --git a/tck/custom-principal/pom.xml b/tck/custom-principal/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>jakarta-authentication-tck</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>custom-principal</artifactId>

diff --git a/tck/dispatching-jsf-cdi/pom.xml b/tck/dispatching-jsf-cdi/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>jakarta-authentication-tck</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dispatching-jsf-cdi</artifactId>

diff --git a/tck/dispatching/pom.xml b/tck/dispatching/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>jakarta-authentication-tck</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dispatching</artifactId>

diff --git a/tck/ejb-propagation/pom.xml b/tck/ejb-propagation/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>jakarta-authentication-tck</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ejb-propagation</artifactId>

diff --git a/tck/ejb-register-session/pom.xml b/tck/ejb-register-session/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>jakarta-authentication-tck</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ejb-register-session</artifactId>

diff --git a/tck/invoke-ejb-cdi/pom.xml b/tck/invoke-ejb-cdi/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>jakarta-authentication-tck</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>invoke-ejb-cdi</artifactId>