Log Message
Clean-up and optimize profiles for Java 5 as minimum JDK.
Modified Paths
Diff
Modified: trunk/pom.xml (2309 => 2310)
--- trunk/pom.xml 2015-01-19 00:33:14 UTC (rev 2309)
+++ trunk/pom.xml 2015-01-19 00:50:28 UTC (rev 2310)
@@ -79,22 +79,6 @@
<version.org.hibernate.core>3.6.6.Final</version.org.hibernate.core>
</properties>
</profile>
- <profile>
- <!-- build with Maven 2.0.10 !!! -->
- <id>jdk14</id>
- <activation>
- <jdk>1.4</jdk>
- </activation>
- <properties>
- <version.java.source>1.3</version.java.source>
- <version.java.target>1.3</version.java.target>
- <link.javadoc.javase>http://docs.oracle.com/javase/1.4.2/docs/api/</link.javadoc.javase>
- <!-- repeat Hibernate version dependencies, JDK intervals in activation is not supported with M2.0.x -->
- <version.hsqldb>1.8.0.10</version.hsqldb>
- <version.org.hibernate.core>3.3.2.GA</version.org.hibernate.core>
- <version.org.hibernate.envers>3.6.6.Final</version.org.hibernate.envers><!-- not usable with JDK 1.4 -->
- </properties>
- </profile>
</profiles>
<modules>
Modified: trunk/xstream/pom.xml (2309 => 2310)
--- trunk/xstream/pom.xml 2015-01-19 00:33:14 UTC (rev 2309)
+++ trunk/xstream/pom.xml 2015-01-19 00:50:28 UTC (rev 2310)
@@ -194,7 +194,18 @@
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
+ <id>default-jar</id>
<goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <archive combine.children="append">
+ <manifestFile>${project.build.directory}/OSGi/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </execution>
+ <execution>
+ <goals>
<goal>test-jar</goal>
</goals>
<configuration>
@@ -211,6 +222,32 @@
</execution>
</executions>
</plugin>
+ <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>
+ <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.core.util,com.thoughtworks.xstream.*;-noimport:=true</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -310,106 +347,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>jdk15-ge</id>
- <activation>
- <jdk>[1.5,)</jdk>
- </activation>
- <build>
- <plugins>
- <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>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>default-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <archive combine.children="append">
- <manifestFile>${project.build.directory}/OSGi/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </execution>
- </executions>
- </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.core.util,com.thoughtworks.xstream.*;-noimport:=true</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>jdk14</id>
- <activation>
- <jdk>1.4</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/annotations/*</exclude>
- <exclude>**/AnnotationMapper*</exclude>
- <exclude>**/EnumMapper*</exclude>
- <exclude>**/enums/*</exclude>
- <exclude>**/basic/StringBuilder*</exclude>
- <exclude>**/basic/UUID*</exclude>
- <exclude>**/io/xml/JDom2*</exclude>
- </excludes>
- <testExcludes>
- <exclude>**/annotations/*</exclude>
- <exclude>**/enums/*</exclude>
- <exclude>**/extended/*17Test*</exclude>
- <exclude>**/reflection/PureJavaReflectionProvider15Test*</exclude>
- <exclude>**/io/xml/JDom2*Test*</exclude>
- <exclude>**/acceptance/Basic15TypesTest*</exclude>
- <exclude>**/acceptance/Concurrent15TypesTest*</exclude>
- </testExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
- </dependencies>
- <properties>
- <version.org.codehaus.jettison>1.0.1</version.org.codehaus.jettison>
- </properties>
- </profile>
</profiles>
<reporting>
Modified: trunk/xstream-benchmark/pom.xml (2309 => 2310)
--- trunk/xstream-benchmark/pom.xml 2015-01-19 00:33:14 UTC (rev 2309)
+++ trunk/xstream-benchmark/pom.xml 2015-01-19 00:50:28 UTC (rev 2310)
@@ -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, 2009, 2011, 2012, 2013 XStream committers.
+ Copyright (C) 2006, 2007, 2009, 2011, 2012, 2013, 2015 XStream committers.
All rights reserved.
The software in this package is published under the terms of the BSD
@@ -21,54 +21,6 @@
<name>XStream Benchmark</name>
<description>Benchmark suite of XStream.</description>
- <profiles>
- <profile>
- <id>jdk15-ge</id>
- <activation>
- <jdk>[1.5,)</jdk>
- </activation>
- <build>
- <plugins>
- <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>
- <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.tools.benchmark.model,com.thoughtworks.xstream.tools.benchmark.*;-noimport:=true</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<build>
<pluginManagement>
<plugins>
@@ -88,6 +40,41 @@
<plugins>
<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>
+ <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.tools.benchmark.model,com.thoughtworks.xstream.tools.benchmark.*;-noimport:=true</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
To unsubscribe from this list please visit:
