Revert "[maven-release-plugin] rollback the release of 3.5.3"

This reverts commit 808964c.
antlr · Apr 9, 2022 · fc59296 · fc59296
1 parent 808964c
commit fc59296
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 10 deletions.
diff --git a/antlr-complete/pom.xml b/antlr-complete/pom.xml
@@ -123,12 +123,21 @@
                 </executions>
             </plugin>
 
-            <plugin>
+            <plugin> <!-- create javadoc jar -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.3.1</version>
                 <configuration>
-                    <includeDependencySources>true</includeDependencySources>
+                    <javadocVersion>1.8</javadocVersion>
+                    <failOnError>false</failOnError>
                 </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>javadoc</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
 

diff --git a/antlr3-maven-archetype/pom.xml b/antlr3-maven-archetype/pom.xml
@@ -35,12 +35,13 @@
     </extensions>
 
         <plugins>
-
+<!--
             <plugin>
                 <artifactId>maven-archetype-plugin</artifactId>
                 <version>2.2</version>
                 <extensions>true</extensions>
             </plugin>
+            -->
 
         </plugins>
 

diff --git a/antlr3-maven-plugin/pom.xml b/antlr3-maven-plugin/pom.xml
@@ -201,7 +201,6 @@ Jim Idle - March 2009
     <build>
 
         <plugins>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
@@ -223,6 +222,15 @@ Jim Idle - March 2009
 
     <reporting>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <failOnError>false</failOnError>
+                    <quiet>true</quiet>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>

diff --git a/gunit-maven-plugin/pom.xml b/gunit-maven-plugin/pom.xml
@@ -126,6 +126,15 @@
     <build>
 
         <plugins>
+            <plugin> <!-- create javadoc jar -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <javadocVersion>1.8</javadocVersion>
+                    <failOnError>false</failOnError>
+                </configuration>
+            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/pom.xml b/pom.xml
@@ -142,6 +142,16 @@
             </modules>
             <build>
                 <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <version>3.8.1</version>
+                        <configuration>
+                            <source>${jdk}</source>
+                            <target>${jdk}</target>
+                        </configuration>
+                    </plugin>
+                    <!--
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
@@ -174,6 +184,7 @@
                             </execution>
                         </executions>
                     </plugin>
+                    -->
                 </plugins>
             </build>
         </profile>
@@ -256,14 +267,21 @@
                 <version>2.2.1</version>
             </plugin>
 
-            <plugin>
+            <plugin> <!-- create javadoc jar -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <!-- override the version inherited from the parent -->
-                <version>2.9.1</version>
+                <version>3.3.1</version>
                 <configuration>
-                    <quiet>true</quiet>
+                    <javadocVersion>1.8</javadocVersion>
+                    <failOnError>false</failOnError>
                 </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>javadoc</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
 
             <plugin>
@@ -302,7 +320,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
+                <version>3.3.1</version>
+                <configuration>
+                    <javadocVersion>1.8</javadocVersion>
+                    <failOnError>false</failOnError>
+                </configuration>
             </plugin>
         </plugins>
     </reporting>

diff --git a/tool/pom.xml b/tool/pom.xml
@@ -67,7 +67,7 @@
             <plugin>
                 <groupId>org.antlr</groupId>
                 <artifactId>antlr3-maven-plugin</artifactId>
-                <version>3.5</version>
+                <version>3.5.2</version>
                 <configuration>
                     <libDirectory>target/generated-sources/antlr/org/antlr/grammar/v3</libDirectory>
                 </configuration>