[jetty9] 07/99: Add build patches

[Jakub Adam]

This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a commit to branch master
in repository jetty9.

commit 8f1a0cf922de0d7c3dbb06544efded3850c0646a
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sun Mar 4 12:46:59 2012 +0100

    Add build patches
---
 debian/patches/annotations-find-asm-commons.patch | 23 ++++++++++++++
 debian/patches/disable-modules.patch              | 38 +++++++++++++++++++++++
 debian/patches/disable-osgi-tests.patch           | 21 +++++++++++++
 debian/patches/maven-bundle-plugin-version.patch  | 20 ++++++++++++
 debian/patches/series                             |  4 +++
 5 files changed, 106 insertions(+)

diff --git a/debian/patches/annotations-find-asm-commons.patch b/debian/patches/annotations-find-asm-commons.patch
new file mode 100644
index 0000000..7317350
--- /dev/null
+++ b/debian/patches/annotations-find-asm-commons.patch
@@ -0,0 +1,23 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Thu, 1 Mar 2012 21:28:39 +0100
+Subject: annotations-find-asm-commons
+
+---
+ jetty-annotations/pom.xml |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml
+index 9939183..950385c 100644
+--- a/jetty-annotations/pom.xml
++++ b/jetty-annotations/pom.xml
+@@ -99,5 +99,10 @@
+       <groupId>org.eclipse.jetty.orbit</groupId>
+       <artifactId>org.objectweb.asm</artifactId>
+     </dependency>
++    <dependency>
++      <groupId>asm</groupId>
++      <artifactId>asm-commons</artifactId>
++      <version>3.x</version>
++    </dependency>
+   </dependencies>
+ </project>
diff --git a/debian/patches/disable-modules.patch b/debian/patches/disable-modules.patch
new file mode 100644
index 0000000..6420101
--- /dev/null
+++ b/debian/patches/disable-modules.patch
@@ -0,0 +1,38 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Thu, 1 Mar 2012 21:33:06 +0100
+Subject: disable-modules
+
+---
+ pom.xml |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 86d79e5..9933028 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -378,19 +378,19 @@
+     <module>jetty-start</module>
+     <module>jetty-nested</module>
+     <module>jetty-overlay-deployer</module>
+-    <module>jetty-osgi</module>
++    <!--module>jetty-osgi</module>
+     <module>jetty-nosql</module>
+-    <module>jetty-http-spi</module>
++    <module>jetty-http-spi</module-->
+     <module>jetty-jsp</module>
+-    <module>jetty-distribution</module>
+-    <module>test-continuation</module>
++    <!--module>jetty-distribution</module>
++    <module>test-continuation</module-->
+     <!--module>test-continuation-jetty6</module-->
+-    <module>test-jetty-servlet</module>
++    <!--module>test-jetty-servlet</module>
+     <module>test-jetty-webapp</module>
+     <module>test-jetty-nested</module>
+     <module>example-jetty-embedded</module>
+     <module>example-async-rest</module>
+-    <module>tests</module>
++    <module>tests</module-->
+   </modules>
+   <dependencyManagement>
+     <dependencies>
diff --git a/debian/patches/disable-osgi-tests.patch b/debian/patches/disable-osgi-tests.patch
new file mode 100644
index 0000000..ea91109
--- /dev/null
+++ b/debian/patches/disable-osgi-tests.patch
@@ -0,0 +1,21 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Thu, 1 Mar 2012 21:29:17 +0100
+Subject: disable-osgi-tests
+
+---
+ jetty-osgi/pom.xml |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
+index 428cd22..ab23218 100644
+--- a/jetty-osgi/pom.xml
++++ b/jetty-osgi/pom.xml
+@@ -24,7 +24,7 @@
+     <module>jetty-osgi-boot-jsp</module>
+     <module>jetty-osgi-boot-warurl</module>
+     <module>jetty-osgi-httpservice</module>
+-    <module>test-jetty-osgi</module>
++    <!--module>test-jetty-osgi</module-->
+   </modules>
+   <build>
+     <resources>
diff --git a/debian/patches/maven-bundle-plugin-version.patch b/debian/patches/maven-bundle-plugin-version.patch
new file mode 100644
index 0000000..d671021
--- /dev/null
+++ b/debian/patches/maven-bundle-plugin-version.patch
@@ -0,0 +1,20 @@
+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 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 1e872a8..86d79e5 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -233,6 +233,7 @@
+         <plugin>
+           <groupId>org.apache.felix</groupId>
+           <artifactId>maven-bundle-plugin</artifactId>
++          <version>2.3.5</version>
+           <extensions>true</extensions>
+           <configuration>
+             <instructions>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cd2a3cf
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+annotations-find-asm-commons.patch
+disable-osgi-tests.patch
+maven-bundle-plugin-version.patch
+disable-modules.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git