[tomcat/f16] rebuild (java), rel-eng#4932
by Rex Dieter
commit 8c286ad89df65f8882873b41d09d184f902000e2
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Mon Oct 3 15:07:17 2011 -0500
rebuild (java), rel-eng#4932
tomcat.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/tomcat.spec b/tomcat.spec
index 7527a55..3b32d27 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -54,7 +54,7 @@
Name: tomcat
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 3%{?dist}
+Release: 3%{?dist}.1
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons
@@ -585,6 +585,9 @@ fi
%{appdir}/sample
%changelog
+* Mon Oct 03 2011 Rex Dieter <rdieter(a)fedoraproject.org> - 0:7.0.21-3.1
+- rebuild (java), rel-eng#4932
+
* Mon Sep 26 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.21-3
- Fix basedir mode
12 years, 6 months
[maven/f16] rebuild (java), rel-eng#4932
by Rex Dieter
commit b056825fdf6da3491775d2af14d9fdf6aaa8ea89
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Mon Oct 3 15:01:12 2011 -0500
rebuild (java), rel-eng#4932
maven.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/maven.spec b/maven.spec
index c156278..5a364f0 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
Name: maven
Version: 3.0.3
-Release: 14%{?dist}
+Release: 14%{?dist}.1
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -334,6 +334,9 @@ install -Dm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/bash_completion.d/%{name}
%changelog
+* Mon Oct 03 2011 Rex Dieter <rdieter(a)fedoraproject.org> - 3.0.3-14.1
+- rebuild (java), rel-eng#4932
+
* Tue Aug 30 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0.3-14
- Fix test scope skipping
12 years, 6 months
[httpcomponents-core/f16] rebuild (java), rel-eng#4932
by Rex Dieter
commit efce217c0173759eae9fa10aa4de92a8bd8be473
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Mon Oct 3 14:56:04 2011 -0500
rebuild (java), rel-eng#4932
httpcomponents-core.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/httpcomponents-core.spec b/httpcomponents-core.spec
index 2a8ba97..a24d68e 100644
--- a/httpcomponents-core.spec
+++ b/httpcomponents-core.spec
@@ -3,7 +3,7 @@
Name: httpcomponents-core
Summary: Set of low level Java HTTP transport components for HTTP services
Version: 4.1.3
-Release: 1%{?dist}
+Release: 1%{?dist}.1
Group: Development/Libraries
License: ASL 2.0
URL: http://hc.apache.org/
@@ -85,6 +85,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
+* Mon Oct 03 2011 Rex Dieter <rdieter(a)fedoraproject.org> - 4.1.3-1.1
+- rebuild (java), rel-eng#4932
+
* Tue Aug 16 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 4.1.3-1
- Update to latest upstream (4.1.3)
12 years, 6 months
[httpcomponents-client/f16] rebuild (java), rel-eng#4932
by Rex Dieter
commit 0eae0b93aec7ba6eb50ea919a2d6908b847f5168
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Mon Oct 3 14:55:32 2011 -0500
rebuild (java), rel-eng#4932
httpcomponents-client.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec
index 4237f6e..5536397 100644
--- a/httpcomponents-client.spec
+++ b/httpcomponents-client.spec
@@ -3,7 +3,7 @@
Name: httpcomponents-client
Summary: HTTP agent implementation based on httpcomponents HttpCore
Version: 4.1.2
-Release: 1%{?dist}
+Release: 1%{?dist}.1
Group: Development/Libraries
License: ASL 2.0
URL: http://hc.apache.org/
@@ -90,6 +90,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%changelog
+* Mon Oct 03 2011 Rex Dieter <rdieter(a)fedoraproject.org> - 4.1.2-1.1
+- rebuild (java), rel-eng#4932
+
* Tue Aug 16 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 4.1.2-1
- Update to latest upstream (4.1.2)
- Minor tweaks according to guidelines
12 years, 6 months
[apache-commons-daemon/f16] rebuild (java), rel-eng#4932
by Rex Dieter
commit 2a4cc4de46ea789cec80dc3b080502fec6b5fa75
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Mon Oct 3 14:53:05 2011 -0500
rebuild (java), rel-eng#4932
apache-commons-daemon.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec
index cd8a8a3..95b5952 100644
--- a/apache-commons-daemon.spec
+++ b/apache-commons-daemon.spec
@@ -4,7 +4,7 @@
Name: apache-%{short_name}
Version: 1.0.7
-Release: 1%{?dist}
+Release: 1%{?dist}.1
Summary: Defines API to support an alternative invocation mechanism
License: ASL 2.0
Group: Applications/System
@@ -136,6 +136,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%changelog
+* Mon Oct 03 2011 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0.7-1.1
+- rebuild (java), rel-eng#4932
+
* Mon Aug 15 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.0.7-1
- Update to latest upstream (1.0.7)
- Fix CVE-2011-2729
12 years, 6 months
[maven-surefire] BR maven-enforcer-plugin.
by Alexander Kurtakov
commit 6eb43a83dbf598a7d49d291261d4e043882f7faf
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Sun Oct 2 16:05:19 2011 +0300
BR maven-enforcer-plugin.
maven-surefire.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/maven-surefire.spec b/maven-surefire.spec
index ab6b76d..24b8589 100644
--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@@ -1,6 +1,6 @@
Name: maven-surefire
Version: 2.10
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 0
Summary: Test framework project
License: ASL 2.0
@@ -40,6 +40,7 @@ BuildRequires: maven-resources-plugin
BuildRequires: maven-site-plugin
BuildRequires: maven-shade-plugin
BuildRequires: maven-shared-verifier
+BuildRequires: maven-enforcer-plugin
BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-toolchain
@@ -294,6 +295,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%doc %{_javadocdir}/*
%changelog
+* Sun Oct 2 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:2.10-2
+- BR maven-enforcer-plugin.
+
* Sun Oct 2 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:2.10-1
- Update to latest upstream - 2.10.
- Use new maven macro.
12 years, 6 months
[maven-assembly-plugin] Add missing BR/R.
by Alexander Kurtakov
commit 8298a219c16a6145a0884d52fb7a644d5a0e9be2
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Sun Oct 2 13:53:24 2011 +0300
Add missing BR/R.
maven-assembly-plugin-jpp-depmap.xml | 9 ---------
maven-assembly-plugin.spec | 17 ++++++++++-------
2 files changed, 10 insertions(+), 16 deletions(-)
---
diff --git a/maven-assembly-plugin.spec b/maven-assembly-plugin.spec
index 009dd92..6820f32 100644
--- a/maven-assembly-plugin.spec
+++ b/maven-assembly-plugin.spec
@@ -1,13 +1,12 @@
Name: maven-assembly-plugin
Version: 2.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Maven Assembly Plugin
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-assembly-plugin/
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
-Source1: %{name}-jpp-depmap.xml
Patch0: %{name}-migration-to-component-metadata.patch
@@ -30,7 +29,6 @@ BuildRequires: maven-plugin-plugin
BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-shared-filtering
BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
@@ -45,6 +43,8 @@ BuildRequires: plexus-archiver
BuildRequires: maven-shared-file-management
BuildRequires: maven-shared-repository-builder
BuildRequires: maven-shared-filtering
+BuildRequires: maven-shared-file-management
+BuildRequires: maven-shared-io
BuildRequires: easymock
BuildRequires: jdom
@@ -67,6 +67,8 @@ Requires: plexus-interpolation
Requires: plexus-archiver
Requires: maven-shared-repository-builder
Requires: maven-shared-filtering
+Requires: maven-shared-file-management
+Requires: maven-shared-io
Requires: jpackage-utils >= 0:1.7.2
Requires(post): jpackage-utils >= 0:1.7.2
@@ -96,8 +98,6 @@ cp -pr src/main/resources/META-INF/ target/classes/
%build
# seems koji don't have easymockclassextension
mvn-rpmbuild \
- -e \
- -Dmaven.local.depmap.file=%{SOURCE1} \
-Dmaven.test.skip=true \
install javadoc:aggregate
@@ -108,13 +108,13 @@ mvn-rpmbuild \
install -d -m 0755 %{buildroot}%{_javadir}
install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-%add_to_maven_depmap org.apache.maven.plugins maven-assembly-plugin %{version} JPP maven-assembly-plugin
-
# poms
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml \
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
@@ -129,6 +129,9 @@ rm -rf target/site/api*
%{_javadocdir}/%{name}
%changelog
+* Sun Oct 2 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.2.1-4
+- Add missing BR/R.
+
* Thu Jul 15 2011 Jaromir Capik <jcapik(a)redhat.com> 2.2.1-3
- modello removed from requires
- %update_maven_depmap removed
12 years, 6 months
[maven-surefire] Update to latest upstream - 2.10.
by Alexander Kurtakov
commit eccd06efa7a922436fce7e7e40643c436586adc9
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Sun Oct 2 12:28:43 2011 +0300
Update to latest upstream - 2.10.
Use new maven macro.
.gitignore | 1 +
maven-surefire.spec | 42 ++++++++++++++++++++++--------------------
sources | 2 +-
3 files changed, 24 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 22fa7f6..25e3164 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ surefire-2.7.1-source-release.zip
/surefire-2.8-source-release.zip
/surefire-2.8.1-source-release.zip
/surefire-2.9-source-release.zip
+surefire-2.10-source-release.zip
diff --git a/maven-surefire.spec b/maven-surefire.spec
index 978ba90..ab6b76d 100644
--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@@ -1,5 +1,5 @@
Name: maven-surefire
-Version: 2.9
+Version: 2.10
Release: 1%{?dist}
Epoch: 0
Summary: Test framework project
@@ -160,14 +160,13 @@ Javadoc for %{name}.
sed -i 's:<version>2.7.2</version>:<version>${project.version}</version>:' \
surefire-integration-tests/pom.xml
-%patch0 -p1 -b .sav
-%patch1 -p1 -b .sav
+#%patch0 -p1 -b .sav
+#%patch1 -p1 -b .sav
%patch2 -p1 -b .sav
%build
# tests turned off because they need jmock
mvn-rpmbuild -e \
- -Dmaven.local.depmap.file=%{SOURCE1} \
-Dmaven.test.skip=true \
install javadoc:aggregate
@@ -177,64 +176,63 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/maven-surefire
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 maven-surefire-plugin/target/maven-surefire-plugin-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/maven-plugin.jar
-%add_to_maven_depmap org.apache.maven.plugins maven-surefire-plugin %{version} JPP/maven-surefire maven-plugin
install -pm 644 maven-surefire-plugin/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-maven-plugin.pom
install -pm 644 maven-surefire-plugin/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven2.plugins-surefire-plugin.pom
+%add_maven_depmap JPP.maven-surefire-maven-plugin.pom maven-surefire/maven-plugin.jar
install -pm 644 maven-surefire-common/target/maven-surefire-common-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/common.jar
-%add_to_maven_depmap org.apache.maven.surefire maven-surefire-common %{version} JPP/maven-surefire common
install -pm 644 maven-surefire-common/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-common.pom
+%add_maven_depmap JPP.maven-surefire-common.pom maven-surefire/common.jar
install -pm 644 maven-surefire-report-plugin/target/maven-surefire-report-plugin-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/report-maven-plugin.jar
-%add_to_maven_depmap org.apache.maven.plugins maven-surefire-report-plugin %{version} JPP/maven-surefire report-maven-plugin
install -pm 644 maven-surefire-report-plugin/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-report-maven-plugin.pom
+%add_maven_depmap JPP.maven-surefire-report-maven-plugin.pom maven-surefire/report-maven-plugin.jar
install -pm 644 surefire-api/target/original-surefire-api-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/api.jar
-%add_to_maven_depmap org.apache.maven.surefire surefire-api %{version} JPP/maven-surefire api
install -pm 644 surefire-api/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-api.pom
+%add_maven_depmap JPP.maven-surefire-api.pom maven-surefire/api.jar
install -pm 644 surefire-booter/target/surefire-booter-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/booter.jar
-%add_to_maven_depmap org.apache.maven.surefire surefire-booter %{version} JPP/maven-surefire booter
install -pm 644 surefire-booter/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-booter.pom
+%add_maven_depmap JPP.maven-surefire-booter.pom maven-surefire/booter.jar
install -pm 644 surefire-providers/common-junit3/target/common-junit3-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/common-junit.jar
-%add_to_maven_depmap org.apache.maven.surefire common-junit3 %{version} JPP/maven-surefire common-junit
install -pm 644 surefire-providers/common-junit3/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-common-junit.pom
+%add_maven_depmap JPP.maven-surefire-common-junit.pom maven-surefire/common-junit.jar
install -pm 644 surefire-providers/surefire-junit3/target/original-surefire-junit3-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit.jar
-%add_to_maven_depmap org.apache.maven.surefire surefire-junit3 %{version} JPP/maven-surefire junit
-%add_to_maven_depmap org.apache.maven.surefire surefire-junit %{version} JPP/maven-surefire junit
install -pm 644 surefire-providers/surefire-junit3/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-junit.pom
+%add_maven_depmap JPP.maven-surefire-junit.pom maven-surefire/junit.jar -a "org.apache.maven.surefire:surefire-junit"
install -pm 644 surefire-providers/common-junit4/target/common-junit4-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/common-junit4.jar
-%add_to_maven_depmap org.apache.maven.surefire common-junit4 %{version} JPP/maven-surefire common-junit4
install -pm 644 surefire-providers/common-junit4/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-common-junit4.pom
+%add_maven_depmap JPP.maven-surefire-common-junit4.pom maven-surefire/common-junit4.jar
install -pm 644 surefire-providers/surefire-junit4/target/original-surefire-junit4-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit4.jar
-%add_to_maven_depmap org.apache.maven.surefire surefire-junit4 %{version} JPP/maven-surefire junit4
install -pm 644 surefire-providers/surefire-junit4/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-junit4.pom
+%add_to_maven_depmap oJPP.maven-surefire-junit4.pom maven-surefire/junit4.jar
install -pm 644 surefire-providers/surefire-junit47/target/original-surefire-junit47-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit47.jar
-%add_to_maven_depmap org.apache.maven.surefire surefire-junit47 %{version} JPP/maven-surefire junit47
install -pm 644 surefire-providers/surefire-junit47/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-junit47.pom
+%add_maven_depmap JPP.maven-surefire-junit47.pom maven-surefire/junit47.jar
install -pm 644 surefire-providers/surefire-testng/target/surefire-testng-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/testng.jar
-%add_to_maven_depmap org.apache.maven.surefire surefire-testng %{version} JPP/maven-surefire testng
install -pm 644 surefire-providers/surefire-testng/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-testng.pom
+%add_maven_depmap JPP.maven-surefire-testng.pom maven-surefire/testng.jar
install -pm 644 surefire-providers/surefire-testng-utils/target/surefire-testng-utils-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/testng-utils.jar
-%add_to_maven_depmap org.apache.maven.surefire surefire-testng-utils %{version} JPP/maven-surefire testng-utils
install -pm 644 surefire-providers/surefire-testng-utils/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-testng-utils.pom
+%add_maven_depmap JPP.maven-surefire-testng-utils.pom maven-surefire/testng-utils.jar
-%add_to_maven_depmap org.apache.maven.surefire surefire-providers %{version} JPP/maven-surefire providers
install -pm 644 surefire-providers/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-providers.pom
+%add_maven_depmap JPP.maven-surefire-providers.pom
install -pm 644 maven-failsafe-plugin/target/maven-failsafe-plugin*.jar $RPM_BUILD_ROOT%{_javadir}/maven-failsafe-plugin.jar
-%add_to_maven_depmap org.apache.maven.plugins maven-failsafe-plugin %{version} JPP maven-failsafe-plugin
install -pm 644 maven-failsafe-plugin/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-maven-failsafe-plugin.pom
+%add_maven_depmap JPP-maven-failsafe-plugin.pom maven-failsafe-plugin.jar
install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-main.pom
-%add_to_maven_depmap org.apache.maven.surefire surefire %{version} JPP/maven-surefire main
+%add_maven_depmap JPP.maven-surefire-main.pom
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -296,6 +294,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%doc %{_javadocdir}/*
%changelog
+* Sun Oct 2 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:2.10-1
+- Update to latest upstream - 2.10.
+- Use new maven macro.
+
* Mon Jun 27 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.9-1
- Update to latest upstream (2.9)
- Fix up Requires for juni4 provider
diff --git a/sources b/sources
index 5d53351..6a68647 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a54a56e6dae36aa8dbebcbd186e2d39b surefire-2.9-source-release.zip
+ebe109f1625b9105578cd3981b0407b6 surefire-2.10-source-release.zip
12 years, 6 months