[jetty] Update to rc5
Stanislav Ochotnicky
sochotni at fedoraproject.org
Wed Jan 25 11:23:37 UTC 2012
commit 2f2b3620ea42be71bc286ecb6526885fd05ad9ff
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Wed Jan 25 12:13:13 2012 +0100
Update to rc5
- Remove symbolic name patch (not needed after bundle plugin fix)
.gitignore | 1 +
0001-Add-proper-symbolic-names-into-bundles.patch | 24 --------
...on.patch => 0001-Remove-javadoc-execution.patch | 8 +-
...ch => 0002-Cleaup-distribution-generation.patch | 6 +-
...acts.patch => 0003-Disable-test-artifacts.patch | 10 ++--
...4-Change-servelt-groupId-to-javax.servlet.patch | 6 +-
...dencies.patch => 0005-Modify-dependencies.patch | 8 +-
...md-plugin.patch => 0006-Remove-pmd-plugin.patch | 6 +-
disable-modules.patch | 62 --------------------
jetty-util-pom.patch | 12 ----
jetty.spec | 50 ++++++++--------
sources | 2 +-
12 files changed, 50 insertions(+), 145 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 66613eb..1b592e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ jetty-6.1.21-src.zip
jetty-6.1.24-src.zip
jetty-6.1.26-src.zip
/jetty-8.1.0.RC4.tar.bz2
+/jetty-8.1.0.RC5.tar.bz2
diff --git a/0002-Remove-javadoc-execution.patch b/0001-Remove-javadoc-execution.patch
similarity index 89%
rename from 0002-Remove-javadoc-execution.patch
rename to 0001-Remove-javadoc-execution.patch
index e6e0026..78051b6 100644
--- a/0002-Remove-javadoc-execution.patch
+++ b/0001-Remove-javadoc-execution.patch
@@ -1,7 +1,7 @@
-From 8ccf2fbee3fdb514aa132c7a0c7f0c4688a3f836 Mon Sep 17 00:00:00 2001
+From 8509de87ff274653abd2f89f8a09c2ebf1840b36 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue, 24 Jan 2012 10:33:17 +0100
-Subject: [PATCH 2/7] Remove javadoc execution
+Subject: [PATCH 1/6] Remove javadoc execution
We generate javadoc as a separate step
---
@@ -10,7 +10,7 @@ We generate javadoc as a separate step
2 files changed, 0 insertions(+), 20 deletions(-)
diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml
-index aafeebd..bb4d76e 100644
+index d0675a7..40f2a91 100644
--- a/jetty-aggregate/jetty-all/pom.xml
+++ b/jetty-aggregate/jetty-all/pom.xml
@@ -73,19 +73,6 @@
@@ -34,7 +34,7 @@ index aafeebd..bb4d76e 100644
</build>
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
-index 1c2c1a9..c9bcc69 100644
+index 105e166..13560e3 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -379,12 +379,5 @@
diff --git a/0003-Cleaup-distribution-generation.patch b/0002-Cleaup-distribution-generation.patch
similarity index 97%
rename from 0003-Cleaup-distribution-generation.patch
rename to 0002-Cleaup-distribution-generation.patch
index abaa68e..17ee218 100644
--- a/0003-Cleaup-distribution-generation.patch
+++ b/0002-Cleaup-distribution-generation.patch
@@ -1,7 +1,7 @@
-From 144b86fe0d9492b514b6a51fa4a91c400d53b790 Mon Sep 17 00:00:00 2001
+From 18d40c0909309f145fd36e2b35f009484787829f Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue, 24 Jan 2012 10:37:20 +0100
-Subject: [PATCH 3/7] Cleaup distribution generation
+Subject: [PATCH 2/6] Cleaup distribution generation
We recreate distribution package anyway, this just complicated things
---
@@ -9,7 +9,7 @@ We recreate distribution package anyway, this just complicated things
1 files changed, 0 insertions(+), 46 deletions(-)
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
-index c9bcc69..2323e4c 100644
+index 13560e3..70677a9 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -64,71 +64,25 @@
diff --git a/0004-Disable-test-artifacts.patch b/0003-Disable-test-artifacts.patch
similarity index 87%
rename from 0004-Disable-test-artifacts.patch
rename to 0003-Disable-test-artifacts.patch
index a642b38..e93ca0c 100644
--- a/0004-Disable-test-artifacts.patch
+++ b/0003-Disable-test-artifacts.patch
@@ -1,7 +1,7 @@
-From c8bec5a205912decf48c4f7cd1d224e5940bf0bf Mon Sep 17 00:00:00 2001
+From 6bebe830eada634485c7c872a1038a3a0a5e06f2 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue, 24 Jan 2012 11:09:27 +0100
-Subject: [PATCH 4/7] Disable test artifacts
+Subject: [PATCH 3/6] Disable test artifacts
- they need more dependencies then we have time for right now :-)
---
@@ -10,7 +10,7 @@ Subject: [PATCH 4/7] Disable test artifacts
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
-index 5027022..3049e2b 100644
+index 91bcb2e..2529824 100644
--- a/jetty-osgi/pom.xml
+++ b/jetty-osgi/pom.xml
@@ -25,7 +25,6 @@
@@ -22,10 +22,10 @@ index 5027022..3049e2b 100644
<build>
<resources>
diff --git a/pom.xml b/pom.xml
-index 89919de..c67484d 100644
+index 6bcfc31..7be01ea 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -353,17 +353,12 @@
+@@ -352,17 +352,12 @@
<module>jetty-nested</module>
<module>jetty-overlay-deployer</module>
<module>jetty-osgi</module>
diff --git a/0005-Change-servelt-groupId-to-javax.servlet.patch b/0004-Change-servelt-groupId-to-javax.servlet.patch
similarity index 82%
rename from 0005-Change-servelt-groupId-to-javax.servlet.patch
rename to 0004-Change-servelt-groupId-to-javax.servlet.patch
index 1ac54b9..f43b66b 100644
--- a/0005-Change-servelt-groupId-to-javax.servlet.patch
+++ b/0004-Change-servelt-groupId-to-javax.servlet.patch
@@ -1,14 +1,14 @@
-From f8fecce79522a135af1d3ed908605a74882c4998 Mon Sep 17 00:00:00 2001
+From b27a862cd8edd2f82a488bba3e4ae43544592ce2 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue, 24 Jan 2012 11:10:12 +0100
-Subject: [PATCH 5/7] Change servelt groupId to javax.servlet
+Subject: [PATCH 4/6] Change servelt groupId to javax.servlet
---
pom.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/pom.xml b/pom.xml
-index c67484d..13d35d0 100644
+index 7be01ea..e556e89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
diff --git a/0006-Modify-dependencies.patch b/0005-Modify-dependencies.patch
similarity index 89%
rename from 0006-Modify-dependencies.patch
rename to 0005-Modify-dependencies.patch
index afab9b1..ab9741d 100644
--- a/0006-Modify-dependencies.patch
+++ b/0005-Modify-dependencies.patch
@@ -1,7 +1,7 @@
-From ec29eb222cbe1eff0ce5d06fdd68e8702ece7d30 Mon Sep 17 00:00:00 2001
+From 968ec2b8f92311ef6c5e3d17dba2f9bd3bd4df68 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue, 24 Jan 2012 11:13:25 +0100
-Subject: [PATCH 6/7] Modify dependencies
+Subject: [PATCH 5/6] Modify dependencies
- remove sun httpserver
- add tomcat-jasper
@@ -11,7 +11,7 @@ Subject: [PATCH 6/7] Modify dependencies
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml
-index 07b6ce6..0142146 100644
+index dd64b1f..3df3312 100644
--- a/jetty-http-spi/pom.xml
+++ b/jetty-http-spi/pom.xml
@@ -17,12 +17,6 @@
@@ -28,7 +28,7 @@ index 07b6ce6..0142146 100644
<artifactId>jetty-server</artifactId>
<version>${project.version}</version>
diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
-index 7c72a98..6e1d432 100644
+index 9bc544b..2417dd5 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
@@ -53,6 +53,11 @@
diff --git a/0007-Remove-pmd-plugin.patch b/0006-Remove-pmd-plugin.patch
similarity index 91%
rename from 0007-Remove-pmd-plugin.patch
rename to 0006-Remove-pmd-plugin.patch
index 161ee6a..8427468 100644
--- a/0007-Remove-pmd-plugin.patch
+++ b/0006-Remove-pmd-plugin.patch
@@ -1,7 +1,7 @@
-From 9142fd1a0383891a1dd6fbc411d74251c87c694c Mon Sep 17 00:00:00 2001
+From d390cf8cbd2ef711a59196534134a12c31057a2d Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue, 24 Jan 2012 11:15:56 +0100
-Subject: [PATCH 7/7] Remove pmd plugin
+Subject: [PATCH 6/6] Remove pmd plugin
- prevents problem with "Reporting mojo's can only be called from
ReportDocumentRender". Investigate proper fix some other time?
@@ -10,7 +10,7 @@ Subject: [PATCH 7/7] Remove pmd plugin
1 files changed, 0 insertions(+), 29 deletions(-)
diff --git a/pom.xml b/pom.xml
-index 13d35d0..f43c979 100644
+index e556e89..6e5a47e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,35 +152,6 @@
diff --git a/jetty.spec b/jetty.spec
index 91456f5..8231d53 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -42,24 +42,23 @@
Name: jetty
Version: 8.1.0
-Release: 0.1.rc4%{?dist}
+Release: 0.1.rc5%{?dist}
Summary: Java Webserver and Servlet Container
Group: Applications/Internet
License: ASL 2.0
URL: http://jetty.mortbay.org/jetty/
-Source0: http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/snapshot/jetty-8.1.0.RC4.tar.bz2
+Source0: http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/snapshot/jetty-8.1.0.RC5.tar.bz2
Source1: djetty.script
Source2: jetty.init
Source3: jetty.logrotate
Source4: %{name}-depmap.xml
-Patch0: 0001-Add-proper-symbolic-names-into-bundles.patch
-Patch1: 0002-Remove-javadoc-execution.patch
-Patch2: 0003-Cleaup-distribution-generation.patch
-Patch3: 0004-Disable-test-artifacts.patch
-Patch4: 0005-Change-servelt-groupId-to-javax.servlet.patch
-Patch5: 0006-Modify-dependencies.patch
-Patch6: 0007-Remove-pmd-plugin.patch
+Patch0: 0001-Remove-javadoc-execution.patch
+Patch1: 0002-Cleaup-distribution-generation.patch
+Patch2: 0003-Disable-test-artifacts.patch
+Patch3: 0004-Change-servelt-groupId-to-javax.servlet.patch
+Patch4: 0005-Modify-dependencies.patch
+Patch5: 0006-Remove-pmd-plugin.patch
BuildRequires: java-devel >= 1:1.7.0
BuildRequires: tomcat-lib
@@ -140,7 +139,7 @@ Requires: %{name} = %{version}
%{summary}.
%prep
-%setup -q -n %{jettyname}-%{version}.RC4
+%setup -q -n %{jettyname}-%{version}.RC5
for f in $(find . -name "*.?ar"); do rm $f; done
find . -name "*.class" -exec rm {} \;
@@ -150,7 +149,6 @@ find . -name "*.class" -exec rm {} \;
%patch3 -p1 -b .sav
%patch4 -p1 -b .sav
%patch5 -p1 -b .sav
-%patch6 -p1 -b .sav
cp %{SOURCE1} djetty
@@ -164,7 +162,7 @@ mv LICENSE-CONTRIBUTOR/CDDLv1.0.txt{.con,}
%build
#rm -rf ./*
-#ln -sf ~/temp/jetty/jetty-8.1.0.RC4.copy/* .
+#ln -sf ~/temp/jetty/jetty-8.1.0.RC5.copy/* .
#exit 0
# remove previous lines!
sed -i -e "s|/usr/share|%{_datadir}|g" djetty
@@ -190,9 +188,9 @@ install -dm 755 %{buildroot}%{rundir}
install -dm 755 %{buildroot}%{tempdir}
install -dm 755 %{buildroot}%{appdir}
# main pkg
-tar xvf jetty-distribution/target/%{name}-distribution-%{version}.RC4.tar.gz -C %{buildroot}%{homedir}
-mv %{buildroot}%{homedir}/%{name}-distribution-%{version}.RC4/* %{buildroot}%{homedir}/
-rmdir %{buildroot}%{homedir}/%{name}-distribution-%{version}.RC4
+tar xvf jetty-distribution/target/%{name}-distribution-%{version}.RC5.tar.gz -C %{buildroot}%{homedir}
+mv %{buildroot}%{homedir}/%{name}-distribution-%{version}.RC5/* %{buildroot}%{homedir}/
+rmdir %{buildroot}%{homedir}/%{name}-distribution-%{version}.RC5
chmod +x %{buildroot}%{homedir}/bin/jetty-xinetd.sh
chmod +x djetty
@@ -211,10 +209,10 @@ for module in jetty-ajp jetty-annotations jetty-client jetty-continuation \
jetty-rewrite jetty-security jetty-server jetty-servlet \
jetty-servlets jetty-util jetty-webapp jetty-websocket \
jetty-xml; do
- mv %{buildroot}%{homedir}/lib/$module-%{version}.RC4.jar \
+ mv %{buildroot}%{homedir}/lib/$module-%{version}.RC5.jar \
%{buildroot}%{_javadir}/%{name}/$module.jar
ln -s %{_javadir}/%{name}/$module.jar \
- %{buildroot}%{homedir}/lib/$module-%{version}.RC4.jar
+ %{buildroot}%{homedir}/lib/$module-%{version}.RC5.jar
install -pm 644 $module/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom
%add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar
done
@@ -222,7 +220,7 @@ done
# modules used during build and other jars not included in the
# distribution tarball
for module in jetty-http-spi jetty-jaspi jetty-nested jetty-nosql;do
- install $module/target/$module-%{version}.RC4.jar \
+ install $module/target/$module-%{version}.RC5.jar \
%{buildroot}%{_javadir}/%{name}/$module.jar
install -pm 644 $module/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom
%add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar
@@ -233,7 +231,7 @@ pushd jetty-osgi
%add_maven_depmap JPP.%{name}-jetty-osgi.pom
for submod in boot boot-jsp boot-warurl;do
module=jetty-osgi-$submod
- install $module/target/$module-%{version}.RC4.jar \
+ install $module/target/$module-%{version}.RC5.jar \
%{buildroot}%{_javadir}/%{name}/$module.jar
install -pm 644 $module/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom
%add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar
@@ -241,7 +239,7 @@ pushd jetty-osgi
#httpservice is a bit special (for no good reason)
module=jetty-httpservice
- install jetty-osgi-httpservice/target/$module-%{version}.RC4.jar \
+ install jetty-osgi-httpservice/target/$module-%{version}.RC5.jar \
%{buildroot}%{_javadir}/%{name}/$module.jar
install -pm 644 jetty-osgi-httpservice/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom
%add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar
@@ -269,10 +267,10 @@ done
ln -sf $(build-classpath geronimo-jta) \
%{buildroot}%{homedir}/lib/jta/
-mv %{buildroot}%{homedir}/lib/monitor/jetty-monitor-%{version}.RC4.jar \
+mv %{buildroot}%{homedir}/lib/monitor/jetty-monitor-%{version}.RC5.jar \
%{buildroot}%{_javadir}/%{name}/jetty-monitor.jar
ln -s %{_javadir}/%{name}/jetty-monitor.jar \
- %{buildroot}%{homedir}/lib/monitor/jetty-monitor-%{version}.RC4.jar
+ %{buildroot}%{homedir}/lib/monitor/jetty-monitor-%{version}.RC5.jar
install -pm 644 jetty-monitor/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-jetty-monitor.pom
%add_maven_depmap JPP.%{name}-jetty-monitor.pom %{name}/jetty-monitor.jar
@@ -372,8 +370,12 @@ fi
%doc %{_javadocdir}/%{name}
%changelog
-* Wed Jan 25 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 8.1.0-0.1.rc4
-- Major update to 8.0.0 rc4
+* Wed Jan 25 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 8.1.0-0.1.rc5
+- Update to rc5
+- Remove symbolic name patch (not needed after bundle plugin fix)
+
+* Wed Jan 25 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 8.1.0-0.1.RC4
+- Major update to 8.1.0 RC4
- Removed manual subpackage (was empty anyway)
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.1.26-9
diff --git a/sources b/sources
index 2fb5505..6257040 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8875a3e970ed79d4f187ab3e6a81850b jetty-8.1.0.RC4.tar.bz2
+c8cdac9d0d2706d597edf64315068dbf jetty-8.1.0.RC5.tar.bz2
More information about the scm-commits
mailing list