[jetty: 1/2] Update to Jetty 8.1.9.

Alexander Kurtakov akurtakov at fedoraproject.org
Thu Feb 14 11:41:36 UTC 2013


commit 0cd49971b7fdd1e08979f9e553d89a4fd6a98d70
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Thu Feb 14 13:38:31 2013 +0200

    Update to Jetty 8.1.9.

 jetty-depmap.xml |  146 ------------------------------------------------------
 jetty.spec       |    9 ++-
 sources          |    2 +-
 3 files changed, 7 insertions(+), 150 deletions(-)
---
diff --git a/jetty-depmap.xml b/jetty-depmap.xml
index f47991a..d444556 100644
--- a/jetty-depmap.xml
+++ b/jetty-depmap.xml
@@ -1,136 +1,6 @@
 <dependencies>
 <dependency>
     <maven>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>tomcat-util</artifactId>
-        <version>3.0</version>
-    </maven>
-    <jpp>
-        <groupId>JPP/tomcat</groupId>
-        <artifactId>tomcat-util</artifactId>
-        <version>3.0</version>
-    </jpp>
-</dependency>
-<dependency>
-    <maven>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>tomcat-api</artifactId>
-        <version>3.0</version>
-    </maven>
-    <jpp>
-        <groupId>JPP/tomcat</groupId>
-        <artifactId>tomcat-api</artifactId>
-        <version>3.0</version>
-    </jpp>
-</dependency>
-<dependency>
-    <maven>
-        <groupId>org.eclipse</groupId>
-        <artifactId>org.eclipse.eclipse</artifactId>
-        <version>3.3.0</version>
-    </maven>
-</dependency>
-<dependency>
-    <maven>
-        <groupId>org.eclipse.core</groupId>
-        <artifactId>resources</artifactId>
-        <version>3.3.0</version>
-    </maven>
-</dependency>
-
-<dependency>
-    <maven>
-        <groupId>javax.servlet</groupId>
-        <artifactId>jstl</artifactId>
-        <version>3.0</version>
-    </maven>
-    <jpp>
-        <groupId>JPP</groupId>
-        <artifactId>taglibs-core</artifactId>
-        <version>3.0</version>
-    </jpp>
-</dependency>
-
-<dependency>
-    <maven>
-        <groupId>javax.servlet</groupId>
-        <artifactId>servlet-api</artifactId>
-        <version>3.0</version>
-    </maven>
-    <jpp>
-        <groupId>JPP</groupId>
-        <artifactId>tomcat-servlet-3.0-api</artifactId>
-        <version>3.0</version>
-    </jpp>
-</dependency>
-
-<dependency>
-    <maven>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>servlet-api</artifactId>
-        <version>3.0</version>
-    </maven>
-    <jpp>
-        <groupId>JPP</groupId>
-        <artifactId>tomcat-servlet-3.0-api</artifactId>
-        <version>3.0</version>
-    </jpp>
-</dependency>
-
-<dependency>
-    <maven>
-        <groupId>javax.servlet.jsp</groupId>
-        <artifactId>jsp-api</artifactId>
-        <version>3.0</version>
-    </maven>
-    <jpp>
-        <groupId>JPP</groupId>
-        <artifactId>tomcat-jsp-api</artifactId>
-        <version>3.0</version>
-    </jpp>
-</dependency>
-
-<dependency>
-    <maven>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jsp-2.1-glassfish</artifactId>
-        <version>3.0</version>
-    </maven>
-    <jpp>
-        <groupId>JPP</groupId>
-        <artifactId>tomcat-jsp-api</artifactId>
-        <version>3.0</version>
-    </jpp>
-</dependency>
-
-<dependency>
-    <maven>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty-jsp</artifactId>
-        <version>3.0</version>
-    </maven>
-    <jpp>
-        <groupId>JPP</groupId>
-        <artifactId>tomcat-jsp-api</artifactId>
-        <version>3.0</version>
-    </jpp>
-</dependency>
-
-<dependency>
-    <maven>
-        <groupId>javax.el</groupId>
-        <artifactId>el-api</artifactId>
-        <version>2.2</version>
-    </maven>
-    <jpp> 
-        <groupId>JPP</groupId>
-        <artifactId>tomcat-el-api</artifactId>
-        <version>7.0.23</version> 
-    </jpp>
-</dependency>
-
-<dependency>
-    <maven>
         <groupId>org.eclipse.jdt.core.compiler</groupId>
         <artifactId>ecj</artifactId>
         <version>2.2</version>
@@ -141,14 +11,6 @@
         <version>7.0.23</version> 
     </jpp>
 </dependency>
-
-<dependency>
-    <maven>
-        <groupId>javax.activation</groupId>
-        <artifactId>activation</artifactId>
-        <version>3.0</version>
-    </maven>
-</dependency>
 <dependency>
     <maven>
         <groupId>org.mortbay.jetty</groupId>
@@ -156,12 +18,4 @@
         <version>3.0</version>
     </maven>
 </dependency>
-<dependency>
-    <maven>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty</artifactId>
-        <version>3.0</version>
-    </maven>
-</dependency>
-
 </dependencies>
diff --git a/jetty.spec b/jetty.spec
index 87011e6..4ae51c0 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -40,7 +40,7 @@
 %global jettylibdir %{_localstatedir}/lib/%{name}
 %global appdir      %{jettylibdir}/webapps
 
-%global addver v20120716
+%global addver v20130131
 
 # Conditionals to help breaking eclipse <-> jetty dependency cycle
 # when bootstrapping for new architectures
@@ -50,8 +50,8 @@
 %endif
 
 Name:           jetty
-Version:        8.1.5
-Release:        11%{?dist}
+Version:        8.1.9
+Release:        1%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -941,6 +941,9 @@ getent passwd %username &>/dev/null || useradd  -r -u %jtuid -g %username \
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Feb 14 2013 Alexander Kurtakov <akurtako at redhat.com> 8.1.9-1
+- Update to 8.1.9.
+
 * Wed Feb 06 2013 Java SIG <java-devel at lists.fedoraproject.org> - 8.1.5-11
 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
 - Replace maven BuildRequires with maven-local
diff --git a/sources b/sources
index 1dc0066..be9e0dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5192ef96acd9226ee8f3fa2cde6dbb29  jetty-8.1.5.v20120716.tar.bz2
+ad3e3ce4bb34340a300907d41f873f45  jetty-8.1.9.v20130131.tar.bz2


More information about the scm-commits mailing list