[pkg-java] r19057 - in trunk/libjamon-java/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2016-05-16 23:54:56 +0000 (Mon, 16 May 2016)
New Revision: 19057

Modified:
   trunk/libjamon-java/debian/changelog
   trunk/libjamon-java/debian/control
   trunk/libjamon-java/debian/patches/series
   trunk/libjamon-java/debian/pom.xml
   trunk/libjamon-java/debian/rules
Log:
Transition to Jetty 9



Modified: trunk/libjamon-java/debian/changelog
===================================================================
--- trunk/libjamon-java/debian/changelog	2016-05-06 10:03:46 UTC (rev 19056)
+++ trunk/libjamon-java/debian/changelog	2016-05-16 23:54:56 UTC (rev 19057)
@@ -1,3 +1,10 @@
+libjamon-java (2.7-6) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Transition to Jetty 9
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 17 May 2016 01:53:50 +0200
+
 libjamon-java (2.7-5) unstable; urgency=medium
 
   * Team upload.

Modified: trunk/libjamon-java/debian/control
===================================================================
--- trunk/libjamon-java/debian/control	2016-05-06 10:03:46 UTC (rev 19056)
+++ trunk/libjamon-java/debian/control	2016-05-16 23:54:56 UTC (rev 19057)
@@ -8,7 +8,7 @@
                debhelper (>= 9),
                default-jdk,
                libgeronimo-interceptor-3.0-spec-java,
-               libjetty-java,
+               libjetty9-java,
                liblog4j1.2-java,
                libservlet3.1-java,
                libtomcat8-java,

Modified: trunk/libjamon-java/debian/patches/series
===================================================================
--- trunk/libjamon-java/debian/patches/series	2016-05-06 10:03:46 UTC (rev 19056)
+++ trunk/libjamon-java/debian/patches/series	2016-05-16 23:54:56 UTC (rev 19057)
@@ -1,3 +1,4 @@
 api-fix.diff
 build.diff
 java7-compat.diff
+jetty-compatibility.patch

Modified: trunk/libjamon-java/debian/pom.xml
===================================================================
--- trunk/libjamon-java/debian/pom.xml	2016-05-06 10:03:46 UTC (rev 19056)
+++ trunk/libjamon-java/debian/pom.xml	2016-05-16 23:54:56 UTC (rev 19057)
@@ -18,21 +18,15 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty</artifactId>
-            <version>6.x</version>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <version>9.x</version>
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty-util</artifactId>
-            <version>6.x</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1</version>
             <optional>true</optional>
         </dependency>
     </dependencies>

Modified: trunk/libjamon-java/debian/rules
===================================================================
--- trunk/libjamon-java/debian/rules	2016-05-06 10:03:46 UTC (rev 19056)
+++ trunk/libjamon-java/debian/rules	2016-05-16 23:54:56 UTC (rev 19057)
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS  := tomcat8-catalina geronimo-interceptor-3.0-spec jetty jetty-util log4j-1.2 servlet-api-3.1
+DEB_JARS  := tomcat8-catalina geronimo-interceptor-3.0-spec jetty9-server jetty9-io jetty9-http jetty9-util log4j-1.2 servlet-api-3.1
 
 install/libjamon-java::
 	mh_installpom -plibjamon-java debian/pom.xml