Skip to site navigation (Press enter)

[xstream-scm] [2319] branches/v-1.4.x: Merge build corrections from trunk.

joehni Mon, 02 Feb 2015 15:46:47 -0800

Title: [2319] branches/v-1.4.x: Merge build corrections from trunk.

Revision: 2319
Author: joehni
Date: 2015-02-02 17:46:18 -0600 (Mon, 02 Feb 2015)

Log Message

Merge build corrections from trunk.

Modified Paths

branches/v-1.4.x/pom.xml
branches/v-1.4.x/xstream/pom.xml
branches/v-1.4.x/xstream-benchmark/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

Modified: branches/v-1.4.x/pom.xml (2318 => 2319)


--- branches/v-1.4.x/pom.xml	2015-02-02 23:31:02 UTC (rev 2318)
+++ branches/v-1.4.x/pom.xml	2015-02-02 23:46:18 UTC (rev 2319)
@@ -44,6 +44,15 @@
       </properties>
     </profile>
     <profile>
+      <id>jdk18ge</id>
+      <activation>
+        <jdk>[1.8,)</jdk>
+      </activation>
+      <properties>
+        <javadoc.xdoclint>-Xdoclint:-missing</javadoc.xdoclint>
+      </properties>
+    </profile>
+    <profile>
       <id>jdk15-ge</id>
       <activation>
         <jdk>[1.5,)</jdk>
@@ -95,6 +104,62 @@
         <version.org.hibernate.envers>3.6.6.Final</version.org.hibernate.envers><!-- not usable with JDK 1.4 -->
       </properties>
     </profile>
+    <profile>
+      <id>java</id>
+      <activation>
+        <file>
+          <exists>src/java</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <!-- overwrite codehaus-parent -->
+            <version>${version.plugin.maven.enforcer}</version>
+            <executions>
+              <execution>
+                <id>enforce-java-version</id>
+                <goals>
+                  <goal>enforce</goal>
+                </goals>
+                <configuration>
+                  <rules>
+                    <requireJavaVersion>
+                      <version>${version.java.enforced}</version>
+                    </requireJavaVersion>
+                  </rules>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>xstream-release</id>
+      <properties>
+        <version.java.enforced>[1.8;1.9)</version.java.enforced>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 
   <modules>
@@ -441,6 +506,16 @@
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-enforcer-plugin</artifactId>
+          <version>${version.plugin.maven.enforcer}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-gpg-plugin</artifactId>
+          <version>${version.plugin.maven.gpg}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-install-plugin</artifactId>
           <version>${version.plugin.maven.install}</version>
         </plugin>
@@ -469,7 +544,17 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>${version.plugin.maven.javadoc}</version>
+          <executions>
+            <execution>
+              <id>attach-javadocs</id>
+              <goals>
+                <goal>jar</goal>
+              </goals>
+            </execution>
+          </executions>
           <configuration>
+            <detectJavaApiLink>false</detectJavaApiLink>
+            <additionalparam>${javadoc.xdoclint}</additionalparam>
             <source>${version.java.source}</source>
             <links>
               <link>${link.javadoc.javase}</link>
@@ -492,6 +577,8 @@
           <configuration>
             <goals>deploy</goals>
             <autoVersionSubmodules>true</autoVersionSubmodules>
+            <!-- overwrite codehaus-parent -->
+            <arguments>-Pxstream-release</arguments>
           </configuration>
         </plugin>
         <plugin>
@@ -673,6 +760,7 @@
   <properties>
     <version.java.source>1.5</version.java.source>
     <version.java.target>1.5</version.java.target>
+    <version.java.enforced>[1.4,)</version.java.enforced>
 
     <version.plugin.codehaus.xsite>1.2.1</version.plugin.codehaus.xsite>
     <version.plugin.felix.bundle>2.3.7</version.plugin.felix.bundle>
@@ -682,9 +770,11 @@
     <version.plugin.maven.compiler>2.1</version.plugin.maven.compiler><!-- JDK 1.4 compatible -->
     <version.plugin.maven.dependency>2.1</version.plugin.maven.dependency>
     <version.plugin.maven.deploy>2.3</version.plugin.maven.deploy>
+    <version.plugin.maven.enforcer>1.4</version.plugin.maven.enforcer>
+    <version.plugin.maven.gpg>1.4</version.plugin.maven.gpg>
     <version.plugin.maven.install>2.2</version.plugin.maven.install>
     <version.plugin.maven.jar>2.2</version.plugin.maven.jar>
-    <version.plugin.maven.javadoc>2.7</version.plugin.maven.javadoc>
+    <version.plugin.maven.javadoc>2.10</version.plugin.maven.javadoc>
     <version.plugin.maven.release>2.1</version.plugin.maven.release>
     <version.plugin.maven.resources>2.2</version.plugin.maven.resources>
     <version.plugin.maven.site>2.0-beta-6</version.plugin.maven.site>
@@ -725,6 +815,8 @@
     <version.xom>1.1</version.xom>
     <version.xpp3>1.1.4c</version.xpp3>
 
-    <link.javadoc.javase>http://docs.oracle.com/javase/7/docs/api/</link.javadoc.javase>
+    <link.javadoc.javase>http://docs.oracle.com/javase/8/docs/api/</link.javadoc.javase>
+
+    <javadoc.xdoclint/>
   </properties>
 </project>

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


--- branches/v-1.4.x/xstream/pom.xml	2015-02-02 23:31:02 UTC (rev 2318)
+++ branches/v-1.4.x/xstream/pom.xml	2015-02-02 23:46:18 UTC (rev 2319)
@@ -139,21 +139,6 @@
   </dependencies>
 
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <configuration>
-            <excludePackageNames>com.thoughtworks.xstream.core.util</excludePackageNames>
-            <source>${version.java.source}</source>
-            <links>
-              <link>${link.javadoc.javase}</link>
-            </links>
-          </configuration>
-          </plugin>
-        </plugins>
-    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -320,15 +305,9 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
+            <configuration>
+              <excludePackageNames>com.thoughtworks.xstream.core.util</excludePackageNames>
+            </configuration>
           </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
@@ -425,6 +404,8 @@
         <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>

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


--- branches/v-1.4.x/xstream-benchmark/pom.xml	2015-02-02 23:31:02 UTC (rev 2318)
+++ branches/v-1.4.x/xstream-benchmark/pom.xml	2015-02-02 23:46:18 UTC (rev 2319)
@@ -32,15 +32,9 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
+            <configuration>
+              <excludePackageNames>com.thoughtworks.xstream.tools.benchmark.model</excludePackageNames>
+            </configuration>
           </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
@@ -70,21 +64,6 @@
   </profiles>
 
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <configuration>
-            <excludePackageNames>com.thoughtworks.xstream.tools.benchmark.model</excludePackageNames>
-            <source>${version.java.source}</source>
-            <links>
-              <link>${link.javadoc.javase}</link>
-            </links>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -104,6 +83,8 @@
         <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>

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


--- branches/v-1.4.x/xstream-hibernate/pom.xml	2015-02-02 23:31:02 UTC (rev 2318)
+++ branches/v-1.4.x/xstream-hibernate/pom.xml	2015-02-02 23:46:18 UTC (rev 2319)
@@ -1,6 +1,6 @@
 <?xml version="1.0"?><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) 2011, 2012, 2013 XStream committers.
+     Copyright (C) 2011, 2012, 2013, 2015 XStream committers.
      All rights reserved.
      
      The software in this package is published under the terms of the BSD
@@ -33,15 +33,6 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
           </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
@@ -71,20 +62,6 @@
   </profiles>
 
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <configuration>
-            <source>${version.java.source}</source>
-            <links>
-              <link>${link.javadoc.javase}</link>
-            </links>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -122,6 +99,8 @@
         <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>

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email