[Jpackage-commits] dist/xstream/devel .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 xstream-build_xml.patch, NONE, 1.1 xstream-jpp-depmap.xml, NONE, 1.1 xstream-pom_xml.patch, NONE, 1.1 xstream-settings.xml, NONE, 1.1 xstream-xstream-distribution-pom_xml.patch, NONE, 1.1 xstream-xstream-pom_xml.patch, NONE, 1.1 xstream.spec, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Wed May 28 22:24:07 CEST 2008


Update of /home/projects/jpackage/cvs/dist/xstream/devel
In directory ryu.zarb.org:/tmp/cvs-serv28435/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xstream-build_xml.patch xstream-jpp-depmap.xml 
	xstream-pom_xml.patch xstream-settings.xml 
	xstream-xstream-distribution-pom_xml.patch 
	xstream-xstream-pom_xml.patch xstream.spec 
Log Message:
Import from JPP 5.0

--- NEW FILE: xstream-pom_xml.patch ---
--- pom.xml.sav	2007-05-24 10:11:12.000000000 +0200
+++ pom.xml	2008-01-28 13:16:11.000000000 +0100
@@ -156,6 +156,26 @@
         <scope>test</scope>
       </dependency>
 
+      <dependency>
+        <groupId>plexus</groupId>
+        <artifactId>plexus-utils</artifactId>
+        <version>1.2</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>xalan</groupId>
+        <artifactId>xalan</artifactId>
+        <version>2.7.0</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>xalan</groupId>
+        <artifactId>xalan-serializer</artifactId>
+        <version>2.7.0</version>
+        <scope>test</scope>
+      </dependency>
+
     </dependencies>
   </dependencyManagement>
 

--- NEW FILE: xstream-xstream-distribution-pom_xml.patch ---
--- xstream-distribution/pom.xml.sav	2007-05-24 10:08:34.000000000 +0200
+++ xstream-distribution/pom.xml	2007-07-17 14:14:22.000000000 +0200
@@ -155,9 +155,11 @@
         <groupId>org.codehaus.xsite</groupId>
         <artifactId>xsite-maven-plugin</artifactId>
         <configuration>
-          <siteMapPath>${basedir}/src/content/website.xml</siteMapPath>
-          <skinPath>${basedir}/src/templates/skin.html</skinPath>
+          <sitemapPath>src/content/website.xml</sitemapPath>
+          <siteMapPath>src/content/website.xml</siteMapPath>
+          <skinPath>src/templates/skin.html</skinPath>
           <outputDirectoryPath>${project.build.directory}/xsite</outputDirectoryPath>
+          <sourceDirectoryPath>${basedir}</sourceDirectoryPath>
         </configuration>
         <executions>
           <execution>
@@ -198,6 +200,7 @@
           </execution>
         </executions>
       </plugin>
+<!--
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -232,6 +235,7 @@
           </execution>
         </executions>
       </plugin>
+-->
     </plugins>
   </build>
 </project>

--- NEW FILE: xstream-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>local</id>
					<layout>jpp</layout>
					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-maven</id>
					<name>plugins-maven</name>
					<layout>jpp</layout>
					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>

--- NEW FILE: xstream.spec ---
# Copyright (c) 2000-2008, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}

# If you don't want to build with maven, and use straight ant instead,
# give rpmbuild option '--without maven'

%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
%define without_maven %{?_without_maven:1}%{!?_without_maven:0}

%define section   free

Name:           xstream
Version:        1.2.2
Release:        2jpp
Epoch:          0
Summary:        XML serialization library

Group:          Development/Libraries/Java
License:        BSD-Style
URL:            http://xstream.codehaus.org/
Source0:        http://repository.codehaus.org/com/thoughtworks/xstream/xstream-distribution/1.2.2/xstream-distribution-1.2.2-src.zip
Source1:        %{name}-settings.xml
Source2:        %{name}-jpp-depmap.xml

Patch0:         xstream-build_xml.patch
Patch1:         xstream-pom_xml.patch
Patch2:         xstream-xstream-pom_xml.patch
Patch3:         xstream-xstream-distribution-pom_xml.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}

Requires(post):    jpackage-utils >= 0:1.7.2
Requires(postun):  jpackage-utils >= 0:1.7.2

%if %{gcj_support}
BuildRequires:    gnu-crypto
BuildRequires:    java-gcj-compat-devel
Requires(post):   java-gcj-compat
Requires(postun): java-gcj-compat
%endif

%if ! %{gcj_support}
BuildArch:      noarch
%endif

BuildRequires:  java-devel = 0:1.5.0
BuildRequires:  jpackage-utils >= 0:1.7.4
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  ant-junit
BuildRequires:  junit >= 0:3.8.1
%if %{with_maven}
BuildRequires:  maven2 >= 2.0.4-10jpp
BuildRequires:  maven2-plugin-antrun
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-dependency
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-release
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-source
BuildRequires:  maven2-plugin-surefire
BuildRequires:  jakarta-slide-webdavclient
BuildRequires:  xsite
%endif
BuildRequires:  bea-stax >= 0:1.2.0
BuildRequires:  bea-stax-api >= 0:1.0.1
BuildRequires:  cglib >= 0:2.1.3
BuildRequires:  dom4j >= 0:1.6.1
BuildRequires:  jakarta-commons-lang >= 0:2.1
BuildRequires:  jakarta-oro >= 0:2.0.8
BuildRequires:  jdom >= 0:1.0
BuildRequires:  jettison >= 0:1.0
BuildRequires:  jmock >= 0:1.0.1
BuildRequires:  joda-time >= 0:1.2.1
BuildRequires:  wstx >= 0:3.2.0
BuildRequires:  xalan-j2 >= 0:2.7.0
BuildRequires:  xom >= 0:1.0
BuildRequires:  xpp3 >= 0:1.1.3.4

Requires:  bea-stax-api
Requires:  cglib
Requires:  dom4j
Requires:  jakarta-commons-lang
Requires:  jakarta-oro
Requires:  jdom
Requires:  jettison
Requires:  joda-time
Requires:  wstx
Requires:  xom
Requires:  xpp3

Requires(post):    jpackage-utils >= 0:1.7.4
Requires(postun):  jpackage-utils >= 0:1.7.4


%description
XStream is a simple library to serialize objects to XML 
and back again. A high level facade is supplied that 
simplifies common use cases. Custom objects can be serialized 
without need for specifying mappings. Speed and low memory 
footprint are a crucial part of the design, making it suitable 
for large object graphs or systems with high message throughput. 
No information is duplicated that can be obtained via reflection. 
This results in XML that is easier to read for humans and more 
compact than native Java serialization. XStream serializes internal 
fields, including private and final. Supports non-public and inner 
classes. Classes are not required to have default constructor. 
Duplicate references encountered in the object-model will be 
maintained. Supports circular references. By implementing an 
interface, XStream can serialize directly to/from any tree 
structure (not just XML). Strategies can be registered allowing 
customization of how particular types are represented as XML. 
When an exception occurs due to malformed XML, detailed diagnostics 
are provided to help isolate and fix the problem.

%package        javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation
Requires(post):   /bin/rm,/bin/ln
Requires(postun): /bin/rm

%description    javadoc
%{summary}.

%if %{with_maven}
%package        manual
Summary:        Documents for %{name}
Group:          Development/Documentation

%description    manual
%{summary}.
%endif

%prep
%setup -q %{name}-%{version}
for j in $(find . -name "*.jar"); do
    mv $j $j.no
done
cp %{SOURCE1} settings.xml

%patch0 -b .sav0
%patch1 -b .sav1
%patch2 -b .sav2
%patch3 -b .sav3

# This test requires megginson's sax2
rm xstream/src/test/com/thoughtworks/xstream/io/xml/SaxWriterTest.java
# These sources are for Java5
# Keep them now
#rm -rf xstream/src/java/com/thoughtworks/xstream/annotations/
#rm -rf xstream/src/test/com/thoughtworks/acceptance/annotations/

mkdir -p xstream-distribution/target/xsite

%build
export JAVA_HOME=%{_jvmdir}/java-1.5.0
%if %{with_maven}
sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml
sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml

export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL

mkdir external_repo
ln -s %{_javadir} external_repo/JPP

mvn-jpp \
        -e \
        -s $(pwd)/settings.xml \
        -Dmaven2.jpp.mode=true \
        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        install javadoc:javadoc

%else
cd xstream
pushd lib
# cglib-nodep-2.1_3.jar.no
ln -sf $(build-classpath cglib-nodep)
# commons-lang-2.1.jar.no
ln -sf $(build-classpath commons-lang)
# dom4j-1.6.1.jar.no
ln -sf $(build-classpath dom4j)
# jdom-1.0.jar.no
ln -sf $(build-classpath jdom)
# jettison-1.0-RC1.jar.no
ln -sf $(build-classpath jettison)
# jmock-1.0.1.jar.no
ln -sf $(build-classpath jmock)
# joda-time-1.2.1.jar.no
ln -sf $(build-classpath joda-time)
# junit-3.8.1.jar.no
ln -sf $(build-classpath junit)
# oro-2.0.8.jar.no
ln -sf $(build-classpath oro)
# stax-1.2.0.jar.no
ln -sf $(build-classpath bea-stax-ri)
# stax-api-1.0.1.jar.no
ln -sf $(build-classpath bea-stax-api)
# wstx-asl-3.2.0.jar.no
ln -sf $(build-classpath wstx/wstx-asl)
# xml-writer-0.2.jar.no

#xom-1.1.jar.no
ln -sf $(build-classpath xom)
# xpp3_min-1.1.3.4.O.jar.no
ln -sf $(build-classpath xpp3)
popd
ant library javadoc
%endif

%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 644 xstream/target/%{name}-%{version}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
%if %{with_maven}
install -Dpm 644 xstream-benchmark/target/%{name}-benchmark-%{version}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-benchmark-%{version}.jar
%else
install -Dpm 644 xstream/target/%{name}-benchmark-%{version}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-benchmark-%{version}.jar
%endif

%add_to_maven_depmap com.thoughtworks.xstream xstream %{version} JPP %{name}
%add_to_maven_depmap com.thoughtworks.xstream xstream-benchmark %{version} JPP %{name}-benchmark
%add_to_maven_depmap com.thoughtworks.xstream xstream-parent %{version} JPP %{name}-parent

(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

# poms
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -pm 644 pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-parent.pom
install -pm 644 xstream/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}.pom
install -pm 644 xstream-benchmark/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-benchmark.pom

#
install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/core
%if %{with_maven}
cp -pr xstream/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/core
%else
cp -pr xstream/target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/core
%endif
install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/benchmark
%if %{with_maven}
cp -pr xstream-benchmark/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/benchmark
%else
cp -pr xstream/target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/benchmark
%endif
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink

# manual
install -dm 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/xsite
cp LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
%if %{with_maven}
rm -rf xstream-distribution/target/xsite/javadoc 
cp -pr xstream-distribution/target/xsite/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/xsite
%endif

%if %{gcj_support}
export CLASSPATH=$(build-classpath gnu-crypto)
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT


%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}

%postun javadoc
if [ "$1" = "0" ]; then
  rm -f %{_javadocdir}/%{name}
fi

%post
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%update_maven_depmap 
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}/LICENSE.txt
%{_javadir}/*.jar
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}
%if %{gcj_support}
%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*%{version}.jar.*
%endif

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%ghost %doc %{_javadocdir}/%{name}

%if %{with_maven}
%files manual
%defattr(-,root,root,-)
%doc %{_docdir}/%{name}-%{version}/xsite
%endif

%changelog
* Mon Jan 28 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.2.2-2jpp
- Must rebuild with java5 for use with java >= 5
- Activate Java5 features
- Add xalan-j2, xalan-j2-serializer to test dependencies and BRs

* Fri Jul 20 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2.2-1jpp
- Upgrade to 1.2.2
- Build with maven2 by default
- Add poms and depmap frags

* Tue May 23 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.1.3-1jpp
- Upgrade to 1.1.3
- Patched to work with bea

* Mon Sep 13 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0.2-2jpp
- Drop saxpath requirement
- Require jaxen >= 0:1.1

* Mon Aug 30 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0.2-1jpp
- Upgrade to 1.0.2
- Delete included binary jars
- Change -Dbuild.sysclasspath "from only" to "first" (DynamicProxyTest)
- Relax some versioned dependencies
- Build with ant-1.6.2

* Fri Aug 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0.1-2jpp
- Upgrade to ant-1.6.X

* Tue Jun 01 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0.1-1jpp
- Upgrade to 1.0.1

* Fri Feb 13 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.3-1jpp
- Upgrade to 0.3
- Add manual subpackage

* Mon Jan 19 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.2-1jpp
- First JPackage release


--- NEW FILE: xstream-build_xml.patch ---
--- xstream/build.xml.sav	2007-05-24 10:10:48.000000000 +0200
+++ xstream/build.xml	2007-07-15 17:18:42.000000000 +0200
@@ -1,6 +1,6 @@
 <project name="xstream" default="library">
 
-    <property name="version" value="SNAPSHOT"/>
+    <property name="version" value="1.2.2"/>
 
 	<property name="build.dir" value="target"/>
 	<property name="java.src.dir" value="src/java"/>

--- NEW FILE: xstream-xstream-pom_xml.patch ---
--- xstream/pom.xml.sav	2007-05-24 10:10:48.000000000 +0200
+++ xstream/pom.xml	2008-01-28 13:15:07.000000000 +0100
@@ -98,6 +98,23 @@
       <artifactId>commons-lang</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>xalan</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>xalan-serializer</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -106,6 +123,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
+          <testFailureIgnore>true</testFailureIgnore>
           <systemProperties>
             <property>
               <name>test.src.dir</name>

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/xstream/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 20:23:38 -0000	1.1
--- sources	28 May 2008 20:24:04 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ a29303d9e74ddb39de87fa5c6dcd2099  xstream-distribution-1.2.2-src.zip

--- NEW FILE: xstream-jpp-depmap.xml ---
<dependencies>
	<dependency>
		<maven>
			<groupId>servletapi</groupId>
			<artifactId>servletapi</artifactId>
			<version>2.3</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>servletapi5</artifactId>
			<version>2.4</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>jetty</groupId>
			<artifactId>jetty</artifactId>
			<version>4.2.10</version>
		</maven>
		<jpp>
			<groupId>JPP/jetty5</groupId>
			<artifactId>jetty5</artifactId>
			<version>5.1.12</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>joda-time</groupId>
			<artifactId>joda-time</artifactId>
			<version>1.2.1</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>joda-time</artifactId>
			<version>1.2.1</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>xom</groupId>
			<artifactId>xom</artifactId>
			<version>1.1</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>xom</artifactId>
			<version>1.0</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>xpp3</groupId>
			<artifactId>xpp3</artifactId>
			<version>1.1.3.4.O</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>xpp3</artifactId>
			<version>1.1.3.8</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>xpp3</groupId>
			<artifactId>xpp3_min</artifactId>
			<version>1.1.3.4.O</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>xpp3</artifactId>
			<version>1.1.3.8</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>cglib</groupId>
			<artifactId>cglib-nodep</artifactId>
			<version>2.1_3</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>cglib-nodep</artifactId>
			<version>2.1.3</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>com.megginson.sax</groupId>
			<artifactId>xml-writer</artifactId>
			<version>0.2</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>xom</artifactId>
			<version>1.0</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>stax</groupId>
			<artifactId>stax</artifactId>
			<version>1.2.0</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>bea-stax-ri</artifactId>
			<version>1.2.0</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>stax</groupId>
			<artifactId>stax-api</artifactId>
			<version>1.0.1</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>bea-stax-api</artifactId>
			<version>1.0.1</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>plexus</groupId>
			<artifactId>plexus-utils</artifactId>
			<version>1.2</version>
		</maven>
		<jpp>
			<groupId>JPP/plexus</groupId>
			<artifactId>utils</artifactId>
			<version>1.2</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>org.codehaus.xsite</groupId>
			<artifactId>xsite-maven-plugin</artifactId>
			<version>1.0-beta-5</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>xsite-maven-plugin</artifactId>
			<version>1.0</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>org.nanocontainer</groupId>
			<artifactId>nanocontainer</artifactId>
			<version>1.1</version>
		</maven>
		<jpp>
			<groupId>JPP/nanocontainer</groupId>
			<artifactId>container</artifactId>
			<version>1.1</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>opensymphony</groupId>
			<artifactId>sitemesh</artifactId>
			<version>2.3</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>sitemesh</artifactId>
			<version>2.3</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>freemarker</groupId>
			<artifactId>freemarker</artifactId>
			<version>2.3.9</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>freemarker</artifactId>
			<version>2.3.6</version>
		</jpp>
	</dependency>

        <dependency>
                <maven>
                        <groupId>asm</groupId>
                        <artifactId>asm</artifactId>
                        <version>2.2.3</version>
                </maven>
                <jpp>
                        <groupId>JPP/asm2</groupId>
                        <artifactId>asm2</artifactId>
                        <version>2.2.3</version>
                </jpp>
        </dependency>
        <dependency>
                <maven>
                        <groupId>asm</groupId>
                        <artifactId>asm-tree</artifactId>
                        <version>2.2.3</version>
                </maven>
                <jpp>
                        <groupId>JPP/asm2</groupId>
                        <artifactId>asm2-tree</artifactId>
                        <version>2.2.3</version>
                </jpp>
        </dependency>
        <dependency>
                <maven>
                        <groupId>xalan</groupId>
                        <artifactId>xalan-serializer</artifactId>
                        <version>2.7.0</version>
                </maven>
                <jpp>
                        <groupId>JPP</groupId>
                        <artifactId>xalan-j2-serializer</artifactId>
                        <version>2.7.0</version>
                </jpp>
        </dependency>
        <dependency>
                <maven>
                        <groupId>slide</groupId>
                        <artifactId>slide-webdavlib</artifactId>
                        <version>2.1</version>
                </maven>
                <jpp>
                        <groupId>JPP/slide</groupId>
                        <artifactId>slide-webdavclient-webdavlib</artifactId>
                        <version>2.1</version>
                </jpp>
        </dependency>

</dependencies>

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/xstream/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 20:23:38 -0000	1.1
--- .cvsignore	28 May 2008 20:24:04 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ xstream-distribution-1.2.2-src.zip




More information about the JPackage-commits mailing list