Skip to site navigation (Press enter)

[xstream-scm] [2321] branches/v-1.4.x: Merge Javadoc optimization for Java 8 from trunk.

joehni Tue, 03 Feb 2015 15:59:34 -0800

Title: [2321] branches/v-1.4.x: Merge Javadoc optimization for Java 8 from trunk.

Revision: 2321
Author: joehni
Date: 2015-02-03 17:59:21 -0600 (Tue, 03 Feb 2015)

Log Message

Merge Javadoc optimization for Java 8 from trunk.

Modified Paths

branches/v-1.4.x/xstream/pom.xml
branches/v-1.4.x/xstream-benchmark/pom.xml
branches/v-1.4.x/xstream-distribution/pom.xml
branches/v-1.4.x/xstream-hibernate/pom.xml


Property Changed

branches/v-1.4.x/

Diff

Property changes: branches/v-1.4.x

Modified: svn:mergeinfo

+ /trunk:2151-2152,2154-2156,2158-2163,2165,2172,2175,2177,2188-2189,2197,2199-2201,2204,2206,2210,2212,2214-2217,2226,2229,2231,2233-2234,2236-2238,2247-2249,2279-2280,2285,2291-2292,2294,2298-2299,2301,2303,2306-2310,2312,2314,2316-2318,2320

Modified: branches/v-1.4.x/xstream/pom.xml (2320 => 2321)


--- branches/v-1.4.x/xstream/pom.xml	2015-02-03 23:24:18 UTC (rev 2320)
+++ branches/v-1.4.x/xstream/pom.xml	2015-02-03 23:59:21 UTC (rev 2321)
@@ -241,8 +241,33 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <configuration>
+              <excludePackageNames>com.thoughtworks.xstream.core.util</excludePackageNames>
+            </configuration>
+          </plugin>
         </plugins>
       </build>
+      <reporting>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>${version.plugin.maven.javadoc}</version>
+            <configuration>
+              <excludePackageNames>com.thoughtworks.xstream.core.util</excludePackageNames>
+              <additionalparam>${javadoc.xdoclint}</additionalparam>
+              <detectJavaApiLink>false</detectJavaApiLink>
+              <source>${version.java.source}</source>
+              <links>
+                <link>${link.javadoc.javase}</link>
+              </links>
+            </configuration>
+          </plugin>
+        </plugins>
+      </reporting>
     </profile>
     <profile>
       <id>jdk17</id>
@@ -304,13 +329,6 @@
         <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <configuration>
-              <excludePackageNames>com.thoughtworks.xstream.core.util</excludePackageNames>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-jar-plugin</artifactId>
             <executions>
               <execution>
@@ -400,20 +418,6 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>${version.plugin.maven.javadoc}</version>
-        <configuration>
-          <excludePackageNames>com.thoughtworks.xstream.core.util</excludePackageNames>
-          <additionalparam>${javadoc.xdoclint}</additionalparam>
-          <detectJavaApiLink>false</detectJavaApiLink>
-          <source>${version.java.source}</source>
-          <links>
-            <link>${link.javadoc.javase}</link>
-          </links>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
         <version>${version.plugin.maven.surefire}</version>
       </plugin>

Modified: branches/v-1.4.x/xstream-benchmark/pom.xml (2320 => 2321)


--- branches/v-1.4.x/xstream-benchmark/pom.xml	2015-02-03 23:24:18 UTC (rev 2320)
+++ branches/v-1.4.x/xstream-benchmark/pom.xml	2015-02-03 23:59:21 UTC (rev 2321)
@@ -23,9 +23,9 @@
 
   <profiles>
     <profile>
-      <id>jdk15-ge</id>
+      <id>jdk18-ge</id>
       <activation>
-        <jdk>[1.5,)</jdk>
+        <jdk>[1.8,)</jdk>
       </activation>
       <build>
         <plugins>
@@ -36,8 +36,36 @@
               <excludePackageNames>com.thoughtworks.xstream.tools.benchmark.model</excludePackageNames>
             </configuration>
           </plugin>
+        </plugins>
+      </build>
+      <reporting>
+        <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>${version.plugin.maven.javadoc}</version>
+            <configuration>
+              <excludePackageNames>com.thoughtworks.xstream.tools.benchmark.model</excludePackageNames>
+              <additionalparam>${javadoc.xdoclint}</additionalparam>
+              <detectJavaApiLink>false</detectJavaApiLink>
+              <source>${version.java.source}</source>
+              <links>
+                <link>${link.javadoc.javase}</link>
+              </links>
+            </configuration>
+          </plugin>
+        </plugins>
+      </reporting>
+    </profile>
+    <profile>
+      <id>jdk15-ge</id>
+      <activation>
+        <jdk>[1.5,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-jar-plugin</artifactId>
             <configuration>
               <archive combine.children="append">
@@ -46,10 +74,6 @@
             </configuration>
           </plugin>
           <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-          </plugin>
-          <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
             <configuration>
@@ -67,6 +91,10 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <skip>true</skip>
@@ -75,26 +103,6 @@
     </plugins>
   </build>
 
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>${version.plugin.maven.javadoc}</version>
-        <configuration>
-          <excludePackageNames>com.thoughtworks.xstream.tools.benchmark.model</excludePackageNames>
-          <detectJavaApiLink>false</detectJavaApiLink>
-          <additionalparam>${javadoc.xdoclint}</additionalparam>
-          <source>${version.java.source}</source>
-          <links>
-            <link>${link.javadoc.javase}</link>
-          </links>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-
-
   <dependencies>
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>

Modified: branches/v-1.4.x/xstream-distribution/pom.xml (2320 => 2321)


--- branches/v-1.4.x/xstream-distribution/pom.xml	2015-02-03 23:24:18 UTC (rev 2320)
+++ branches/v-1.4.x/xstream-distribution/pom.xml	2015-02-03 23:59:21 UTC (rev 2321)
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <!--
      Copyright (C) 2006 Joe Walnes.
-     Copyright (C) 2006, 2007, 2008, 2009, 2011, 2012, 2013 XStream committers.
+     Copyright (C) 2006, 2007, 2008, 2009, 2011, 2012, 2013, 2015 XStream committers.
      All rights reserved.
      
      The software in this package is published under the terms of the BSD
@@ -43,9 +43,9 @@
 
   <profiles>
     <profile>
-      <id>jdk16-ge</id>
+      <id>jdk18-ge</id>
       <activation>
-        <jdk>[1.6,)</jdk>
+        <jdk>[1.8,)</jdk>
       </activation>
       <build>
         <plugins>

Modified: branches/v-1.4.x/xstream-hibernate/pom.xml (2320 => 2321)


--- branches/v-1.4.x/xstream-hibernate/pom.xml	2015-02-03 23:24:18 UTC (rev 2320)
+++ branches/v-1.4.x/xstream-hibernate/pom.xml	2015-02-03 23:59:21 UTC (rev 2321)
@@ -24,9 +24,9 @@
 
   <profiles>
     <profile>
-      <id>jdk16-ge</id>
+      <id>jdk18-ge</id>
       <activation>
-        <jdk>[1.6,)</jdk>
+        <jdk>[1.8,)</jdk>
       </activation>
       <build>
         <plugins>
@@ -34,8 +34,35 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
           </plugin>
+        </plugins>
+      </build>
+      <reporting>
+        <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>${version.plugin.maven.javadoc}</version>
+            <configuration>
+              <additionalparam>${javadoc.xdoclint}</additionalparam>
+              <detectJavaApiLink>false</detectJavaApiLink>
+              <source>${version.java.source}</source>
+              <links>
+                <link>${link.javadoc.javase}</link>
+              </links>
+            </configuration>
+          </plugin>
+        </plugins>
+      </reporting>
+    </profile>
+    <profile>
+      <id>jdk16-ge</id>
+      <activation>
+        <jdk>[1.6,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-jar-plugin</artifactId>
             <configuration>
               <archive combine.children="append">
@@ -44,10 +71,6 @@
             </configuration>
           </plugin>
           <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-          </plugin>
-          <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
             <configuration>
@@ -69,6 +92,10 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
@@ -96,19 +123,6 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>${version.plugin.maven.javadoc}</version>
-        <configuration>
-          <additionalparam>${javadoc.xdoclint}</additionalparam>
-          <detectJavaApiLink>false</detectJavaApiLink>
-          <source>${version.java.source}</source>
-          <links>
-            <link>${link.javadoc.javase}</link>
-          </links>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
         <version>${version.plugin.maven.surefire}</version>
       </plugin>

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email