Log Message
Optimize build: Javadoc and XSite with Java 8 only.
Modified Paths
- trunk/pom.xml
- trunk/xstream/pom.xml
- trunk/xstream-benchmark/pom.xml
- trunk/xstream-distribution/pom.xml
- trunk/xstream-hibernate/pom.xml
Diff
Modified: trunk/pom.xml (2319 => 2320)
--- trunk/pom.xml 2015-02-02 23:46:18 UTC (rev 2319)
+++ trunk/pom.xml 2015-02-03 23:24:18 UTC (rev 2320)
@@ -59,19 +59,6 @@
</activation>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<modules>
@@ -79,16 +66,6 @@
</modules>
</profile>
<profile>
- <id>jdk15</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- <properties>
- <version.hsqldb>1.8.0.10</version.hsqldb>
- <version.org.hibernate.core>3.6.6.Final</version.org.hibernate.core>
- </properties>
- </profile>
- <profile>
<id>java</id>
<activation>
<file>
@@ -118,6 +95,19 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
Modified: trunk/xstream/pom.xml (2319 => 2320)
--- trunk/xstream/pom.xml 2015-02-02 23:46:18 UTC (rev 2319)
+++ trunk/xstream/pom.xml 2015-02-03 23:24:18 UTC (rev 2320)
@@ -209,13 +209,6 @@
</plugin>
<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-source-plugin</artifactId>
</plugin>
<plugin>
@@ -272,8 +265,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>
@@ -332,20 +350,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: trunk/xstream-benchmark/pom.xml (2319 => 2320)
--- trunk/xstream-benchmark/pom.xml 2015-02-02 23:46:18 UTC (rev 2319)
+++ trunk/xstream-benchmark/pom.xml 2015-02-03 23:24:18 UTC (rev 2320)
@@ -21,17 +21,48 @@
<name>XStream Benchmark</name>
<description>Benchmark suite of XStream.</description>
+ <profiles>
+ <profile>
+ <id>jdk18-ge</id>
+ <activation>
+ <jdk>[1.8,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <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>
+ </profiles>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <excludePackageNames>com.thoughtworks.xstream.tools.benchmark.model</excludePackageNames>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive combine.children="append">
@@ -62,26 +93,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: trunk/xstream-distribution/pom.xml (2319 => 2320)
--- trunk/xstream-distribution/pom.xml 2015-02-02 23:46:18 UTC (rev 2319)
+++ trunk/xstream-distribution/pom.xml 2015-02-03 23:24:18 UTC (rev 2320)
@@ -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: trunk/xstream-hibernate/pom.xml (2319 => 2320)
--- trunk/xstream-hibernate/pom.xml 2015-02-02 23:46:18 UTC (rev 2319)
+++ trunk/xstream-hibernate/pom.xml 2015-02-03 23:24:18 UTC (rev 2320)
@@ -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,30 +34,25 @@
<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-jar-plugin</artifactId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${version.plugin.maven.javadoc}</version>
<configuration>
- <archive combine.children="append">
- <manifestFile>${project.build.directory}/OSGi/MANIFEST.MF</manifestFile>
- </archive>
+ <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-source-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions combine.children="append">
- <Export-Package>!com.thoughtworks.xstream.hibernate.util,com.thoughtworks.xstream.hibernate.*;-noimport:=true</Export-Package>
- </instructions>
- </configuration>
- </plugin>
</plugins>
- </build>
+ </reporting>
</profile>
</profiles>
@@ -69,6 +64,28 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive combine.children="append">
+ <manifestFile>${project.build.directory}/OSGi/MANIFEST.MF</manifestFile>
+ </archive>
+ </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>
+ <instructions combine.children="append">
+ <Export-Package>!com.thoughtworks.xstream.hibernate.util,com.thoughtworks.xstream.hibernate.*;-noimport:=true</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
@@ -96,19 +113,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:
