Skip to content

Commit

Permalink
XStream libraries can be used now directly in Android, therefore supp…
Browse files Browse the repository at this point in the history 
…ort of Java 1.4.2 has been stopped with the delivery.

git-svn-id: http://svn.codehaus.org/xstream/trunk@1940 9830eeb5-ddf4-0310-9ef7-f4b9a3e3227e
  • Loading branch information
@joehni
joehni committed Nov 2, 2011
1 parent b0a855b commit 03916cd
Show file tree
Hide file tree
Showing 7 changed files with 224 additions and 164 deletions.
26 changes: 26 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,17 @@
<!--module>xstream-builder</module-->
</modules>
</profile>
<profile>
<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://download.oracle.com/javase/1.4.2/docs/api/</link.javadoc.javase>
</properties>
</profile>
</profiles>
<modules>
<module>xstream</module>
Expand Down Expand Up @@ -299,6 +310,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.plugin.maven.compiler}</version>
<configuration>
<source>${version.java.source}</source>
<target>${version.java.target}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -336,6 +351,12 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${version.plugin.maven.javadoc}</version>
<configuration>
<source>${version.java.source}</source>
<links>
<link>${link.javadoc.javase}</link>
</links>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -461,6 +482,9 @@
</scm>

<properties>
<version.java.source>1.5</version.java.source>
<version.java.target>1.5</version.java.target>

<version.plugin.codehaus.xsite>1.2.1</version.plugin.codehaus.xsite>
<version.plugin.maven.antrun>1.1</version.plugin.maven.antrun>
<version.plugin.maven.assembly>2.1</version.plugin.maven.assembly>
Expand Down Expand Up @@ -509,5 +533,7 @@
<version.xmlpull>1.1.3.1</version.xmlpull>
<version.xom>1.1</version.xom>
<version.xpp3>1.1.4c</version.xpp3>

<link.javadoc.javase>http://download.oracle.com/javase/6/docs/api/</link.javadoc.javase>
</properties>
</project>
72 changes: 50 additions & 22 deletions xstream-benchmark/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,41 +20,69 @@
<packaging>jar</packaging>
<name>XStream Benchmark</name>

<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-javadoc</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<excludePackageNames>com.thoughtworks.xstream.tools.benchmark.model</excludePackageNames>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadoc</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<excludePackageNames>com.thoughtworks.xstream.tools.benchmark.model</excludePackageNames>
<links>
<link>http://download.oracle.com/javase/6/docs/api/</link>
</links>
</configuration>
</execution>
</executions>
</plugin>
<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>
</configuration>
<configuration>
<skip>true</skip>
</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>
<source>${version.java.source}</source>
<links>
<link>${link.javadoc.javase}</link>
</links>
</configuration>
</plugin>
</plugins>
</reporting>


<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
13 changes: 1 addition & 12 deletions xstream-builder/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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) 2007, 2009 XStream committers.
Copyright (C) 2007, 2009, 2011 XStream committers.
All rights reserved.
The software in this package is published under the terms of the BSD
Expand All @@ -18,17 +18,6 @@
<artifactId>xstream-builder</artifactId>
<packaging>jar</packaging>
<name>XStream Builder</name>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
Expand Down
157 changes: 86 additions & 71 deletions xstream-distribution/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,6 @@
<name>XStream Distribution</name>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>xstream</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>xstream-hibernate</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>xstream-benchmark</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>xstream</artifactId>
Expand All @@ -62,6 +41,92 @@
</dependency>
</dependencies>

<profiles>
<profile>
<id>jdk15-ge</id>
<activation>
<jdk>[1.5,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.xsite</groupId>
<artifactId>xsite-maven-plugin</artifactId>
<configuration>
<sourceDirectoryPath>${basedir}/src</sourceDirectoryPath>
<sitemapPath>content/website.xml</sitemapPath>
<skinPath>templates/skin.html</skinPath>
<compositionFilePath>xsite/xsite.xml</compositionFilePath>
<resourcePaths>resources</resourcePaths>
<outputDirectoryPath>${project.build.directory}/xsite</outputDirectoryPath>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<delete includeEmptyDirs="true">
<fileset dir="${project.build.directory}/xsite" includes="**/META-INF/*" />
<fileset dir="${project.build.directory}/xsite" includes="**/META-INF" />
</delete>
<mkdir dir="${project.build.directory}/docs" />
<copy todir="${project.build.directory}/docs" overwrite="true" failonerror="false">
<fileset dir="${basedir}">
<include name="target/xsite/**" />
<exclude name="target/xsite" />
</fileset>
<filtermapper>
<replacestring from="target${file.separator}xsite${file.separator}" to="${file.separator}" />
</filtermapper>
</copy>
</tasks>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>xstream</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>xstream-hibernate</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>xstream-benchmark</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
</profiles>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -127,56 +192,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.xsite</groupId>
<artifactId>xsite-maven-plugin</artifactId>
<configuration>
<sourceDirectoryPath>${basedir}/src</sourceDirectoryPath>
<sitemapPath>content/website.xml</sitemapPath>
<skinPath>templates/skin.html</skinPath>
<compositionFilePath>xsite/xsite.xml</compositionFilePath>
<resourcePaths>resources</resourcePaths>
<outputDirectoryPath>${project.build.directory}/xsite</outputDirectoryPath>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<delete includeEmptyDirs="true">
<fileset dir="${project.build.directory}/xsite" includes="**/META-INF/*" />
<fileset dir="${project.build.directory}/xsite" includes="**/META-INF" />
</delete>
<mkdir dir="${project.build.directory}/docs" />
<copy todir="${project.build.directory}/docs" overwrite="true" failonerror="false">
<fileset dir="${basedir}">
<include name="target/xsite/**" />
<exclude name="target/xsite" />
</fileset>
<filtermapper>
<replacestring from="target${file.separator}xsite${file.separator}" to="${file.separator}" />
</filtermapper>
</copy>
</tasks>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
Expand Down
2 changes: 2 additions & 0 deletions xstream-distribution/src/content/changes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ <h1 id="upcoming">Upcoming</h1>
<h2>Major changes</h2>

<ul>
<li>XStream libraries can be used now directly in Android, therefore support of Java 1.4.2 has been stopped with the delivery.
Anyone who needs a version for Java 1.4.2 can build it easily from source, this build is still supported and part of CI.</li>
<li>JIRA.XSTR-675: New extended HierarchicalStreamReader interface with peekNextChild method. All XStream
readers implement the new interface (by Nikita Levyankov).</li>
<li>WstxDriver did not trigger Woodstox, but BEA StAX implementation.</li>
Expand Down
Loading

0 comments on commit 03916cd

Please sign in to comment.