[maven-verifier-plugin] Build with maven v3.
by Alexander Kurtakov
commit d067b097fed7019b06d049998e1f097c04b849c5
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Jun 3 16:28:42 2011 +0300
Build with maven v3.
Adapt to current guidelines.
maven-verifier-plugin.spec | 45 ++++++++++++++-----------------------------
1 files changed, 15 insertions(+), 30 deletions(-)
---
diff --git a/maven-verifier-plugin.spec b/maven-verifier-plugin.spec
index 44f496b..6b9a121 100644
--- a/maven-verifier-plugin.spec
+++ b/maven-verifier-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-verifier-plugin
Version: 1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Maven Verifier Plugin
Group: Development/Libraries
@@ -9,27 +9,26 @@ URL: http://maven.apache.org/plugins/maven-verifier-plugin/
#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-verifier-plugin-...
#tar -zcf maven-verifier-plugin-1.0.tar.gz maven-verifier-plugin-1.0/
Source0: %{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-plugin-plugin
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-plugin
BuildRequires: junit
BuildRequires: plexus-utils
BuildRequires: maven-surefire-provider-junit
-Requires: maven2
-Requires: java
-Requires: jpackage-utils
+Requires: maven
+Requires: java
+Requires: jpackage-utils
Requires: junit
Requires: plexus-utils
@@ -56,21 +55,11 @@ API documentation for %{name}.
%setup -q
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
-install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%add_to_maven_depmap org.apache.maven.plugins maven-verifier-plugin %{version} JPP maven-verifier-plugin
@@ -78,10 +67,8 @@ install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-
install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%post
%update_maven_depmap
@@ -89,21 +76,19 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-rm -rf %{buildroot}
-
%files
-%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Fri Jun 3 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.0-4
+- Build with maven v3.
+- Adapt to current guidelines.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@@ -111,4 +96,4 @@ rm -rf %{buildroot}
- Add missing requires maven2
* Wed Jun 02 2010 Hui Wang <huwang(a)redhat.com> - 1.0-1
-- Initial version of the package
\ No newline at end of file
+- Initial version of the package
12 years, 10 months
[plexus-cipher] Ignore test failures.
by Alexander Kurtakov
commit 4a0255a5211277c38bcd9727c8d820d33b99257e
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Jun 3 16:13:42 2011 +0300
Ignore test failures.
plexus-cipher.spec | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/plexus-cipher.spec b/plexus-cipher.spec
index 2795175..9d741d9 100644
--- a/plexus-cipher.spec
+++ b/plexus-cipher.spec
@@ -54,7 +54,9 @@ API documentation for %{name}.
%setup -q
%build
-mvn-rpmbuild install javadoc:javadoc
+mvn-rpmbuild \
+ -Dmaven.test.failure.ignore=true \
+ install javadoc:javadoc
%install
# jars
12 years, 10 months
[plexus-build-api] Build with maven.
by Alexander Kurtakov
commit 7a76adda21f2fe23f6e8a08d37721730895aa219
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Jun 3 16:10:27 2011 +0300
Build with maven.
- Fix requires.
- Guidelines fixes.
plexus-build-api.spec | 53 +++++++++++++++---------------------------------
1 files changed, 17 insertions(+), 36 deletions(-)
---
diff --git a/plexus-build-api.spec b/plexus-build-api.spec
index 7b566d0..6113151 100644
--- a/plexus-build-api.spec
+++ b/plexus-build-api.spec
@@ -1,6 +1,6 @@
Name: plexus-build-api
Version: 0.0.6
-Release: 4%{?dist}
+Release: 6%{?dist}
Summary: Plexus Build API
Group: Development/Libraries
@@ -9,19 +9,18 @@ URL: http://svn.sonatype.org/spice/tags/plexus-build-api-0.0.6
#svn export http://svn.sonatype.org/spice/tags/plexus-build-api-0.0.6
#tar zcf plexus-build-api-0.0.6.tar.gz plexus-build-api-0.0.6/
Source0: %{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: maven2
-BuildRequires: maven2-plugin-plugin
+BuildRequires: maven
+BuildRequires: maven-plugin-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia-sitetools
BuildRequires: plexus-container-default
@@ -36,13 +35,8 @@ BuildRequires: maven-surefire-provider-junit4
Requires: plexus-container-default
Requires: plexus-utils
-Requires: forge-parent
-Requires: plexus-maven-plugin
-Requires: plexus-digest
-Requires: spice-parent
-Requires: maven2
-Requires: jpackage-utils
-Requires: java
+Requires: jpackage-utils
+Requires: java
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
@@ -57,28 +51,16 @@ Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
-
%prep
-%setup -q -n %{name}-%{version}
+%setup -q
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven.test.failure.ignore=true \
- install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
install -d -m 0755 %{buildroot}%{_javadir}/plexus
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus
-
-(cd %{buildroot}%{_javadir}/plexus && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/%{name}.jar
%add_to_maven_depmap org.sonatype.plexus %{name} %{version} JPP/plexus %{name}
@@ -88,10 +70,8 @@ install -pm 644 pom.xml \
%{buildroot}%{_mavenpomdir}/JPP.plexus-%{name}.pom
# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/plexus/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/plexus/%{name}
-rm -rf target/site/api*
+install -d -m 0755 %{buildroot}%{_javadocdir}/plexus/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}/
%post
%update_maven_depmap
@@ -99,9 +79,6 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(-,root,root,-)
%{_javadir}/plexus/*
@@ -110,10 +87,14 @@ rm -rf %{buildroot}
%files javadoc
%defattr(-,root,root,-)
-%{_javadocdir}/plexus/%{name}-%{version}
%{_javadocdir}/plexus/%{name}
%changelog
+* Fri Jun 3 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0.0.6-6
+- Build with maven.
+- Fix requires.
+- Guidelines fixes.
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.0.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@@ -124,4 +105,4 @@ rm -rf %{buildroot}
- Change JPP-%{name}.pom to JPP.plexus-%{name}.pom
* Wed May 19 2010 Hui Wang <huwang(a)redhat.com> 0.0.6-1
-- Initial version of the package
\ No newline at end of file
+- Initial version of the package
12 years, 10 months
[plexus-cipher] Do not require maven2.
by Alexander Kurtakov
commit 0b4765c6c2307a2ed63246cdbd26e3c345983317
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Jun 3 15:57:09 2011 +0300
Do not require maven2.
Build with maven (v. 3) by default.
Drop obsoleted parts of the spec.
plexus-cipher.spec | 46 +++++++++++++++++-----------------------------
1 files changed, 17 insertions(+), 29 deletions(-)
---
diff --git a/plexus-cipher.spec b/plexus-cipher.spec
index 61c90b1..2795175 100644
--- a/plexus-cipher.spec
+++ b/plexus-cipher.spec
@@ -1,6 +1,6 @@
Name: plexus-cipher
Version: 1.5
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Plexus Cipher: encryption/decryption Component
Group: Development/Libraries
@@ -9,19 +9,18 @@ URL: http://spice.sonatype.org
#svn export http://svn.sonatype.org/spice/tags/plexus-cipher-1.5
#tar zcf plexus-cipher-1.5.tar.gz plexus-cipher-1.5
Source0: %{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-plugin-plugin
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-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia-sitetools
BuildRequires: plexus-container-default
@@ -32,9 +31,9 @@ BuildRequires: junit
BuildRequires: maven-shared-reporting-impl
BuildRequires: plexus-digest
-Requires: maven2
-Requires: jpackage-utils
-Requires: java
+Requires: plexus-containers
+Requires: jpackage-utils
+Requires: java
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
@@ -52,25 +51,15 @@ API documentation for %{name}.
%prep
-%setup -q -n %{name}-%{version}
+%setup -q
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
install -d -m 0755 %{buildroot}%{_javadir}/plexus
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus
-
-(cd %{buildroot}%{_javadir}/plexus && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/%{name}.jar
%add_to_maven_depmap org.sonatype.plexus %{name} %{version} JPP/plexus %{name}
@@ -80,10 +69,8 @@ install -pm 644 pom.xml \
%{buildroot}%{_mavenpomdir}/JPP.plexus-%{name}.pom
# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/plexus/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/plexus/%{name}
-rm -rf target/site/api*
+install -d -m 0755 %{buildroot}%{_javadocdir}/plexus/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}/
%post
%update_maven_depmap
@@ -91,9 +78,6 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(-,root,root,-)
%{_javadir}/plexus/*
@@ -103,10 +87,14 @@ rm -rf %{buildroot}
%files javadoc
%defattr(-,root,root,-)
-%{_javadocdir}/plexus/%{name}-%{version}
%{_javadocdir}/plexus/%{name}
%changelog
+* Fri Jun 3 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.5-5
+- Do not require maven2.
+- Build with maven (v. 3) by default.
+- drop obsoleted parts of the spec.
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@@ -119,4 +107,4 @@ rm -rf %{buildroot}
- Correct URL
* Tue May 18 2010 Hui Wang <huwang(a)redhat.com> - 1.5-1
-- Initial version of the package
\ No newline at end of file
+- Initial version of the package
12 years, 10 months
[plexus-maven-plugin] Do not require maven2.
by Alexander Kurtakov
commit 29262304dc612c4a809cc0bc3aec763bbe92cdbc
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Jun 3 15:45:00 2011 +0300
Do not require maven2.
Fix surefire plugin name.
plexus-maven-plugin-jpp-depmap.xml | 133 ------------------------------------
plexus-maven-plugin.spec | 12 ++--
2 files changed, 7 insertions(+), 138 deletions(-)
---
diff --git a/plexus-maven-plugin.spec b/plexus-maven-plugin.spec
index 7aa6c92..5b1a6d5 100644
--- a/plexus-maven-plugin.spec
+++ b/plexus-maven-plugin.spec
@@ -2,11 +2,9 @@
%global parent plexus
%global subname maven-plugin
-%global maven_settings_file %{_builddir}/%{name}/settings.xml
-
Name: %{parent}-%{subname}
Version: 1.3.8
-Release: 4%{?dist}
+Release: 5%{?dist}
Epoch: 0
Summary: Plexus Maven plugin
License: MIT
@@ -30,7 +28,7 @@ BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-plugin-plugin
BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven2-common-poms >= 1.0
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-surefire-provider-junit
@@ -39,7 +37,7 @@ BuildRequires: plexus-cdc >= 1.0-0.8.a14
BuildRequires: plexus-container-default
BuildRequires: plexus-runtime-builder >= 1.0-0.a9.2
-Requires: maven2
+Requires: maven
Requires: maven2-common-poms >= 1.0
Requires: plexus-appserver >= 1.0-0.a5.3
Requires: plexus-cdc >= 1.0-0.8.a14
@@ -108,6 +106,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%doc %{_javadocdir}/%{name}
%changelog
+* Fri Jun 3 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.3.8-5
+- Do not require maven2.
+- Fix surefire plugin name.
+
* Thu Feb 10 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.3.8-4
- Fix build
- Versionless jars & javadocs
12 years, 10 months
[maven-shared] Require maven not maven2 now.
by Alexander Kurtakov
commit 16ed1f8674b7619099b1862b75fb37dfc323343a
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Jun 3 15:33:41 2011 +0300
Require maven not maven2 now.
Adapt to current guidelines.
maven-shared-jpp-depmap.xml | 24 ----------------
maven-shared.spec | 65 +++++++++++++++++++-----------------------
2 files changed, 29 insertions(+), 60 deletions(-)
---
diff --git a/maven-shared-jpp-depmap.xml b/maven-shared-jpp-depmap.xml
index a94a89b..bcb8517 100644
--- a/maven-shared-jpp-depmap.xml
+++ b/maven-shared-jpp-depmap.xml
@@ -25,28 +25,4 @@
<version>2.0.8</version>
</jpp>
</dependency>
- <dependency>
- <maven>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6.5</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>ant</artifactId>
- <version>1.8.1</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>ant</groupId>
- <artifactId>ant-launcher</artifactId>
- <version>1.6.5</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>ant-launcher</artifactId>
- <version>1.8.1</version>
- </jpp>
- </dependency>
</dependencies>
diff --git a/maven-shared.spec b/maven-shared.spec
index 3dbb4b9..dc4c4ac 100644
--- a/maven-shared.spec
+++ b/maven-shared.spec
@@ -67,13 +67,13 @@ Summary: Maven Shared Components
URL: http://maven.apache.org/shared/
Name: maven-shared
Version: 15
-Release: 14%{?dist}
+Release: 15%{?dist}
License: ASL 2.0
Group: Development/Libraries
# svn export \
# http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components...
-# tar czf maven-shared-components-14.tar.gz maven-shared-components-15
+# tar czf maven-shared-components-15.tar.gz maven-shared-components-15
Source0: maven-shared-components-%{version}.tar.gz
Source1: %{name}-jpp-depmap.xml
@@ -88,8 +88,7 @@ Patch7: maven-artifact-resolver-pom.patch
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant
-BuildRequires: ant-nodeps
-BuildRequires: maven2 >= 0:2.0.4-9
+BuildRequires: maven
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
@@ -122,8 +121,7 @@ BuildRequires: aqute-bndlib
BuildRequires: maven-wagon
Requires: ant
-Requires: ant-nodeps
-Requires: maven2 >= 0:2.0.4
+Requires: maven
Requires: plexus-utils
Requires: saxon
Requires: saxon-scripts
@@ -136,8 +134,6 @@ Requires: maven-wagon
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
Requires(post): jpackage-utils >= 0:1.7.2
Requires(postun): jpackage-utils >= 0:1.7.2
@@ -150,7 +146,7 @@ Group: Development/Libraries
Version: %{file_management_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: %{name}-io >= 0:%{io_version}
-Requires: maven2
+Requires: maven
Requires: plexus-container-default
Requires: plexus-utils
@@ -164,7 +160,7 @@ Group: Development/Libraries
Version: %{osgi_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: aqute-bndlib
-Requires: maven2 >= 0:2.0.7
+Requires: maven
%description osgi
Library for Maven-OSGi integration
@@ -175,7 +171,7 @@ Group: Development/Libraries
Version: %{ant_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: ant
-Requires: maven2 >= 0:2.0.7
+Requires: maven
Requires: plexus-containers-container-default
%description ant
@@ -188,7 +184,7 @@ Version: %{common_artifact_filters_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: %{name}-test-tools >= 0:%{test_tools_version}-%{release}
Requires: junit
-Requires: maven2 >= 0:2.0.7
+Requires: maven
Requires: plexus-container-default
%description common-artifact-filters
@@ -200,7 +196,7 @@ Group: Development/Libraries
Version: %{dependency_tree_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: %{name}-plugin-testing-harness >= 0:%{plugin_testing_harness_version}-%{release}
-Requires: maven2 >= 0:2.0.7
+Requires: maven
%description dependency-tree
%{summary}.
@@ -210,7 +206,7 @@ Summary: Maven Downloader
Group: Development/Libraries
Version: %{downloader_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
-Requires: maven2 >= 0:2.0.7
+Requires: maven
%description downloader
Provide a super simple interface for downloading a
@@ -221,7 +217,7 @@ Summary: Maven Dependency Analyzer
Group: Development/Libraries
Version: %{dependency_analyzer_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
-Requires: maven2 >= 0:2.0.7
+Requires: maven
Requires: objectweb-asm
%description dependency-analyzer
@@ -233,7 +229,7 @@ Group: Development/Libraries
Version: %{invoker_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: %{name}-monitor >= 0:%{monitor_version}-%{release}
-Requires: maven2 >= 0:2.0.7
+Requires: maven
Requires: plexus-utils
%description invoker
@@ -245,7 +241,7 @@ Group: Development/Libraries
Version: %{model_converter_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: dom4j
-Requires: maven2 >= 0:2.0.7
+Requires: maven
Requires: plexus-container-default
Requires: plexus-utils
@@ -259,7 +255,7 @@ Version: %{reporting_impl_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: jakarta-commons-validator
Requires: jakarta-oro
-Requires: maven2 >= 0:2.0.7
+Requires: maven
Requires: maven-doxia
%description reporting-impl
@@ -271,7 +267,7 @@ 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: maven2 >= 0:2.0.7
+Requires: maven
%description repository-builder
%{summary}.
@@ -281,7 +277,7 @@ Summary: Maven Shared I/O API
Group: Development/Libraries
Version: %{io_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
-Requires: maven2 >= 0:2.0.7
+Requires: maven
Requires: maven-wagon
Requires: plexus-utils
Requires: plexus-container-default
@@ -294,7 +290,7 @@ Summary: Maven Shared Jar
Group: Development/Libraries
Version: %{jar_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
-Requires: maven2 >= 0:2.0.7
+Requires: maven
%description jar
Utilities that help identify the contents of a JAR,
@@ -306,7 +302,7 @@ Summary: Maven Shared Monitor API
Group: Development/Libraries
Version: %{monitor_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
-Requires: maven2 >= 0:2.0.7
+Requires: maven
Requires: plexus-container-default
%description monitor
@@ -339,7 +335,7 @@ Group: Development/Libraries
Version: %{artifact_resolver_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: ant
-Requires: maven2 >= 0:2.0.7
+Requires: maven
%description artifact-resolver
Provides a component for plugins to easily resolve project dependencies.
@@ -350,7 +346,7 @@ Group: Development/Libraries
Version: %{filtering_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: ant
-Requires: maven2 >= 0:2.0.7
+Requires: maven
%description filtering
A component to assist in filtering of resource files with properties from a Maven project.
@@ -361,7 +357,7 @@ Group: Development/Libraries
Version: %{reporting_api_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: ant
-Requires: maven2 >= 0:2.0.7
+Requires: maven
%description reporting-api
Maven Reporting API.
@@ -372,7 +368,7 @@ Group: Development/Libraries
Version: %{runtime_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: ant
-Requires: maven2 >= 0:2.0.7
+Requires: maven
%description runtime
Maven Runtime allows introspection of Maven project metadata at runtime. Basic artifact information or full Maven
@@ -394,6 +390,7 @@ chmod -R go=u-w *
# need namespace for new version modello
sed -i "s|<model>|<model xmlns=\"http://modello.codehaus.org/MODELLO/1.3.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://modello.codehaus.org/MODELLO/1.3.0 http://modello.codehaus.org/xsd/modello-1.3.0.xsd\" xml.namespace=\"..\" xml.schemaLocation=\"..\" xsd.namespace=\"..\" xsd.targetNamespace=\"..\">|" file-management/src/main/mdo/fileset.mdo
+sed -i "s|<groupId>ant|<groupId>org.apache.ant|g" maven-ant/pom.xml
# Remove test that needs junit-addons until that makes it into Fedora
rm -f maven-reporting-impl/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
@@ -403,20 +400,15 @@ rm -f maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency
rm -f maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/AbstractFileTest.java
%build
-export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
-
export MAVEN_OPTS="-XX:MaxPermSize=256m"
-mvn-jpp \
- -e \
- -Dmaven2.jpp.depmap.file=%{SOURCE1} \
+mvn-rpmbuild \
+ -Dmaven.local.depmap.file=%{SOURCE1} \
-Dmaven.test.skip=true \
-Dmaven.test.failure.ignore=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install javadoc:aggregate
%install
-rm -rf $RPM_BUILD_ROOT
# main package infrastructure
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/maven-shared
install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
@@ -527,9 +519,6 @@ cp -pr target/site/apidocs/* \
ln -s %{name}-%{shared_components_version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post
%update_maven_depmap
@@ -645,6 +634,10 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_javadocdir}/%{name}
%changelog
+* Fri Jun 3 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.0-15
+- Require maven not maven2 now.
+- Adapt to current guidelines.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 15-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
12 years, 10 months
[javapackages] Add uploading to fedorahosted into make_release script
by Stanislav Ochotnicky
commit 1bd463c1c9cfd60b70c27b3e4d266e56cc5cc97c
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Jun 3 10:18:46 2011 +0200
Add uploading to fedorahosted into make_release script
make_release | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
---
diff --git a/make_release b/make_release
index 88f029e..448e257 100755
--- a/make_release
+++ b/make_release
@@ -32,5 +32,18 @@
last_tag=`git tag | tail -n1`
+if [ -z $last_tag ];then
+ echo "Nothing to do, no tags exist"
+ exit
+fi
+
git archive -v --prefix="javapackages-$last_tag/" $last_tag | xz > \
javapackages-$last_tag.tar.xz
+
+read -i 'n' -e -p "Do you want to upload file javapackages-$last_tag.tar.xz to fedorahosted? (y/n): "
+
+if [ "$REPLY" = "y" ];then
+ scp javapackages-$last_tag.tar.xz fedorahosted.org:javapackages
+fi
+
+
12 years, 10 months
[javapackages] Created tag 0.1
by Stanislav Ochotnicky
The lightweight tag '0.1' was created pointing to:
0b1cd1f... Change license to BSD to simplify merging with jpackage
12 years, 10 months
[javapackages] Change license to BSD to simplify merging with jpackage
by Stanislav Ochotnicky
commit 0b1cd1fcbb615a1d66587512492036ab53541784
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Jun 3 09:54:41 2011 +0200
Change license to BSD to simplify merging with jpackage
macros.fjava | 40 +++++++++++++++++++++++-----------------
make_release | 40 +++++++++++++++++++++++-----------------
scripts/maven_depmap.py | 40 +++++++++++++++++++++++-----------------
3 files changed, 69 insertions(+), 51 deletions(-)
---
diff --git a/macros.fjava b/macros.fjava
index 191e461..7b276f5 100644
--- a/macros.fjava
+++ b/macros.fjava
@@ -1,23 +1,29 @@
-# Copyright (c) 2011 Red Hat, Inc
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# Copyright (c) 2011, Red Hat, Inc
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer.
+# * 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.
+# * Neither the name of the <ORGANIZATION> 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 REGENTS 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 REGENTS 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.
#
# Authors: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
# [your name here]
diff --git a/make_release b/make_release
index 9b99baf..88f029e 100755
--- a/make_release
+++ b/make_release
@@ -1,24 +1,30 @@
#!/bin/bash
-# Copyright (c) 2011 Red Hat, Inc
+# Copyright (c) 2011, Red Hat, Inc
#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
+# All rights reserved.
#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# * Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer.
+# * 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.
+# * Neither the name of the <ORGANIZATION> 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 REGENTS 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 REGENTS 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.
#
# Authors: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
diff --git a/scripts/maven_depmap.py b/scripts/maven_depmap.py
index 26decd6..f029141 100644
--- a/scripts/maven_depmap.py
+++ b/scripts/maven_depmap.py
@@ -1,24 +1,30 @@
#!/usr/bin/python
-# Copyright (c) 2011 Red Hat, Inc
+# Copyright (c) 2011, Red Hat, Inc
#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
+# All rights reserved.
#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# * Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer.
+# * 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.
+# * Neither the name of the <ORGANIZATION> 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 REGENTS 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 REGENTS 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.
#
# Authors: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
#
12 years, 10 months
[javapackages] Fix add_maven_depmap all over the place
by Stanislav Ochotnicky
commit 493bf1bf652b5f07996d63310c7776fa3d377c3b
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Jun 2 16:18:29 2011 +0200
Fix add_maven_depmap all over the place
script can now really run without jar_path and handling of filenames
changed so it's more descriptive (assert error could easily confuse packagers)
macros.fjava | 7 +++++--
scripts/maven_depmap.py | 24 ++++++++++++++++--------
2 files changed, 21 insertions(+), 10 deletions(-)
---
diff --git a/macros.fjava b/macros.fjava
index 27695d8..191e461 100644
--- a/macros.fjava
+++ b/macros.fjava
@@ -38,8 +38,11 @@
%add_maven_depmap(f:a:) \
install -dm 755 $RPM_BUILD_ROOT/%{_mavendepmapfragdir}\
python -m %{_datadir}/java-utils/maven_depmap \\\
- $RPM_BUILD_ROOT/%{_mavendepmapfragdir}/%{name}%{-f*:-%{-f*}} \\\
- %{_mavenpomdir}/%1 $RPM_BUILD_ROOT/%{_javadir}/%2 %{-a} \
+ %{buildroot}%{_mavendepmapfragdir}/%{name}%{-f*:-%{-f*}} \\\
+ %{buildroot}%{_mavenpomdir}/%1 \\\
+ %if %# == 2 \
+ %{buildroot}/%{_javadir}/%2 %{-a} \
+ %endif \
%{nil}
#==============================================================================
diff --git a/scripts/maven_depmap.py b/scripts/maven_depmap.py
index 81af5ff..26decd6 100644
--- a/scripts/maven_depmap.py
+++ b/scripts/maven_depmap.py
@@ -42,6 +42,9 @@ class Fragment:
self.local_gid = local_gid
self.local_aid = local_aid
+class IncompatibleFilenames(Exception):
+ def __init__(self):
+ self.args=("Filenames of pom and jar does not match properly. Check that jar subdirectories match '.' in pom name.",)
def _get_tag_under_parent(dom, parent, tag):
"""get first xml tag under parent tag within dom"""
@@ -65,12 +68,14 @@ def _get_jpp_from_filename(pom_path, jar_path = None):
jpp_gid = "JPP/%s" % basename(dirname(jar_path))
jpp_aid = basename(jar_path)[:-4]
# we assert that jar and pom parts match
- assert pomname == "JPP.%s-%s.pom" % (jpp_gid[4:], jpp_aid)
+ if not pomname == "JPP.%s-%s.pom" % (jpp_gid[4:], jpp_aid):
+ raise IncompatibleFilenames()
else:
jpp_gid = "JPP"
jpp_aid = basename(jar_path)[:-4]
# we assert that jar and pom parts match
- assert pomname == "JPP-%s-%s.pom" % (jpp_gid[4:], jpp_aid)
+ if not pomname == "JPP-%s.pom" % jpp_aid:
+ raise IncompatibleFilenames()
else:
if pomname[3] == ".":
match = re.match('JPP\.([^-]*?)-.*', pomname)
@@ -170,17 +175,20 @@ if __name__ == "__main__":
(options, args) = parser.parse_args()
append_deps = options.append
- if len(sys.argv) < 3:
+ if len(args) < 2:
parser.error("Incorrect number of arguments")
# these will fail when incorrect number of arguments is given
- fragment_path = sys.argv[1].strip()
- pom_path = sys.argv[2].strip()
- jar_path = sys.argv[3].strip()
- if jar_path[-4:] == ".jar":
+ fragment_path = args[0].strip()
+ pom_path = args[1].strip()
+ if len(args) == 3:
+ jar_path = args[2].strip()
fragment = parse_pom(pom_path, jar_path)
else:
fragment = parse_pom(pom_path)
if fragment:
output_fragment(fragment_path, fragment, append_deps)
-
+ else:
+ print "Unknown error while generating fragment. Send bugreport \
+ to https://fedorahosted.org/javapackages/"
+ sys.exit(1)
12 years, 10 months