File: 07-assembly-plugin-configuration.patch

package info (click to toggle)
jetty9 9.4.57-1.1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 52,280 kB
  • sloc: java: 442,605; xml: 25,482; javascript: 1,039; sh: 908; jsp: 268; sql: 40; makefile: 16
file content (59 lines) | stat: -rw-r--r-- 2,067 bytes parent folder | download | duplicates (5)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
From: Emmanuel Bourg <ebourg@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

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(-)

--- a/jetty-cdi/pom.xml
+++ b/jetty-cdi/pom.xml
@@ -70,9 +70,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 @@
               <goal>single</goal>
             </goals>
             <configuration>
-              <descriptorRefs>
-                <descriptorRef>config</descriptorRef>
-              </descriptorRefs>
+              <descriptors>
+                <descriptor>../../debian/assembly-config.xml</descriptor>
+              </descriptors>
             </configuration>
           </execution>
         </executions>
--- a/pom.xml
+++ b/pom.xml
@@ -1403,9 +1403,9 @@
                   <goal>single</goal>
                 </goals>
                 <configuration>
-                  <descriptorRefs>
-                    <descriptorRef>config</descriptorRef>
-                  </descriptorRefs>
+                  <descriptors>
+                    <descriptor>debian/assembly-config.xml</descriptor>
+                  </descriptors>
                 </configuration>
               </execution>
             </executions>