[undertow] 01/05: Revert "Add maven-compiler-plugin-2.5.patch"

Markus Koschany apo-guest at moszumanska.debian.org
Thu Dec 24 19:14:18 UTC 2015


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

apo-guest pushed a commit to branch master
in repository undertow.

commit 81d66a8af20ee5cfed714924b98d18dc1c5ae7ab
Author: Markus Koschany <apo at debian.org>
Date:   Thu Dec 24 19:51:59 2015 +0100

    Revert "Add maven-compiler-plugin-2.5.patch"
    
    This reverts commit 120f8dd1029aa506aaf45ab15e207e11b5aef343.
---
 debian/patches/maven-compiler-plugin-2.5.patch | 89 --------------------------
 debian/patches/series                          |  1 -
 2 files changed, 90 deletions(-)

diff --git a/debian/patches/maven-compiler-plugin-2.5.patch b/debian/patches/maven-compiler-plugin-2.5.patch
deleted file mode 100644
index d55c58f..0000000
--- a/debian/patches/maven-compiler-plugin-2.5.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Tue, 22 Dec 2015 21:31:03 +0100
-Subject: maven compiler plugin 2.5
-
----
- core/pom.xml             | 6 ++++++
- parser-generator/pom.xml | 1 +
- pom.xml                  | 5 +++++
- servlet/pom.xml          | 5 +++++
- websockets-jsr/pom.xml   | 5 +++++
- 5 files changed, 22 insertions(+)
-
-diff --git a/core/pom.xml b/core/pom.xml
-index a55649f..7a70050 100644
---- a/core/pom.xml
-+++ b/core/pom.xml
-@@ -160,6 +160,12 @@
-         <plugins>
-             <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-+                <artifactId>maven-compiler-plugin</artifactId>
-+                <version>2.5.1</version>
-+            </plugin>
-+
-+            <plugin>
-+                <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-jar-plugin</artifactId>
-                 <executions>
-                     <execution>
-diff --git a/parser-generator/pom.xml b/parser-generator/pom.xml
-index a3b1921..7cad184 100644
---- a/parser-generator/pom.xml
-+++ b/parser-generator/pom.xml
-@@ -52,6 +52,7 @@
-             <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-compiler-plugin</artifactId>
-+                <version>2.5.1</version>
-                 <configuration>
-                     <compilerArgument>-proc:none</compilerArgument>
-                 </configuration>
-diff --git a/pom.xml b/pom.xml
-index ed833ed..80907d0 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -115,6 +115,11 @@
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-checkstyle-plugin</artifactId>
-             </plugin>
-+            <plugin>
-+                <groupId>org.apache.maven.plugins</groupId>
-+                <artifactId>maven-compiler-plugin</artifactId>
-+                <version>2.5.1</version>
-+            </plugin>
-         </plugins>
-         <pluginManagement>
-             <plugins>
-diff --git a/servlet/pom.xml b/servlet/pom.xml
-index 12895eb..778dbb3 100644
---- a/servlet/pom.xml
-+++ b/servlet/pom.xml
-@@ -134,6 +134,11 @@
- 
-         <plugins>
-             <plugin>
-+                <groupId>org.apache.maven.plugins</groupId>
-+                <artifactId>maven-compiler-plugin</artifactId>
-+                <version>2.5.1</version>
-+            </plugin>
-+            <plugin>
-                 <groupId>org.bitstrings.maven.plugins</groupId>
-                 <artifactId>dependencypath-maven-plugin</artifactId>
-                 <version>1.1.1</version>
-diff --git a/websockets-jsr/pom.xml b/websockets-jsr/pom.xml
-index 445311c..293ec09 100644
---- a/websockets-jsr/pom.xml
-+++ b/websockets-jsr/pom.xml
-@@ -124,6 +124,11 @@
-         <plugins>
-             <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-+                <artifactId>maven-compiler-plugin</artifactId>
-+                <version>2.5.1</version>
-+            </plugin>
-+            <plugin>
-+                <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-surefire-plugin</artifactId>
-                 <configuration>
-                     <enableAssertions>true</enableAssertions>
diff --git a/debian/patches/series b/debian/patches/series
index 59ff42c..9b2f906 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 ALPN.patch
-maven-compiler-plugin-2.5.patch

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



More information about the pkg-java-commits mailing list