[jenkins] 20/32: Refresh patches post rejigs.

[James Downing Page]

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

jamespage pushed a commit to branch master
in repository jenkins.

commit 72513f1edca7b4f52b12a771154a50f21031fbf9
Author: James Page <james.page at ubuntu.com>
Date:   Mon Aug 12 12:50:57 2013 +0100

    Refresh patches post rejigs.
---
 ...ble-animal-sniffer-compatibility-checking.patch |   49 --------------------
 debian/patches/series                              |    1 -
 2 files changed, 50 deletions(-)

diff --git a/debian/patches/0021-Disable-animal-sniffer-compatibility-checking.patch b/debian/patches/0021-Disable-animal-sniffer-compatibility-checking.patch
deleted file mode 100644
index a46769d..0000000
--- a/debian/patches/0021-Disable-animal-sniffer-compatibility-checking.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: James Page <james.page at ubuntu.com>
-Date: Mon, 12 Aug 2013 12:33:04 +0100
-Subject: Disable animal-sniffer compatibility checking
-
-Limited value in distro package build and causing compilation failures.
----
- pom.xml | 22 +---------------------
- 1 file changed, 1 insertion(+), 21 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 8eaecdd..23ee311 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -550,7 +550,7 @@ THE SOFTWARE.
-           <prepareVerifyArgs>-P release,sign</prepareVerifyArgs>
-           <!-- work around for a bug in javadoc plugin that causes the release to fail. see MRELEASE-271 -->
-           <preparationGoals>clean install</preparationGoals>
--          <goals>-DskipTests -Danimal.sniffer.skip=false javadoc:javadoc deploy javadoc:aggregate</goals>
-+          <goals>-DskipTests -Danimal.sniffer.skip=true javadoc:javadoc deploy javadoc:aggregate</goals>
-           <pushChanges>false</pushChanges>
-           <localCheckout>true</localCheckout>
-           <tagNameFormat>jenkins-@{project.version}</tagNameFormat>
-@@ -572,26 +572,6 @@ THE SOFTWARE.
-         </executions>
-       </plugin>
-       <plugin>
--        <!-- make sure our code doesn't have 1.6 dependencies except where we know it -->
--        <groupId>org.codehaus.mojo</groupId>
--        <artifactId>animal-sniffer-maven-plugin</artifactId>
--        <executions>
--          <execution>
--            <goals>
--              <goal>check</goal>
--            </goals>
--          </execution>
--        </executions>
--        <configuration>
--          <signature>
--            <groupId>org.codehaus.mojo.signature</groupId>
--            <artifactId>java15</artifactId>
--            <version>1.0</version>
--          </signature>
--        </configuration>
--      </plugin>
--
--      <plugin>
-         <artifactId>maven-compiler-plugin</artifactId>
-         <configuration><!-- we specify this in the parent POM, so this is redundant, but otherwise IntelliJ is unhappy -->
-           <source>1.5</source>
diff --git a/debian/patches/series b/debian/patches/series
index 45e669c..a6d1122 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,4 +18,3 @@ build/0017-ignore-plugin-pom.xml.patch
 build/0018-fileupload-compat.patch
 build/0019-io-compat.pach.patch
 0020-Drop-use-of-gitsite-extension.patch
-0021-Disable-animal-sniffer-compatibility-checking.patch

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