svn commit: r1907086 - /cocoon/branches/cocoon-2.2.1/parent/pom.xml

Author: javier
Date: Sun Jan 29 21:44:56 2023
New Revision: 1907086

URL: http://svn.apache.org/viewvc?rev=1907086&view=rev
Log:
* Fix javadoc generation with Java 8.
* Point to new cocoon subproject versions.

Modified:
    cocoon/branches/cocoon-2.2.1/parent/pom.xml

Modified: cocoon/branches/cocoon-2.2.1/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/parent/pom.xml?rev=1907086&r1=1907085&r2=1907086&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/parent/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/parent/pom.xml Sun Jan 29 21:44:56 2023
@@ -1049,7 +1049,6 @@
       </roles>
       <timezone>+1</timezone>
     </developer>
-
   </developers>
 
   <contributors>
@@ -2232,7 +2231,7 @@
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-block-deployment</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
@@ -2282,7 +2281,7 @@
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-configuration-api</artifactId>
-        <version>1.0.4</version>
+        <version>1.0.5-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
@@ -2505,7 +2504,7 @@
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-jnet</artifactId>
-        <version>1.2.2</version>
+        <version>1.2.3-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
@@ -2777,7 +2776,7 @@
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-servlet-service-impl</artifactId>
-        <version>1.3.3-COCOON-2347-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
@@ -2839,7 +2838,7 @@
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-spring-configurator</artifactId>
-        <version>2.2.2-COCOON-2347-SNAPSHOT</version>
+        <version>2.2.2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
@@ -3118,11 +3117,12 @@
       </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.10.3</version>
+        <version>2.10.4</version>
         <!-- keep this in-sync with the configuration in /project/profiles/profile[id='javadocs']
         (unfortunatly this has to be set twice) -->
         <configuration>
           <maxmemory>512m</maxmemory>
+          <additionalparam>-Xdoclint:none</additionalparam> <!-- Disables lint for Java 8. Enable after fix. -->
           <links>
             <link>http://docs.oracle.com/javase/6/docs/api//</link>
             <link>http://static.springframework.org/spring/docs/2.5.x/api/</link>
@@ -3351,10 +3351,11 @@
         <plugins>
           <plugin>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.2</version>
+            <version>2.10.4</version>
             <!-- keep this in-sync with the configuration in /project/build/plugins/plugin[id='maven-javadoc-plugin']
             (unfortunatly this has to be set twice) -->
             <configuration>
+              <additionalparam>-Xdoclint:none</additionalparam> <!-- Disables lint for Java 8. Enable after fix. -->
               <maxmemory>512m</maxmemory>
               <links>
                 <link>http://docs.oracle.com/javase/6/docs/api//</link>