[uimaj] 02/03: Refreshed the patches

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository uimaj.

commit 7e0add87b95f8aa25e57ad7a7413480888c590b2
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri May 23 23:37:04 2014 +0200

    Refreshed the patches
---
 debian/changelog                               |  7 +++++++
 debian/patches/disable-integration-tests.diff  |  2 +-
 debian/patches/maven-plugin-configuration.diff | 18 +++++++-----------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3468034..e8b3ca5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+uimaj (2.6.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 23 May 2014 23:29:24 +0200
+
 uimaj (2.5.0-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/disable-integration-tests.diff b/debian/patches/disable-integration-tests.diff
index ea7fa34..6a3f48a 100644
--- a/debian/patches/disable-integration-tests.diff
+++ b/debian/patches/disable-integration-tests.diff
@@ -9,7 +9,7 @@ Forwarded: not-needed
  		<plugins>
  			<plugin>
 -				<artifactId>maven-invoker-plugin</artifactId>
--				<version>1.7</version>
+-				<!-- <version>1.7</version> 1.8 from superpom -->
 -				<configuration>
 -					<projectsDirectory>src/it</projectsDirectory>
 -					<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
diff --git a/debian/patches/maven-plugin-configuration.diff b/debian/patches/maven-plugin-configuration.diff
index d544ad5..1e5aa96 100644
--- a/debian/patches/maven-plugin-configuration.diff
+++ b/debian/patches/maven-plugin-configuration.diff
@@ -4,12 +4,10 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/uimaj-parent/pom.xml
 +++ b/uimaj-parent/pom.xml
-@@ -142,6 +142,26 @@
-   </properties>
-   
-   <build>
-+    <pluginManagement>
-+      <plugins>
+@@ -170,6 +170,22 @@
+ 	          </dependency>
+ 	        </dependencies> -->
+ 	      </plugin>
 +        <plugin>
 +          <groupId>org.apache.maven.plugins</groupId>
 +          <artifactId>maven-plugin-plugin</artifactId>
@@ -26,8 +24,6 @@ Forwarded: not-needed
 +            </execution>
 +          </executions>
 +        </plugin>
-+      </plugins>
-+    </pluginManagement>  
-   </build>
-  
- </project>
+       </plugins>
+     </pluginManagement>
+     <plugins>

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