Merge pull request #171 from arjantijms/master

Version back to snapshot, removed unneeded plugin, updated versions
jakartaee · Jun 12, 2020 · e1cddbd · e1cddbd
2 parents 20bde83 + d8f9397
commit e1cddbd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 31 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -29,7 +29,7 @@
 
     <groupId>jakarta.security.enterprise</groupId>
     <artifactId>jakarta.security.enterprise-api</artifactId>
-    <version>2.0.0-RC2</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>Jakarta Security</name>
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>jakarta.interceptor</groupId>
             <artifactId>jakarta.interceptor-api</artifactId>
-            <version>2.0.0-RC1</version>
+            <version>2.0.0-RC2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
-            <version>3.0.0-M1</version>
+            <version>3.0.0-M4</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -136,7 +136,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M2</version>
+                <version>3.0.0-M3</version>
                 <executions>
                     <execution>
                         <id>enforce-maven</id>
@@ -235,7 +235,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <id>attach-api-javadocs</id>
@@ -245,6 +245,7 @@
                         <configuration>
                             <source>1.8</source>
                             <additionalJOption>-Xdoclint:none</additionalJOption>
+                            <detectJavaApiLink>false</detectJavaApiLink>
                             <description>Jakarta Security API documentation</description>
                             <doctitle>Jakarta Security API documentation</doctitle>
                             <windowtitle>Jakarta Security API documentation</windowtitle>

diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
 
     <groupId>org.eclipse.ee4j.security.enterprise-api</groupId>
     <artifactId>security.enterprise-api-parent</artifactId>
-    <version>2.0.0-RC2</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Jakarta Security Parent</name>

diff --git a/spec/pom.xml b/spec/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.security.enterprise-api</groupId>
         <artifactId>security.enterprise-api-parent</artifactId>
-        <version>2.0.0-RC2</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>security-spec</artifactId>
@@ -33,10 +33,9 @@
     <properties>
         <site.output.dir>${project.build.directory}/staging</site.output.dir>
         <maven.site.skip>true</maven.site.skip>
-        <asciidoctor.maven.plugin.version>2.0.0-RC.1</asciidoctor.maven.plugin.version>
-        <asciidoctorj.version>2.2.0</asciidoctorj.version>
-        <asciidoctorj.pdf.version>1.5.0</asciidoctorj.pdf.version>
-        <jruby.version>9.2.9.0</jruby.version>
+        <asciidoctorj.version>2.3.0</asciidoctorj.version>
+        <asciidoctorj.pdf.version>1.5.3</asciidoctorj.pdf.version>
+        <jruby.version>9.2.11.1</jruby.version>
         <!-- status: DRAFT, BETA, etc., or blank for final -->
         <status>DRAFT</status>
         <maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format>
@@ -49,7 +48,7 @@
             <plugin>
                 <groupId>org.asciidoctor</groupId>
                 <artifactId>asciidoctor-maven-plugin</artifactId>
-                <version>${asciidoctor.maven.plugin.version}</version>
+                <version>2.0.0-RC.1</version>
                 <dependencies>
                     <dependency>
                         <groupId>org.jruby</groupId>
@@ -129,32 +128,14 @@
                     </attributes>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>3.0.0-M1</version>
-                <configuration>
-                    <mavenExecutorId>forked-path</mavenExecutorId>
-                    <useReleaseProfile>false</useReleaseProfile>
-                    <arguments>${release.arguments}</arguments>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.maven.scm</groupId>
-                        <artifactId>maven-scm-provider-gitexe</artifactId>
-                        <version>1.11.2</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
 
             <!--
                 This is the rule that builds the zip file for download.
             -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.0</version>
                 <inherited>false</inherited>
                 <executions>
                     <execution>