[maven-shared] Remove exact version dependency on artifact-filters
by Stanislav Ochotnicky
commit 104380130fc4cd9fa4e605e8ffae3ec7fc832fbb
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Feb 29 11:48:01 2012 +0100
Remove exact version dependency on artifact-filters
...hared-Add-container-default-to-shared-jar.patch | 29 ++++++++++++++++++++
maven-shared.spec | 14 +++++++---
2 files changed, 39 insertions(+), 4 deletions(-)
---
diff --git a/maven-shared-Add-container-default-to-shared-jar.patch b/maven-shared-Add-container-default-to-shared-jar.patch
new file mode 100644
index 0000000..fc74b05
--- /dev/null
+++ b/maven-shared-Add-container-default-to-shared-jar.patch
@@ -0,0 +1,29 @@
+From 2d3b2c4f68b985027d2734aef7eda17ce00315b1 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Wed, 29 Feb 2012 16:02:15 +0100
+Subject: [PATCH 5/5] Add container default to shared-jar
+
+---
+ maven-shared-jar/pom.xml | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/maven-shared-jar/pom.xml b/maven-shared-jar/pom.xml
+index 1cc0937..6e829dc 100644
+--- a/maven-shared-jar/pom.xml
++++ b/maven-shared-jar/pom.xml
+@@ -61,6 +61,12 @@
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
++ <artifactId>plexus-container-default</artifactId>
++ <version>1.0</version>
++ </dependency>
++
++ <dependency>
++ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-digest</artifactId>
+ <version>1.0</version>
+ </dependency>
+--
+1.7.7.6
+
diff --git a/maven-shared.spec b/maven-shared.spec
index 04f1aec..2936db9 100644
--- a/maven-shared.spec
+++ b/maven-shared.spec
@@ -67,7 +67,7 @@ Summary: Maven Shared Components
URL: http://maven.apache.org/shared/
Name: maven-shared
Version: 15
-Release: 22%{?dist}
+Release: 23%{?dist}
License: ASL 2.0
Group: Development/Libraries
@@ -81,7 +81,8 @@ Patch0: %{name}-pom.patch
Patch1: %{name}-maven3.patch
Patch2: %{name}-maven-model-v3-removal.patch
Patch3: %{name}-migration-to-component-metadata.patch
-Patch6: maven-runtime-XMLMavenRuntimeVisitor.patch
+Patch6: maven-runtime-XMLMavenRuntimeVisitor.patch
+Patch7: maven-shared-Add-container-default-to-shared-jar.patch
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant
@@ -279,7 +280,7 @@ Summary: Maven Repository Builder
Group: Development/Libraries
Version: %{repository_builder_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
-Requires: %{name}-common-artifact-filters = 0:%{common_artifact_filters_version}-%{release}
+Requires: %{name}-common-artifact-filters >= 0:%{common_artifact_filters_version}-%{release}
Requires: maven
Requires: maven-artifact-manager
Requires: maven-project
@@ -322,7 +323,7 @@ Group: Development/Libraries
Version: %{monitor_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: maven
-Requires: plexus-container-default
+Requires: plexus-containers-container-default
%description monitor
%{summary}.
@@ -395,6 +396,7 @@ chmod -R go=u-w *
%patch6 -b .sav6
%patch2 -p1
%patch3 -p1
+%patch7 -p1
# Fix aqute-bnd dependency
sed -i "s|<artifactId>bndlib|<artifactId>bnd|g" maven-osgi/pom.xml
@@ -627,6 +629,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadocdir}/%{name}
%changelog
+* Wed Feb 29 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> 15-23
+- Remove exact version dependency on artifact-filters
+- Fix missing plexus-container-default in pom for shared-jar
+
* Sat Jan 14 2012 Ville Skyttä <ville.skytta(a)iki.fi> - 15-22
- Require apache-commons-validator instead of jakarta-* in reporting-impl.
12 years, 2 months
[ant] Update to upstream 1.8.3 release.
by Alexander Kurtakov
commit d74a2cd399029e6d8ed46cb8ae36d2b7838bd7a5
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Feb 29 15:48:14 2012 +0200
Update to upstream 1.8.3 release.
Drop old stuff.
.gitignore | 1 +
ant-classpath-check.patch | 19 ------------
ant.spec | 48 ++++++++----------------------
apache-ant-class-path-in-manifest.patch | 28 ++++++++---------
apache-ant-no-test-jar.patch | 22 +++++++-------
sources | 2 +-
6 files changed, 39 insertions(+), 81 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2aae8a9..e5cef1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
apache-ant-1.7.1-src.tar.bz2
/apache-ant-1.8.1-src.tar.bz2
apache-ant-1.8.2-src.tar.bz2
+apache-ant-1.8.3-src.tar.bz2
diff --git a/ant.spec b/ant.spec
index 7979332..6e895e8 100644
--- a/ant.spec
+++ b/ant.spec
@@ -46,11 +46,10 @@
%global ant_home %{_datadir}/ant
%global major_version 1.8
-%global cvs_version 1.8.2
Name: ant
-Version: 1.8.2
-Release: 9%{?dist}
+Version: 1.8.3
+Release: 1%{?dist}
Epoch: 0
Summary: Build tool for java
Summary(it): Tool per la compilazione di programmi java
@@ -58,14 +57,13 @@ Summary(fr): Outil de compilation pour java
License: ASL 2.0
URL: http://ant.apache.org/
Group: Development/Tools
-Source0: http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.bz2
+Source0: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2
Source2: apache-ant-%{major_version}.ant.conf
# Fix some places where copies of classes are included in the wrong jarfiles
Patch1: apache-ant-bz163689.patch
Patch3: apache-ant-no-test-jar.patch
Patch4: apache-ant-class-path-in-manifest.patch
-Patch5: %{name}-classpath-check.patch
BuildRequires: jpackage-utils >= 0:1.7.5
BuildRequires: java-devel >= 0:1.5.0
@@ -427,26 +425,20 @@ Javadoc pour %{name}.
# -----------------------------------------------------------------------------
%prep
-%setup -q -n apache-ant-%{cvs_version}
+%setup -q -n apache-ant-%{version}
#Fixup version
find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
-#https://issues.apache.org/bugzilla/show_bug.cgi?id=47669
-sed -i -e "s|IMAGE_FILE_TYPE|BINARY_FILE_TYPE|g" src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
# Disable the style and xmlvalidate tasks on ppc64 and s390x (#163689).
%ifarch ppc64 s390x
%patch1 -p1
%endif
# When bootstrapping, we don't have junit
-%patch3 -p1
+%patch3
# Fix class-path-in-manifest rpmlint warning
%patch4
-# Removed checking for classpath duplicates (cause for BZ #755325)
-# Accepted in upstream, release pending
-%patch5 -p1
-
# clean jar files
find . -name "*.jar" | %{_bindir}/xargs -t rm
@@ -461,27 +453,7 @@ mv KEYS.utf8 KEYS
iconv LICENSE -f iso-8859-1 -t utf-8 -o LICENSE.utf8
mv LICENSE.utf8 LICENSE
-# Provides: exclude perl(oata), perl(examples)
-cat <<__EOF__ > %{name}-perl.prov
-#!/bin/sh
-/usr/lib/rpm/perl.prov \$* | grep -v '^perl(oata)$' | grep -v '^perl(examples)$'
-__EOF__
-%define __perl_provides %{_builddir}/apache-ant-%{cvs_version}/%{name}-perl.prov
-chmod +x %{__perl_provides}
-
-
-# Requires: exclude bogus perl(the)
-cat <<__EOF__ > %{name}-perl.req
-#!/bin/sh
-/usr/lib/rpm/perl.req \$* | grep -v '^perl(the)$'
-__EOF__
-%define __perl_requires %{_builddir}/apache-ant-%{cvs_version}/%{name}-perl.req
-chmod +x %{__perl_requires}
-
-# -----------------------------------------------------------------------------
-
%build
-export OPT_JAR_LIST=:
%if %without bootstrap
%{ant} jars test-jar
%if %{build_javadoc}
@@ -494,6 +466,8 @@ export CLASSPATH=$JAVA_HOME/lib/tools.jar
sh ./build.sh --noconfig jars
%endif
+#remove empty jai and netrexx jars. Due to missing dependencies they contain only manifests.
+rm -fr build/lib/ant-jai.jar build/lib/ant-netrexx.jar
# -----------------------------------------------------------------------------
%install
@@ -592,7 +566,7 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%endif
# fix link between manual and javadoc
-(cd docs/manual; ln -sf %{_javadocdir}/%{name} api)
+(cd manual; ln -sf %{_javadocdir}/%{name} api)
%if %with bootstrap
find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
@@ -756,7 +730,7 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
%attr(0755,root,root) %{_bindir}/*.py*
%files manual
-%doc docs/*
+%doc manual/*
%if %{build_javadoc}
%files javadoc
@@ -767,6 +741,10 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
# -----------------------------------------------------------------------------
%changelog
+* Wed Feb 29 2012 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.8.3-1
+- Update to upstream 1.8.3 release.
+- Drop old stuff.
+
* Tue Feb 07 2012 Tomas Radej <tradej(a)redhat.com> - 0:1.8.2-9
- Added patch
diff --git a/apache-ant-class-path-in-manifest.patch b/apache-ant-class-path-in-manifest.patch
index ef5b592..7fa97e9 100644
--- a/apache-ant-class-path-in-manifest.patch
+++ b/apache-ant-class-path-in-manifest.patch
@@ -1,15 +1,13 @@
---- build.xml.orig 2010-12-28 14:45:24.000000000 +0200
-+++ build.xml 2010-12-28 14:46:40.843377673 +0200
-@@ -730,10 +730,10 @@
- <include name="LICENSE.txt"/>
- <include name="NOTICE.txt"/>
- </metainf>
-- <manifest>
-+ <!--manifest>
- <attribute name="Class-Path"
- value="ant.jar xalan.jar"/>
-- </manifest>
-+ </manifest-->
- </jar>
-
- <macrodef name="optional-jar">
+--- build.xml.orig 2012-02-29 13:29:12.000000000 +0200
++++ build.xml 2012-02-29 13:31:36.787937053 +0200
+@@ -728,10 +728,6 @@
+ <include name="LICENSE.txt"/>
+ <include name="NOTICE.txt"/>
+ </metainf>
+- <manifest>
+- <attribute name="Class-Path"
+- value="ant.jar xalan.jar"/>
+- </manifest>
+ </jar>
+
+ <macrodef name="optional-jar">
diff --git a/apache-ant-no-test-jar.patch b/apache-ant-no-test-jar.patch
index d180c53..d0dcd40 100644
--- a/apache-ant-no-test-jar.patch
+++ b/apache-ant-no-test-jar.patch
@@ -1,11 +1,11 @@
---- apache-ant-1.8.1/build.xml.orig 2010-04-30 16:05:05.000000000 -0600
-+++ apache-ant-1.8.1/build.xml 2010-08-16 12:19:41.227167815 -0600
-@@ -792,7 +792,7 @@
- ===================================================================
- -->
- <target name="dist-lite"
-- depends="jars,test-jar"
-+ depends="jars"
- description="--> creates a minimum distribution to run Apache Ant">
-
- <mkdir dir="${dist.dir}"/>
+--- build.xml.orig 2012-02-29 13:24:37.000000000 +0200
++++ build.xml 2012-02-29 13:28:04.606216384 +0200
+@@ -884,7 +884,7 @@
+ ===================================================================
+ -->
+ <target name="dist-lite"
+- depends="jars,test-jar"
++ depends="jars"
+ description="--> creates a minimum distribution to run Apache Ant">
+
+ <mkdir dir="${dist.dir}"/>
diff --git a/sources b/sources
index 1de48fb..f6bc5f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0d9e108afcd15b820150b8085c96d2b1 apache-ant-1.8.2-src.tar.bz2
+d7e0bdd538481b7c15dfb7fbcdd81b0e apache-ant-1.8.3-src.tar.bz2
12 years, 2 months
[maven-plugin-bundle] Update to 2.3.7
by Jaromír Cápík
commit e690400272a4d85b696ea96ffee48efccc18be4a
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Wed Feb 29 14:05:59 2012 +0100
Update to 2.3.7
.gitignore | 1 +
maven-bundle-plugin-manageArtifactSystemPath.patch | 15 ---------------
maven-plugin-bundle.spec | 9 +++++----
sources | 2 +-
4 files changed, 7 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8f08f15..85fba2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
maven-bundle-plugin-2.0.0-project.tar.gz
/maven-bundle-plugin-2.3.5-source-release.tar.gz
/maven-bundle-plugin-2.3.6-source-release.tar.gz
+/maven-bundle-plugin-2.3.7-source-release.tar.gz
diff --git a/maven-plugin-bundle.spec b/maven-plugin-bundle.spec
index d88b4ce..2dea402 100644
--- a/maven-plugin-bundle.spec
+++ b/maven-plugin-bundle.spec
@@ -1,8 +1,8 @@
%global site_name maven-bundle-plugin
Name: maven-plugin-bundle
-Version: 2.3.6
-Release: 3%{?dist}
+Version: 2.3.7
+Release: 1%{?dist}
Summary: Maven Bundle Plugin
Group: Development/Tools
@@ -12,7 +12,6 @@ Source0: http://apache.tradebit.com/pub/felix/%{site_name}-%{version}-sou
#Patch0: %{site_name}-unbundling.patch
Patch1: %{site_name}-unreported-exception.patch
-Patch2: %{site_name}-manageArtifactSystemPath.patch
BuildRequires: aqute-bndlib >= 1.50.0
BuildRequires: plexus-utils >= 1.4.5
@@ -69,7 +68,6 @@ API documentation for %{name}.
#%%patch0 -p1
%patch1 -p1
-%patch2 -p1
# remove bundled stuff
#rm -rf src/main/java/org/apache/maven
@@ -105,6 +103,9 @@ rm -rf target/site/api*
%{_javadocdir}/%{name}
%changelog
+* Wed Feb 29 2012 Jaromir Capik <jcapik(a)redhat.com> 2.3.7-1
+- Update to 2.3.7
+
* Thu Jan 19 2012 Jaromir Capik <jcapik(a)redhat.com> 2.3.6-3
- Bundled maven sources readded (they seem to change the behaviour)
diff --git a/sources b/sources
index a585c7d..272027a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dfcff705fd35b5a96d95752134d9c493 maven-bundle-plugin-2.3.6-source-release.tar.gz
+1e005fbc3ec00a9c94f6fb665c02d258 maven-bundle-plugin-2.3.7-source-release.tar.gz
12 years, 2 months
