[java-sig-commits] [jetty] Update to 8.1.4
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Tue May 29 14:37:29 UTC 2012
commit e8eb3e39112ab4939abefd1ce159d972624a62cf
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue May 29 15:00:56 2012 +0200
Update to 8.1.4
.gitignore | 1 +
0001-Remove-javadoc-execution.patch | 15 ++++++++-------
0002-Disable-test-artifacts.patch | 12 ++++++------
0003-Change-servelt-groupId-to-javax.servlet.patch | 10 +++++-----
0004-Modify-dependencies.patch | 10 +++++-----
0005-Remove-pmd-plugin.patch | 10 +++++-----
...move-unpack-config-deps-from-distribution.patch | 12 ++++++------
0007-disable-jetty-osgi.patch | 12 ++++++------
0008-Disable-jetty-nosql.patch | 6 +++---
jetty.spec | 9 ++++++---
sources | 2 +-
11 files changed, 52 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9993328..c4a9814 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ jetty-6.1.26-src.zip
/jetty-8.1.0.RC5.tar.bz2
/jetty-8.1.0.v20120127.tar.bz2
/jetty-8.1.2.v20120308.tar.bz2
+/jetty-8.1.4.v20120524.tar.bz2
diff --git a/0001-Remove-javadoc-execution.patch b/0001-Remove-javadoc-execution.patch
index 12363e1..c2c520c 100644
--- a/0001-Remove-javadoc-execution.patch
+++ b/0001-Remove-javadoc-execution.patch
@@ -1,7 +1,7 @@
-From c0a15ad5846a980a0031638ad56cfce1dcec8673 Mon Sep 17 00:00:00 2001
+From c582282bd0742ea950c644d2954e5e65980fc4d5 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 1/6] Remove javadoc execution
+Subject: [PATCH 1/8] 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 d7126f3..86c693b 100644
+index e6f83fe..97461a8 100644
--- a/jetty-aggregate/jetty-all/pom.xml
+++ b/jetty-aggregate/jetty-all/pom.xml
@@ -76,19 +76,6 @@
@@ -34,10 +34,10 @@ index d7126f3..86c693b 100644
</build>
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
-index d9a9da3..bb6aff6 100644
+index 32ac454..aff91ff 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
-@@ -398,12 +398,5 @@
+@@ -398,13 +398,6 @@
<artifactId>jetty-overlay-deployer</artifactId>
<version>${project.version}</version>
</dependency>
@@ -49,7 +49,8 @@ index d9a9da3..bb6aff6 100644
- <version>${project.version}</version>
- </dependency>
</dependencies>
- </project>
+ <profiles>
+ <profile>
--
-1.7.9
+1.7.7.6
diff --git a/0002-Disable-test-artifacts.patch b/0002-Disable-test-artifacts.patch
index a739c90..ef57be4 100644
--- a/0002-Disable-test-artifacts.patch
+++ b/0002-Disable-test-artifacts.patch
@@ -1,7 +1,7 @@
-From b6a6651f548b741a2cc6a930c171c3176e431af7 Mon Sep 17 00:00:00 2001
+From 032c4ef3747063337f4dc7eccf9085c1aef55ecc 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 2/6] Disable test artifacts
+Subject: [PATCH 2/8] Disable test artifacts
- they need more dependencies then we have time for right now :-)
---
@@ -10,7 +10,7 @@ Subject: [PATCH 2/6] Disable test artifacts
2 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
-index e0117fb..3e8c563 100644
+index b1060c6..44cb42c 100644
--- a/jetty-osgi/pom.xml
+++ b/jetty-osgi/pom.xml
@@ -23,7 +23,6 @@
@@ -22,10 +22,10 @@ index e0117fb..3e8c563 100644
<build>
<resources>
diff --git a/pom.xml b/pom.xml
-index bc5db52..87b391b 100644
+index 06cd996..6e4f1b2 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -383,14 +383,9 @@
+@@ -382,14 +382,9 @@
<module>jetty-http-spi</module>
<module>jetty-jsp</module>
<module>jetty-distribution</module>
@@ -41,5 +41,5 @@ index bc5db52..87b391b 100644
<dependencyManagement>
<dependencies>
--
-1.7.9
+1.7.7.6
diff --git a/0003-Change-servelt-groupId-to-javax.servlet.patch b/0003-Change-servelt-groupId-to-javax.servlet.patch
index 0159dad..352189d 100644
--- a/0003-Change-servelt-groupId-to-javax.servlet.patch
+++ b/0003-Change-servelt-groupId-to-javax.servlet.patch
@@ -1,17 +1,17 @@
-From a74ec5b7cd509887b1169aec62c21858bbd6e1e4 Mon Sep 17 00:00:00 2001
+From 715883e87acb5a080d0591cd78b8b1c65cdda910 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 3/6] Change servelt groupId to javax.servlet
+Subject: [PATCH 3/8] Change servelt groupId to javax.servlet
---
pom.xml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/pom.xml b/pom.xml
-index 87b391b..564de42 100644
+index 6e4f1b2..691bf8d 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -14,6 +14,9 @@
+@@ -15,6 +15,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jetty.url>http://www.eclipse.org/jetty</jetty.url>
<orbit-servlet-api-version>3.0.0.v201112011016</orbit-servlet-api-version>
@@ -22,5 +22,5 @@ index 87b391b..564de42 100644
<slf4j-version>1.6.1</slf4j-version>
<jetty-test-policy-version>1.2</jetty-test-policy-version>
--
-1.7.9
+1.7.7.6
diff --git a/0004-Modify-dependencies.patch b/0004-Modify-dependencies.patch
index 783ef3a..29df875 100644
--- a/0004-Modify-dependencies.patch
+++ b/0004-Modify-dependencies.patch
@@ -1,7 +1,7 @@
-From efe1875615248d81e08142e9fef92ba0a5fab7f6 Mon Sep 17 00:00:00 2001
+From 6dae6b12759819afbe9abd60b27c45509ac50499 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 4/6] Modify dependencies
+Subject: [PATCH 4/8] Modify dependencies
- remove sun httpserver
- add tomcat-jasper
@@ -11,7 +11,7 @@ Subject: [PATCH 4/6] Modify dependencies
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml
-index 7d97c01..29b19e9 100644
+index c641c36..922bad0 100644
--- a/jetty-http-spi/pom.xml
+++ b/jetty-http-spi/pom.xml
@@ -17,12 +17,6 @@
@@ -28,7 +28,7 @@ index 7d97c01..29b19e9 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 8f56510..3a35489 100644
+index 5fbc952..eaba79e 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
@@ -41,6 +41,15 @@
@@ -48,5 +48,5 @@ index 8f56510..3a35489 100644
</dependencies>
--
-1.7.9
+1.7.7.6
diff --git a/0005-Remove-pmd-plugin.patch b/0005-Remove-pmd-plugin.patch
index b134d8c..71eb2c2 100644
--- a/0005-Remove-pmd-plugin.patch
+++ b/0005-Remove-pmd-plugin.patch
@@ -1,7 +1,7 @@
-From 77de1649a07e5c7c117039586b53da748907fac6 Mon Sep 17 00:00:00 2001
+From 561d02921266735f31bff5111c69741f5d9af648 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 5/6] Remove pmd plugin
+Subject: [PATCH 5/8] Remove pmd plugin
- prevents problem with "Reporting mojo's can only be called from
ReportDocumentRender". Investigate proper fix some other time?
@@ -10,10 +10,10 @@ Subject: [PATCH 5/6] Remove pmd plugin
1 files changed, 0 insertions(+), 29 deletions(-)
diff --git a/pom.xml b/pom.xml
-index 564de42..65cf13a 100644
+index 691bf8d..9eb07e2 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -170,35 +170,6 @@
+@@ -171,35 +171,6 @@
</dependency>
</dependencies>
</plugin>
@@ -50,5 +50,5 @@ index 564de42..65cf13a 100644
<pluginManagement>
<plugins>
--
-1.7.9
+1.7.7.6
diff --git a/0006-Remove-unpack-config-deps-from-distribution.patch b/0006-Remove-unpack-config-deps-from-distribution.patch
index 8c45814..027af8e 100644
--- a/0006-Remove-unpack-config-deps-from-distribution.patch
+++ b/0006-Remove-unpack-config-deps-from-distribution.patch
@@ -1,7 +1,7 @@
-From c20556699d33e3a85329650d9ef21f17190ecf0f Mon Sep 17 00:00:00 2001
+From 560d5f75fed8bb44df915140c74512c7d95d1717 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue, 27 Mar 2012 10:11:41 +0200
-Subject: [PATCH 6/6] Remove unpack-config-deps from distribution
+Subject: [PATCH 6/8] Remove unpack-config-deps from distribution
This is needed because original code used classifiers to select subset
of artifacts. Unfortunately there seems to be a weird bug affecting even
@@ -15,10 +15,10 @@ manually before building distribution
1 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
-index bb6aff6..00101d0 100644
+index aff91ff..8cd3aba 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
-@@ -216,20 +216,6 @@
+@@ -202,20 +202,6 @@
</configuration>
</execution>
<execution>
@@ -36,9 +36,9 @@ index bb6aff6..00101d0 100644
- </configuration>
- </execution>
- <execution>
- <id>unpack-javadoc</id>
+ <id>copy-lib-monitor-deps</id>
<phase>generate-resources</phase>
<goals>
--
-1.7.9
+1.7.7.6
diff --git a/0007-disable-jetty-osgi.patch b/0007-disable-jetty-osgi.patch
index 4f29e82..6720fc7 100644
--- a/0007-disable-jetty-osgi.patch
+++ b/0007-disable-jetty-osgi.patch
@@ -1,7 +1,7 @@
-From 82457b406b8198f26c470ee0b55485abdfd7b903 Mon Sep 17 00:00:00 2001
+From 32ba8f2a4688759640570ba3b99d969a2ef53b55 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Mon, 30 Apr 2012 16:24:57 +0200
-Subject: [PATCH 7/7] disable jetty-osgi
+Subject: [PATCH 7/8] disable jetty-osgi
---
jetty-jsp/pom.xml | 9 ++++++++-
@@ -9,7 +9,7 @@ Subject: [PATCH 7/7] disable jetty-osgi
2 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml
-index 55e8d29..4a3a5a9 100644
+index 305766d..03e9965 100644
--- a/jetty-jsp/pom.xml
+++ b/jetty-jsp/pom.xml
@@ -48,11 +48,18 @@
@@ -33,10 +33,10 @@ index 55e8d29..4a3a5a9 100644
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
-index 65cf13a..65abba7 100644
+index 9eb07e2..4575f76 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -352,7 +352,6 @@
+@@ -351,7 +351,6 @@
<module>jetty-start</module>
<module>jetty-nested</module>
<module>jetty-overlay-deployer</module>
@@ -44,7 +44,7 @@ index 65cf13a..65abba7 100644
<module>jetty-nosql</module>
<module>jetty-http-spi</module>
<module>jetty-jsp</module>
-@@ -545,23 +544,6 @@
+@@ -543,23 +542,6 @@
</modules>
</profile>
<profile>
diff --git a/0008-Disable-jetty-nosql.patch b/0008-Disable-jetty-nosql.patch
index bc8a0e4..4daa635 100644
--- a/0008-Disable-jetty-nosql.patch
+++ b/0008-Disable-jetty-nosql.patch
@@ -1,4 +1,4 @@
-From 7a6b4a3722c778cc5d0651afb8a50811deec8e15 Mon Sep 17 00:00:00 2001
+From 36fc0972e0a8ea3fc67aa4f655c2ea24b0784a9a Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Thu, 24 May 2012 13:39:02 +0200
Subject: [PATCH 8/8] Disable jetty-nosql
@@ -8,10 +8,10 @@ Subject: [PATCH 8/8] Disable jetty-nosql
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/pom.xml b/pom.xml
-index 65abba7..ec3c277 100644
+index 4575f76..ca5c317 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -352,7 +352,6 @@
+@@ -351,7 +351,6 @@
<module>jetty-start</module>
<module>jetty-nested</module>
<module>jetty-overlay-deployer</module>
diff --git a/jetty.spec b/jetty.spec
index d637051..6f162cc 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -40,11 +40,11 @@
%global jettylibdir %{_localstatedir}/lib/%{name}
%global appdir %{jettylibdir}/webapps
-%global addver v20120308
+%global addver v20120524
Name: jetty
-Version: 8.1.2
-Release: 9%{?dist}
+Version: 8.1.4
+Release: 1%{?dist}
Summary: Java Webserver and Servlet Container
Group: Applications/Internet
@@ -1011,6 +1011,9 @@ groupdel %username &>/dev/null || :
%doc %{_javadocdir}/%{name}
%changelog
+* Tue May 29 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 8.1.4-1
+- Update to 8.1.4
+
* Thu May 24 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 8.1.2-9
- Add patch to disable jetty-nosql
diff --git a/sources b/sources
index 6c400aa..84f277a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-faf96761ba634974e6545793cadea498 jetty-8.1.2.v20120308.tar.bz2
+0718c624b2e7516d45369e1a60d6914a jetty-8.1.4.v20120524.tar.bz2
More information about the java-sig-commits
mailing list