diff --git a/.gitignore b/.gitignore
index 6b62fce..9e29462 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
plexus-containers-1.5.4.tar.xz
+/plexus-containers-1.5.5.tar.xz
diff --git a/plexus-containers-javadoc-junit-link.patch b/plexus-containers-javadoc-junit-link.patch
deleted file mode 100644
index c7d4dd6..0000000
--- a/plexus-containers-javadoc-junit-link.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up ./plexus-container-default/pom.xml.sav ./plexus-container-default/pom.xml
---- ./plexus-container-default/pom.xml.sav 2008-01-31 17:50:25.000000000 -0500
-+++ ./plexus-container-default/pom.xml 2008-01-31 17:53:08.000000000 -0500
-@@ -51,18 +51,16 @@
- maven-javadoc-plugin
-
-
-- http://java.sun.com/j2ee/1.4/docs/api
-- http://java.sun.com/j2se/1.5.0/docs/api
-- http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/
-- http://jakarta.apache.org/commons/dbcp/apidocs/
-- http://jakarta.apache.org/commons/fileupload/apidocs/
-- http://jakarta.apache.org/commons/httpclient/apidocs/
-- http://jakarta.apache.org/commons/logging/apidocs/
-- http://jakarta.apache.org/commons/pool/apidocs/
-- http://www.junit.org/junit/javadoc/
-- http://logging.apache.org/log4j/docs/api/
-- http://jakarta.apache.org/regexp/apidocs/
-- http://jakarta.apache.org/velocity/api/
-+ file:///usr/share/javadoc/java
-+ file:///usr/share/javadoc/jakarta-commons-collections
-+ file:///usr/share/javadoc/jakarta-commons-dbcp
-+ file:///usr/share/javadoc/jakarta-commons-fileupload
-+ file:///usr/share/javadoc/jakarta-commons-httpclient
-+ file:///usr/share/javadoc/jakarta-commons-logging
-+ file:///usr/share/javadoc/jakarta-commons-pool
-+ file:///usr/share/javadoc/log4j
-+ file:///usr/share/javadoc/regexp
-+ file:///usr/share/javadoc/velocity
-
-
-
-diff -up ./plexus-component-annotations/pom.xml.sav ./plexus-component-annotations/pom.xml
diff --git a/plexus-containers-pom.patch b/plexus-containers-pom.patch
deleted file mode 100644
index 1ab4896..0000000
--- a/plexus-containers-pom.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: pom.xml
-===================================================================
---- pom.xml (revision 8729)
-+++ pom.xml (working copy)
-@@ -2,12 +2,7 @@
-
- 4.0.0
-
--
-- org.codehaus.plexus
-- plexus
-- 2.0.5
--
--
-+ org.codehaus.plexus
- plexus-containers
- 1.5.4
- pom
-Index: plexus-component-metadata/pom.xml
-===================================================================
---- plexus-component-metadata/pom.xml (revision 8729)
-+++ plexus-component-metadata/pom.xml (working copy)
-@@ -63,6 +63,10 @@
- asm
- 3.1
-
-+
-+ org.apache.maven
-+ maven-artifact
-+
-
-
-
diff --git a/plexus-containers-sourcetarget.patch b/plexus-containers-sourcetarget.patch
deleted file mode 100644
index 194f062..0000000
--- a/plexus-containers-sourcetarget.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./plexus-container-default/pom.xml.orig 2008-12-10 15:39:48.915862000 -0500
-+++ ./plexus-container-default/pom.xml 2008-12-10 15:43:30.466597000 -0500
-@@ -27,6 +27,14 @@
-
-
-
-+
-+ org.apache.maven.plugins
-+ maven-compiler-plugin
-+
-+ 1.4
-+ 1.4
-+
-+
-
-
-
diff --git a/plexus-containers.depmap b/plexus-containers.depmap
deleted file mode 100644
index 60264af..0000000
--- a/plexus-containers.depmap
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
- asm
- asm-tree
- 3.0
-
-
- JPP/objectweb-asm
- asm-tree
- 3.2
-
-
-
-
- asm
- asm-util
- 3.0
-
-
- JPP/objectweb-asm
- asm-util
- 3.2
-
-
-
-
- asm
- asm-commons
- 3.0
-
-
- JPP/objectweb-asm
- asm-commons
- 3.2
-
-
-
-
- asm
- asm-analysis
- 3.0
-
-
- JPP/objectweb-asm
- asm-analysis
- 3.2
-
-
-
-
- asm
- asm
- 3.0
-
-
- JPP/objectweb-asm
- asm
- 3.2
-
-
-
diff --git a/plexus-containers.spec b/plexus-containers.spec
index fc4f966..e8ec080 100644
--- a/plexus-containers.spec
+++ b/plexus-containers.spec
@@ -9,26 +9,22 @@
%global javadoc_plugin_version 2.7
Name: %{parent}-%{subname}
-Version: 1.5.4
-Release: 5%{?dist}
+Version: 1.5.5
+Release: 1%{?dist}
Summary: Containers for Plexus
License: ASL 2.0 and Plexus
Group: Development/Libraries
URL: http://plexus.codehaus.org/
# svn export \
-# http://svn.codehaus.org/plexus/plexus-containers/tags/plexus-containers-1.5.4
-# tar caf plexus-containers-1.5.4.tar.xz plexus-containers-1.5.4
+# http://svn.codehaus.org/plexus/plexus-containers/tags/plexus-containers-1.5.5
+# tar caf plexus-containers-1.5.5.tar.xz plexus-containers-1.5.5
Source0: %{name}-%{version}.tar.xz
Source1: plexus-container-default-build.xml
Source2: plexus-component-annotations-build.xml
Source3: plexus-containers-settings.xml
-Source4: %{name}.depmap
-Patch0: plexus-containers-javadoc-junit-link.patch
-Patch1: plexus-containers-pom.patch
-Patch2: plexus-containers-test-oom.patch
+Patch0: plexus-containers-test-oom.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -134,10 +130,7 @@ Obsoletes: %{name}-container-default-javadoc < %{version}-%{release}
cp %{SOURCE1} plexus-container-default/build.xml
cp %{SOURCE2} plexus-component-annotations/build.xml
-# Fixit: update patch
-#%patch0 -b .sav0
-%patch1
-%patch2
+%patch0
# to prevent ant from failing
mkdir -p plexus-component-annotations/src/test/java
@@ -151,9 +144,8 @@ export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
%if %{with_maven}
- mvn-jpp \
+ mvn-rpmbuild \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven2.jpp.depmap.file=%{SOURCE4} \
-Dmaven.test.skip=true \
install
@@ -162,9 +154,8 @@ mkdir -p $MAVEN_REPO_LOCAL
sha1sum $file | awk '{print $1}' > $ile.sha1
done
- mvn-jpp \
+ mvn-rpmbuild \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven2.jpp.depmap.file=%{SOURCE4} \
javadoc:aggregate
%else
export OPT_JAR_LIST="ant/ant-junit junit"
@@ -186,20 +177,16 @@ popd
%endif
%install
-rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 plexus-container-default/target/*.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{parent}/containers-container-default-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{parent}/containers-container-default.jar
install -pm 644 plexus-component-annotations/target/*.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{parent}/containers-component-annotations-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{parent}/containers-component-annotations.jar
install -pm 644 plexus-component-metadata/target/*.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{parent}/containers-component-metadata-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{parent}/containers-component-metadata.jar
install -pm 644 plexus-component-annotations/target/*.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{parent}/containers-component-javadoc-%{version}.jar
-
-(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+ $RPM_BUILD_ROOT%{_javadir}/%{parent}/containers-component-javadoc.jar
# pom
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
@@ -228,12 +215,14 @@ install -pm 644 \
%add_to_maven_depmap org.codehaus.plexus containers-component-api %{version} JPP/%{parent} containers-container-default
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+%pre javadoc
+# workaround for rpm bug, can be removed in F-18
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-%clean
-rm -rf $RPM_BUILD_ROOT
%post component-metadata
%update_maven_depmap
@@ -256,7 +245,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_mavenpomdir}/*
-%{_mavendepmapfragdir}
+%{_mavendepmapfragdir}/%{name}
%files component-annotations
%defattr(-,root,root,-)
@@ -279,6 +268,13 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_javadocdir}/*
%changelog
+* Fri Feb 25 2011 Stanislav Ochotnicky - 1.5.5-1
+- Update to latest upstream
+- Remove obsolete patches
+- Use maven 3 to build
+- Packaging fixes
+- Versionless jars & javadocs
+
* Wed Feb 09 2011 Fedora Release Engineering - 1.5.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 56b189c..21f784a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c619b8d87478e55037703e6faaacc858 plexus-containers-1.5.4.tar.xz
+78e22c30a99ed7b4e7ac77f37c991b1d plexus-containers-1.5.5.tar.xz