[Git][java-team/jetty9][master] 2 commits: Add servlet-api.patch

Markus Koschany (@apo) gitlab at salsa.debian.org
Sat Dec 25 22:45:06 GMT 2021



Markus Koschany pushed to branch master at Debian Java Maintainers / jetty9


Commits:
54f8e8cc by Markus Koschany at 2021-12-25T23:37:31+01:00
Add servlet-api.patch

Closes: #1002274

- - - - -
33917023 by Markus Koschany at 2021-12-25T23:39:25+01:00
Update changelog

- - - - -


10 changed files:

- debian/changelog
- debian/patches/01-maven-bundle-plugin-version.patch
- debian/patches/02-import-alpn-api.patch
- debian/patches/04-weksocket-1.1-compatibility.patch
- debian/patches/06-ignore-jetty-documentation.patch
- debian/patches/07-assembly-plugin-configuration.patch
- debian/patches/08-ignore-jetty-test-policy.patch
- debian/patches/09-tweak-distribution.patch
- debian/patches/series
- + debian/patches/servlet-api.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+jetty9 (9.4.44-4) unstable; urgency=medium
+
+  * Team upload.
+  * Add servlet-api.patch and correct the API version in jetty-home/pom.xml.
+    This used to work because libservlet3.1-java was pulled in as a transitive
+    dependency. (Closes: #1002274)
+
+ -- Markus Koschany <apo at debian.org>  Sat, 25 Dec 2021 23:37:56 +0100
+
 jetty9 (9.4.44-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/01-maven-bundle-plugin-version.patch
=====================================
@@ -1,6 +1,13 @@
 From: Jakub Adam <jakub.adam at ktknet.cz>
 Date: Thu, 1 Mar 2012 21:32:54 +0100
 Subject: maven-bundle-plugin-version
+
+---
+ pom.xml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pom.xml b/pom.xml
+index 8e54127..88e2d49 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -416,6 +416,7 @@


=====================================
debian/patches/02-import-alpn-api.patch
=====================================
@@ -1,4 +1,19 @@
-Description: Add the one-class ALPN API (http://git.eclipse.org/c/jetty/org.eclipse.jetty.alpn.git)
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Sat, 25 Dec 2021 23:34:46 +0100
+Subject: Add the one-class ALPN API
+ (http://git.eclipse.org/c/jetty/org.eclipse.jetty.alpn.git)
+
+---
+ jetty-alpn/jetty-alpn-api/pom.xml                  | 117 ++++++++++
+ .../src/main/java/org/eclipse/jetty/alpn/ALPN.java | 249 +++++++++++++++++++++
+ jetty-alpn/pom.xml                                 |   1 +
+ 3 files changed, 367 insertions(+)
+ create mode 100644 jetty-alpn/jetty-alpn-api/pom.xml
+ create mode 100644 jetty-alpn/jetty-alpn-api/src/main/java/org/eclipse/jetty/alpn/ALPN.java
+
+diff --git a/jetty-alpn/jetty-alpn-api/pom.xml b/jetty-alpn/jetty-alpn-api/pom.xml
+new file mode 100644
+index 0000000..4b3b511
 --- /dev/null
 +++ b/jetty-alpn/jetty-alpn-api/pom.xml
 @@ -0,0 +1,117 @@
@@ -119,16 +134,9 @@ Description: Add the one-class ALPN API (http://git.eclipse.org/c/jetty/org.ecli
 +  </build>
 +
 +</project>
---- a/jetty-alpn/pom.xml
-+++ b/jetty-alpn/pom.xml
-@@ -10,6 +10,7 @@
-   <name>Jetty :: ALPN :: Parent</name>
- 
-   <modules>
-+    <module>jetty-alpn-api</module>
-     <module>jetty-alpn-server</module>
-     <module>jetty-alpn-client</module>
-     <module>jetty-alpn-openjdk8-server</module>
+diff --git a/jetty-alpn/jetty-alpn-api/src/main/java/org/eclipse/jetty/alpn/ALPN.java b/jetty-alpn/jetty-alpn-api/src/main/java/org/eclipse/jetty/alpn/ALPN.java
+new file mode 100644
+index 0000000..8a40558
 --- /dev/null
 +++ b/jetty-alpn/jetty-alpn-api/src/main/java/org/eclipse/jetty/alpn/ALPN.java
 @@ -0,0 +1,249 @@
@@ -381,3 +389,15 @@ Description: Add the one-class ALPN API (http://git.eclipse.org/c/jetty/org.ecli
 +    }
 +}
 +
+diff --git a/jetty-alpn/pom.xml b/jetty-alpn/pom.xml
+index 73b2b73..ebf2eaa 100644
+--- a/jetty-alpn/pom.xml
++++ b/jetty-alpn/pom.xml
+@@ -10,6 +10,7 @@
+   <name>Jetty :: ALPN :: Parent</name>
+ 
+   <modules>
++    <module>jetty-alpn-api</module>
+     <module>jetty-alpn-server</module>
+     <module>jetty-alpn-client</module>
+     <module>jetty-alpn-openjdk8-server</module>


=====================================
debian/patches/04-weksocket-1.1-compatibility.patch
=====================================
@@ -1,12 +1,21 @@
-Description: Fix the compatibility with the websocket api 1.1
-Author: Emmanuel Bourg <ebourg at apache.org>
+From: Emmanuel Bourg <ebourg at apache.org>
+Date: Sat, 25 Dec 2021 23:34:46 +0100
+Subject: Fix the compatibility with the websocket api 1.1
+
 Forwarded: no
+---
+ .../java/org/eclipse/jetty/websocket/jsr356/JsrSession.java  | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/JsrSession.java b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/JsrSession.java
+index c567a1f..3c1ca80 100644
 --- a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/JsrSession.java
 +++ b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/JsrSession.java
-@@ -145,6 +145,18 @@
+@@ -144,6 +144,18 @@ public class JsrSession extends WebSocketSession implements javax.websocket.Sess
+         }
      }
  
-     @Override
++    @Override
 +    public <T> void addMessageHandler(Class<T> clazz, MessageHandler.Partial<T> handler) throws IllegalStateException
 +    {
 +        throw new UnsupportedOperationException();
@@ -18,7 +27,6 @@ Forwarded: no
 +        throw new UnsupportedOperationException();
 +    }
 +
-+    @Override
+     @Override
      public void close(CloseReason closeReason) throws IOException
      {
-         close(closeReason.getCloseCode().getCode(), closeReason.getReasonPhrase());


=====================================
debian/patches/06-ignore-jetty-documentation.patch
=====================================
@@ -1,6 +1,15 @@
-Description: Ignore the documentation module (removed from the upstream tarball to save some space)
-Author: Emmanuel Bourg <ebourg at apache.org>
+From: Emmanuel Bourg <ebourg at apache.org>
+Date: Sat, 25 Dec 2021 23:34:46 +0100
+Subject: Ignore the documentation module (removed from the upstream tarball
+ to save some space)
+
 Forwarded: not-needed
+---
+ pom.xml | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/pom.xml b/pom.xml
+index 88e2d49..3626e9e 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -201,7 +201,6 @@


=====================================
debian/patches/07-assembly-plugin-configuration.patch
=====================================
@@ -1,25 +1,22 @@
-Description: Modified the assembly plugin configuration to use debian/assembly-config.xml
- instead of the 'config' descriptor from the (missing) jetty-assembly-descriptors artifact
-Author: Emmanuel Bourg <ebourg at apache.org>
+From: Emmanuel Bourg <ebourg at apache.org>
+Date: Sat, 25 Dec 2021 23:34:46 +0100
+Subject: Modified the assembly plugin configuration to use
+ debian/assembly-config.xml
+
 Forwarded: not-needed
---- a/pom.xml
-+++ b/pom.xml
-@@ -1285,9 +1285,9 @@
-                   <goal>single</goal>
-                 </goals>
-                 <configuration>
--                  <descriptorRefs>
--                    <descriptorRef>config</descriptorRef>
--                  </descriptorRefs>
-+                  <descriptors>
-+                    <descriptor>debian/assembly-config.xml</descriptor>
-+                  </descriptors>
-                 </configuration>
-               </execution>
-             </executions>
---- a/jetty-websocket/javax-websocket-server-impl/pom.xml
-+++ b/jetty-websocket/javax-websocket-server-impl/pom.xml
-@@ -80,9 +80,9 @@
+
+instead of the 'config' descriptor from the (missing) jetty-assembly-descriptors artifact
+---
+ jetty-cdi/pom.xml                                   | 6 +++---
+ jetty-websocket/javax-websocket-server-impl/pom.xml | 6 +++---
+ pom.xml                                             | 6 +++---
+ 3 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml
+index 38e2856..2bd1507 100644
+--- a/jetty-cdi/pom.xml
++++ b/jetty-cdi/pom.xml
+@@ -60,9 +60,9 @@
                <goal>single</goal>
              </goals>
              <configuration>
@@ -27,14 +24,16 @@ Forwarded: not-needed
 -                <descriptorRef>config</descriptorRef>
 -              </descriptorRefs>
 +              <descriptors>
-+                <descriptor>../../debian/assembly-config.xml</descriptor>
++                <descriptor>../debian/assembly-config.xml</descriptor>
 +              </descriptors>
              </configuration>
            </execution>
          </executions>
---- a/jetty-cdi/pom.xml
-+++ b/jetty-cdi/pom.xml
-@@ -60,9 +60,9 @@
+diff --git a/jetty-websocket/javax-websocket-server-impl/pom.xml b/jetty-websocket/javax-websocket-server-impl/pom.xml
+index 20c7ff8..20d0f45 100644
+--- a/jetty-websocket/javax-websocket-server-impl/pom.xml
++++ b/jetty-websocket/javax-websocket-server-impl/pom.xml
+@@ -80,9 +80,9 @@
                <goal>single</goal>
              </goals>
              <configuration>
@@ -42,8 +41,25 @@ Forwarded: not-needed
 -                <descriptorRef>config</descriptorRef>
 -              </descriptorRefs>
 +              <descriptors>
-+                <descriptor>../debian/assembly-config.xml</descriptor>
++                <descriptor>../../debian/assembly-config.xml</descriptor>
 +              </descriptors>
              </configuration>
            </execution>
          </executions>
+diff --git a/pom.xml b/pom.xml
+index 3626e9e..19fff07 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -1285,9 +1285,9 @@
+                   <goal>single</goal>
+                 </goals>
+                 <configuration>
+-                  <descriptorRefs>
+-                    <descriptorRef>config</descriptorRef>
+-                  </descriptorRefs>
++                  <descriptors>
++                    <descriptor>debian/assembly-config.xml</descriptor>
++                  </descriptors>
+                 </configuration>
+               </execution>
+             </executions>


=====================================
debian/patches/08-ignore-jetty-test-policy.patch
=====================================
@@ -1,6 +1,15 @@
-Description: Don't unpack the test files from jetty-test-policy when building jetty-client
-Author: Emmanuel Bourg <ebourg at apache.org>
+From: Emmanuel Bourg <ebourg at apache.org>
+Date: Sat, 25 Dec 2021 23:34:46 +0100
+Subject: Don't unpack the test files from jetty-test-policy when building
+ jetty-client
+
 Forwarded: not-needed
+---
+ jetty-client/pom.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml
+index ac6bfd0..3ae9d0e 100644
 --- a/jetty-client/pom.xml
 +++ b/jetty-client/pom.xml
 @@ -21,7 +21,7 @@


=====================================
debian/patches/09-tweak-distribution.patch
=====================================
@@ -1,12 +1,82 @@
-Description: Remove optional content from the distribution (documentation, sources, test files, examples)
-Author: Emmanuel Bourg <ebourg at apache.org>
+From: Emmanuel Bourg <ebourg at apache.org>
+Date: Sat, 25 Dec 2021 23:34:46 +0100
+Subject: Remove optional content from the distribution (documentation,
+ sources, test files, examples)
+
 Forwarded: not-needed
+---
+ jetty-distribution/pom.xml | 12 ++++++------
+ jetty-home/pom.xml         | 20 ++++++--------------
+ 2 files changed, 12 insertions(+), 20 deletions(-)
+
+diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
+index 6de9e06..9f1c398 100644
+--- a/jetty-distribution/pom.xml
++++ b/jetty-distribution/pom.xml
+@@ -75,7 +75,7 @@
+           </execution>
+           <execution>
+             <id>copy</id>
+-            <phase>prepare-package</phase>
++            <phase>none</phase>
+             <goals>
+               <goal>copy</goal>
+             </goals>
+@@ -147,7 +147,7 @@
+ 
+           <execution>
+             <id>unpack-test-webapp-config</id>
+-            <phase>prepare-package</phase>
++            <phase>none</phase>
+             <goals>
+               <goal>unpack</goal>
+             </goals>
+@@ -169,7 +169,7 @@
+ 
+           <execution>
+             <id>unpack-test-jaas-config</id>
+-            <phase>prepare-package</phase>
++            <phase>none</phase>
+             <goals>
+               <goal>unpack</goal>
+             </goals>
+@@ -191,7 +191,7 @@
+ 
+           <execution>
+             <id>unpack-test-jndi-config</id>
+-            <phase>prepare-package</phase>
++            <phase>none</phase>
+             <goals>
+               <goal>unpack</goal>
+             </goals>
+@@ -213,7 +213,7 @@
+ 
+           <execution>
+             <id>unpack-test-spec-config</id>
+-            <phase>prepare-package</phase>
++            <phase>none</phase>
+             <goals>
+               <goal>unpack</goal>
+             </goals>
+@@ -234,7 +234,7 @@
+           </execution>
+           <execution>
+             <id>unpack-documentation</id>
+-            <phase>prepare-package</phase>
++            <phase>none</phase>
+             <goals>
+               <goal>unpack</goal>
+             </goals>
+diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
+index 6b3f176..90471d7 100644
 --- a/jetty-home/pom.xml
 +++ b/jetty-home/pom.xml
-@@ -80,16 +80,6 @@
+@@ -78,16 +78,6 @@
+             </goals>
+             <configuration>
                <artifactItems>
-                 <artifactItem>
-                   <groupId>org.eclipse.jetty</groupId>
+-                <artifactItem>
+-                  <groupId>org.eclipse.jetty</groupId>
 -                  <artifactId>jetty-project</artifactId>
 -                  <version>${project.version}</version>
 -                  <classifier>version</classifier>
@@ -15,11 +85,9 @@ Forwarded: not-needed
 -                  <outputDirectory>${assembly-directory}/</outputDirectory>
 -                  <destFileName>VERSION.txt</destFileName>
 -                </artifactItem>
--                <artifactItem>
--                  <groupId>org.eclipse.jetty</groupId>
+                 <artifactItem>
+                   <groupId>org.eclipse.jetty</groupId>
                    <artifactId>jetty-start</artifactId>
-                   <version>${project.version}</version>
-                   <classifier>shaded</classifier>
 @@ -104,7 +94,7 @@
            </execution>
            <execution>
@@ -69,59 +137,3 @@ Forwarded: not-needed
              <goals>
                <goal>single</goal>
              </goals>
---- a/jetty-distribution/pom.xml
-+++ b/jetty-distribution/pom.xml
-@@ -75,7 +75,7 @@
-           </execution>
-           <execution>
-             <id>copy</id>
--            <phase>prepare-package</phase>
-+            <phase>none</phase>
-             <goals>
-               <goal>copy</goal>
-             </goals>
-@@ -147,7 +147,7 @@
- 
-           <execution>
-             <id>unpack-test-webapp-config</id>
--            <phase>prepare-package</phase>
-+            <phase>none</phase>
-             <goals>
-               <goal>unpack</goal>
-             </goals>
-@@ -169,7 +169,7 @@
- 
-           <execution>
-             <id>unpack-test-jaas-config</id>
--            <phase>prepare-package</phase>
-+            <phase>none</phase>
-             <goals>
-               <goal>unpack</goal>
-             </goals>
-@@ -191,7 +191,7 @@
- 
-           <execution>
-             <id>unpack-test-jndi-config</id>
--            <phase>prepare-package</phase>
-+            <phase>none</phase>
-             <goals>
-               <goal>unpack</goal>
-             </goals>
-@@ -213,7 +213,7 @@
- 
-           <execution>
-             <id>unpack-test-spec-config</id>
--            <phase>prepare-package</phase>
-+            <phase>none</phase>
-             <goals>
-               <goal>unpack</goal>
-             </goals>
-@@ -234,7 +234,7 @@
-           </execution>
-           <execution>
-             <id>unpack-documentation</id>
--            <phase>prepare-package</phase>
-+            <phase>none</phase>
-             <goals>
-               <goal>unpack</goal>
-             </goals>


=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@
 07-assembly-plugin-configuration.patch
 08-ignore-jetty-test-policy.patch
 09-tweak-distribution.patch
+servlet-api.patch


=====================================
debian/patches/servlet-api.patch
=====================================
@@ -0,0 +1,26 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 25 Dec 2021 23:35:43 +0100
+Subject: servlet api
+
+Forwarded: not-needed
+---
+ jetty-home/pom.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
+index 90471d7..fee2898 100644
+--- a/jetty-home/pom.xml
++++ b/jetty-home/pom.xml
+@@ -284,10 +284,10 @@
+                 <artifactItem>
+                   <groupId>javax.servlet</groupId>
+                   <artifactId>javax.servlet-api</artifactId>
+-                  <version>3.1</version>
++                  <version>4.0.1</version>
+                   <overWrite>true</overWrite>
+                   <outputDirectory>${assembly-directory}/lib</outputDirectory>
+-                  <destFileName>servlet-api-3.1.jar</destFileName>
++                  <destFileName>servlet-api-4.0.1.jar</destFileName>
+                 </artifactItem>
+ <!--
+                 <artifactItem>



View it on GitLab: https://salsa.debian.org/java-team/jetty9/-/compare/1bc97ed5b78c284bb3d38087d1bde885808d4f33...339170238d42f282c9f92f8d36ad8425ac3e4ce6

-- 
View it on GitLab: https://salsa.debian.org/java-team/jetty9/-/compare/1bc97ed5b78c284bb3d38087d1bde885808d4f33...339170238d42f282c9f92f8d36ad8425ac3e4ce6
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20211225/b35c73c0/attachment.htm>


More information about the pkg-java-commits mailing list