[apache-commons-net] Rebase to latest upstream version
by Stanislav Ochotnicky
commit 0047ba2a544120ec12bf5424e456517aaf402788
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Dec 10 16:33:04 2010 +0100
Rebase to latest upstream version
- Replace maven plugins with apache-commons-parent for BR
- Versionless jars and javadocs
.gitignore | 1 +
apache-commons-net.spec | 57 +++++++++++++++++++---------------------------
sources | 2 +-
3 files changed, 26 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 636cffb..1914029 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
commons-net-2.0-src.tar.gz
+/commons-net-2.2-src.tar.gz
diff --git a/apache-commons-net.spec b/apache-commons-net.spec
index 19ec15d..32883ef 100644
--- a/apache-commons-net.spec
+++ b/apache-commons-net.spec
@@ -3,8 +3,8 @@
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 2.0
-Release: 6%{?dist}
+Version: 2.2
+Release: 1%{?dist}
Summary: Internet protocol suite Java library
License: ASL 2.0
Group: Development/Libraries
@@ -14,24 +14,17 @@ BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-plugin-bundle
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-changes-plugin
BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven2-plugin-antrun
-BuildRequires: maven2-plugin-assembly
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-idea
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-resources
+BuildRequires: maven-surefire-provider-junit4
+BuildRequires: maven-plugin-build-helper
+BuildRequires: apache-commons-parent
Requires: java >= 1:1.6.0
Requires: jpackage-utils >= 0:1.7.2
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Provides: jakarta-%{short_name} = 0:%{version}-%{release}
Obsoletes: jakarta-%{short_name} < 0:2.0-3
@@ -68,36 +61,25 @@ mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install javadoc:javadoc
%install
-rm -rf $RPM_BUILD_ROOT
-
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+ln -s %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{short_name}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}
-for jar in *-%{version}*; do
- ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
- ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
- ln -sf ${jar} `echo $jar| sed "s|apache-\(.*\)-%{version}|\1|g"`
-done
-popd # come back from javadir
# pom
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{name}
# following line is only for backwards compatibility. New packages
# should use proper groupid org.apache.commons and also artifactid
-%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
+%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{name}
# 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}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
%post
%update_maven_depmap
@@ -105,20 +87,29 @@ rm -rf $RPM_BUILD_ROOT
%postun
%update_maven_depmap
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+
%files
%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt
%{_javadir}/*
-%{_mavenpomdir}/JPP-%{short_name}.pom
+%{_mavenpomdir}/JPP-%{name}.pom
%{_mavendepmapfragdir}
%files javadoc
%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}
%doc LICENSE.txt NOTICE.txt
%changelog
+* Fri Dec 10 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2-1
+- Replace maven plugins with apache-commons-parent for BR
+- Versionless jars and javadocs
+- Rebase to latest upstream version
+
* Thu Jul 8 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.0-6
- Add license to javadoc subpackage
diff --git a/sources b/sources
index 1be86b8..32dcc3b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-583630202369df3cf996cbdba4d8634b commons-net-2.0-src.tar.gz
+e52a248454857af78784dad1f5a94d87 commons-net-2.2-src.tar.gz
13 years, 4 months
[Bug 655816] maven-shared installs pom files with incorrect filename
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
https://bugzilla.redhat.com/show_bug.cgi?id=655816
Stanislav Ochotnicky <sochotni(a)redhat.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|NEW |CLOSED
Resolution| |NOTABUG
Last Closed| |2010-12-10 10:07:16
--- Comment #1 from Stanislav Ochotnicky <sochotni(a)redhat.com> 2010-12-10 10:07:16 EST ---
Sorry about noise, verification can't work with fragments being in one package
and pom file being in a different one. False positive. Closing
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
13 years, 4 months
[maven2] Fix installation of pom files for artifact jars
by Stanislav Ochotnicky
commit b4c602f9f044598544cff3d68710f68b9447ea0f
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Dec 10 12:59:16 2010 +0100
Fix installation of pom files for artifact jars
For most jars we accidentaly installed main maven pom instead of
specific pom file for that jar module. This patch should fix this. It
also uses pushd/popd to be more error-resilient and clear.
maven2.spec | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/maven2.spec b/maven2.spec
index 6a9ed21..fa9014c 100644
--- a/maven2.spec
+++ b/maven2.spec
@@ -3,7 +3,7 @@
Name: maven2
Version: 2.2.1
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Build Tools
@@ -428,19 +428,19 @@ for file in \
maven-plugin-descriptor/target/maven-plugin-descriptor-%{version}.jar; do \
FNAME=`basename $file`
- FNAME_NO_EXT=`echo "$FNAME" | sed -e s:.jar$::g`
+ FNAME_NO_EXT=`basename $file .jar`
DIR=`dirname $file`
UNVER_NAME=`basename $file | sed -e s:-%{version}::g`
UNVER_NAME_WITH_NO_EXT=`echo $FNAME_NO_EXT | sed -e s:-%{version}::g`
ARTIFACT=`basename \`dirname $DIR\``
- OLDPWD=`pwd`
- cd $DIR
+
+ pushd $DIR
install -m 644 $FNAME $RPM_BUILD_ROOT%{_javadir}/%{name}/
ln -s $FNAME $RPM_BUILD_ROOT%{_javadir}/%{name}/$UNVER_NAME
- install -m 644 ../../pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$UNVER_NAME_WITH_NO_EXT.pom
+ install -m 644 ../pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$UNVER_NAME_WITH_NO_EXT.pom
%add_to_maven_depmap org.apache.maven $ARTIFACT %{version} JPP/%{name} $UNVER_NAME_WITH_NO_EXT
- cd $OLDPWD
+ popd
done
# maven-reporting-api
@@ -504,6 +504,9 @@ rm -rf $RPM_BUILD_ROOT
%doc
%changelog
+* Fri Dec 10 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-16
+- Fix installation of pom files for artifact jars
+
* Mon Nov 22 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-15
- Add apache-commons-parent to BR/R
- Rename BRs from jakarta-commons to apache-commons
13 years, 4 months
[maven-surefire] Add proper Requires on junit/junit4/testng to providers
by Stanislav Ochotnicky
commit f5f465ae02df6b562488a0ff6a75aca430fb6ffd
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Dec 8 12:10:24 2010 +0100
Add proper Requires on junit/junit4/testng to providers
maven-surefire.spec | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/maven-surefire.spec b/maven-surefire.spec
index 4c0d038..43cdeda 100644
--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@@ -1,7 +1,7 @@
Name: maven-surefire
Version: 2.6
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 0
Summary: Test framework project
License: ASL 2.0
@@ -94,6 +94,7 @@ Plugin for generating reports from surefire test runs.
%package provider-junit
Summary: JUnit3 provider for Maven Surefire
Group: Development/Libraries
+Requires: junit
Requires: maven-surefire = %{epoch}:%{version}-%{release}
Obsoletes: maven2-plugin-surefire-report <= 0:2.0.4O
#Obsoletes: maven-surefire-junit = 2.3.1
@@ -107,6 +108,7 @@ JUnit3 provider for Maven Surefire.
Summary: JUnit4 provider for Maven Surefire
Group: Development/Libraries
Requires: maven-surefire = %{epoch}:%{version}-%{release}
+Requires: junit4
%description provider-junit4
JUnit4 provider for Maven Surefire.
@@ -115,6 +117,7 @@ JUnit4 provider for Maven Surefire.
Summary: TestNG provider for Maven Surefire
Group: Development/Libraries
Requires: maven-surefire = %{epoch}:%{version}-%{release}
+Requires: testng
%description provider-testng
TestNG provider for Maven Surefire.
@@ -297,6 +300,9 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_javadocdir}/*
%changelog
+* Wed Dec 8 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.6-3
+- Add proper Requires on junit/junit4/testng to providers
+
* Fri Oct 29 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.6-2
- Add main pom.xml
13 years, 4 months
[apache-commons-launcher] - Fix build due to changed ant groupId.
by Alexander Kurtakov
commit 7cafdf885697ebb5026073162e42913cf65dd644
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Dec 8 11:44:33 2010 +0200
- Fix build due to changed ant groupId.
apache-commons-launcher.spec | 23 +++++++++++++----------
commons-launcher-pom.patch | 13 ++++++++++---
2 files changed, 23 insertions(+), 13 deletions(-)
---
diff --git a/apache-commons-launcher.spec b/apache-commons-launcher.spec
index 33f0924..7d9a794 100644
--- a/apache-commons-launcher.spec
+++ b/apache-commons-launcher.spec
@@ -3,7 +3,7 @@
Name: apache-%{short_name}
Version: 1.1
-Release: 5.20100521svn936225%{?dist}
+Release: 6.20100521svn936225%{?dist}
Summary: A cross platform Java application launcher
Group: Development/Libraries
License: ASL 2.0
@@ -36,14 +36,14 @@ BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
-BuildRequires: maven2-plugin-antrun
-BuildRequires: maven2-plugin-assembly
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-idea
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-resources
+BuildRequires: maven-antrun-plugin
+BuildRequires: maven-assembly-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-idea-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-plugin-bundle
BuildRequires: maven-surefire-maven-plugin
@@ -97,6 +97,7 @@ Obsoletes: jakarta-%{short_name}-javadoc < %{version}-%{release}
%patch0 -p0 -b .orig
sed -i 's/\r//' README.txt LICENSE.txt NOTICE.txt
+sed -i "s|\<groupId\>ant\<\/groupId\>|<groupId>org.apache.ant</groupId>|g" build.xml
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
@@ -148,6 +149,9 @@ rm -rf %{buildroot}
%{_javadocdir}/%{name}
%changelog
+* Wed Dec 8 2010 Alexander Kurtakov <akurtako(a)redhat.com> 1.1-6.20100521svn936225
+- Fix build due to changed ant groupId.
+
* Fri May 21 2010 Mat Booth <fedora(a)matbooth.co.uk> - 1.1-5.20100521svn936225
- Version like a post release snapshot, not a pre release snapshot.
- Correct dep-map names.
@@ -188,4 +192,3 @@ rm -rf %{buildroot}
* Fri Nov 17 2006 Jason Corley <jason.corley(a)gmail.com> - 0:1.1-1jpp
- 1.1
-
diff --git a/commons-launcher-pom.patch b/commons-launcher-pom.patch
index 9276cd4..c897426 100644
--- a/commons-launcher-pom.patch
+++ b/commons-launcher-pom.patch
@@ -1,5 +1,5 @@
---- pom.xml.orig 2010-04-21 10:02:56.000000000 +0100
-+++ pom.xml 2010-05-21 16:35:38.349719596 +0100
+--- pom.xml.orig 2010-04-21 12:02:56.000000000 +0300
++++ pom.xml 2010-12-08 11:41:04.149160219 +0200
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>commons-launcher</groupId>
@@ -9,7 +9,14 @@
<name>Commons Launcher</name>
<inceptionYear>2002</inceptionYear>
<description>
-@@ -83,12 +83,6 @@
+@@ -77,18 +77,12 @@
+
+ <dependencies>
+ <dependency>
+- <groupId>ant</groupId>
++ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.5.3-1</version>
<scope>provided</scope>
</dependency>
<dependency>
13 years, 4 months
[plexus-digest] - Drop ant build. - Adapt to new guidelines.
by Alexander Kurtakov
commit bfb9a1db3ae2cd365e2dd9b7d974b22204cdb1d5
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Dec 8 01:25:16 2010 +0200
- Drop ant build.
- Adapt to new guidelines.
plexus-digest-1.0-build.xml | 107 ------------------------------------------
plexus-digest-components.xml | 24 ---------
plexus-digest.spec | 65 +++++++------------------
3 files changed, 18 insertions(+), 178 deletions(-)
---
diff --git a/plexus-digest.spec b/plexus-digest.spec
index f1ca35f..8c2e1d6 100644
--- a/plexus-digest.spec
+++ b/plexus-digest.spec
@@ -28,18 +28,12 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# If you don't want to build with maven, and use straight ant instead,
-# give rpmbuild option '--without maven'
-
-%define with_maven 1
-%define without_maven 0
-
-%define parent plexus
-%define subname digest
+%global parent plexus
+%global subname digest
Name: plexus-digest
Version: 1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 0
Summary: Plexus Digest / Hashcode Components
License: ASL 2.0
@@ -49,29 +43,22 @@ Source0: %{name}-%{version}-src.tar.gz
# svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-digest-1.1/ plexus-digest/
# tar czf plexus-digest-1.1-src.tar.gz plexus-digest/
-Source2: %{name}-1.0-build.xml
-Source3: %{name}-components.xml
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant >= 0:1.6
-%if %{with_maven}
BuildRequires: maven2 >= 2.0.4-9
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-resources
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-maven-plugin
-BuildRequires: maven-surefire-provider-junit = 2.3
+BuildRequires: maven-surefire-provider-junit
BuildRequires: maven2-common-poms >= 1.0
BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
BuildRequires: qdox >= 1.5
-%endif
BuildRequires: plexus-maven-plugin
BuildRequires: plexus-cdc
@@ -91,6 +78,7 @@ is like a J2EE application server, without all the baggage.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
+Requires: jpackage-utils
%description javadoc
Javadoc for %{name}.
@@ -98,15 +86,7 @@ Javadoc for %{name}.
%prep
%setup -q -n %{name}
-%if ! %{with_maven}
-cp %{SOURCE2} build.xml
-mkdir -p target/classes/META-INF/plexus
-cp %{SOURCE3} target/classes/META-INF/plexus/components.xml
-%endif
-
-
%build
-%if %{with_maven}
mkdir external_repo
ln -s %{_javadir} external_repo/JPP
@@ -117,26 +97,15 @@ mvn-jpp \
-e \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install javadoc:javadoc
-# -Dmaven.test.failure.ignore=true \
-
-%else
-export CLASSPATH=$(build-classpath classworlds \
- plexus/utils plexus/container-default)
-CLASSPATH=$CLASSPATH:target/classes:target/test-classes
-ant -Dbuild.sysclasspath=only jar javadoc
-%endif
%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 target/*.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}.jar
%add_to_maven_depmap org.codehaus.plexus %{name} 1.0 JPP/%{parent} %{subname}
-(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-
# pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -pm 644 pom.xml \
@@ -150,9 +119,6 @@ cp -pr target/site/apidocs/* \
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post
%update_maven_depmap
@@ -161,8 +127,8 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%{_javadir}/plexus
-%{_datadir}/maven2
+%{_javadir}/plexus/*
+%{_mavenpomdir}
%{_mavendepmapfragdir}
%files javadoc
@@ -170,6 +136,10 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_javadocdir}/*
%changelog
+* Wed Dec 8 2010 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.1-2
+- Drop ant build.
+- Adapt to new guidelines.
+
* Tue Dec 22 2009 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.1-1
- Update to upstream 1.1.
@@ -211,3 +181,4 @@ rm -rf $RPM_BUILD_ROOT
* Wed Nov 14 2007 Ralph Apel <r.apel @ r-apel.de> - 0:1.0-1jpp
- Initial build
+
13 years, 4 months