[postgis-java] 05/08: Refresh patches.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository postgis-java.

commit 20bcab9648afd7c8af2375f4f3f970778aee7512
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 29 08:45:26 2016 +0200

    Refresh patches.
---
 debian/changelog                      |  1 +
 debian/patches/add-classpath.patch    |  8 +---
 debian/patches/upstream-version.patch | 82 +++++++++++++++++++++++++++--------
 3 files changed, 67 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e32649b..63c3b0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ postgis-java (1:2.2.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Bump Standards-Version to 3.9.8, no changes.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 29 Jul 2016 08:40:00 +0200
 
diff --git a/debian/patches/add-classpath.patch b/debian/patches/add-classpath.patch
index 7c36814..038fff0 100644
--- a/debian/patches/add-classpath.patch
+++ b/debian/patches/add-classpath.patch
@@ -1,5 +1,6 @@
 Description: Add classpath to postgis-jdbc jar.
 Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
 
 --- a/jdbc/pom.xml
 +++ b/jdbc/pom.xml
@@ -21,10 +22,3 @@ Author: Bas Couwenberg <sebastic at debian.org>
                  <artifactId>maven-surefire-plugin</artifactId>
                  <configuration>
                      <suiteXmlFiles>
-@@ -58,4 +69,4 @@
-         </plugins>
-     </build>
- 
--</project>
-\ No newline at end of file
-+</project>
diff --git a/debian/patches/upstream-version.patch b/debian/patches/upstream-version.patch
index 15a57ad..f2ddb51 100644
--- a/debian/patches/upstream-version.patch
+++ b/debian/patches/upstream-version.patch
@@ -7,13 +7,13 @@ Author: Bas Couwenberg <sebastic at debian.org>
      <parent>
          <groupId>net.postgis</groupId>
          <artifactId>postgis-java-aggregator</artifactId>
--        <version>2.2.1-SNAPSHOT</version>
-+        <version>2.2.0</version>
+-        <version>2.2.2-SNAPSHOT</version>
++        <version>2.2.1</version>
      </parent>
  
      <artifactId>postgis-jdbc</artifactId>
--    <version>2.2.1-SNAPSHOT</version>
-+    <version>2.2.0</version>
+-    <version>2.2.2-SNAPSHOT</version>
++    <version>2.2.1</version>
      <packaging>jar</packaging>
  
      <name>Postgis JDBC Driver</name>
@@ -23,13 +23,13 @@ Author: Bas Couwenberg <sebastic at debian.org>
  	<parent>
  		<groupId>net.postgis</groupId>
  		<artifactId>postgis-java-aggregator</artifactId>
--		<version>2.2.1-SNAPSHOT</version>
-+		<version>2.2.0</version>
+-		<version>2.2.2-SNAPSHOT</version>
++		<version>2.2.1</version>
  	</parent>
  
  	<artifactId>postgis-jdbc-jtsparser</artifactId>
--	<version>2.2.1-SNAPSHOT</version>
-+	<version>2.2.0</version>
+-	<version>2.2.2-SNAPSHOT</version>
++	<version>2.2.1</version>
  	<packaging>jar</packaging>
  
      <name>Postgis JDBC Driver JTS Parser</name>
@@ -39,12 +39,12 @@ Author: Bas Couwenberg <sebastic at debian.org>
  
      <groupId>net.postgis</groupId>
      <artifactId>postgis-java-aggregator</artifactId>
--    <version>2.2.1-SNAPSHOT</version>
-+    <version>2.2.0</version>
+-    <version>2.2.2-SNAPSHOT</version>
++    <version>2.2.1</version>
      <packaging>pom</packaging>
  
      <name>PostGIS Java Project</name>
-@@ -354,4 +354,4 @@
+@@ -371,4 +371,4 @@
          </profile>
      </profiles>
  
@@ -57,13 +57,13 @@ Author: Bas Couwenberg <sebastic at debian.org>
      <parent>
          <groupId>net.postgis</groupId>
          <artifactId>postgis-java-aggregator</artifactId>
--        <version>2.2.1-SNAPSHOT</version>
-+        <version>2.2.0</version>
+-        <version>2.2.2-SNAPSHOT</version>
++        <version>2.2.1</version>
      </parent>
  
      <artifactId>postgis-jdbc-java2d</artifactId>
--    <version>2.2.1-SNAPSHOT</version>
-+    <version>2.2.0</version>
+-    <version>2.2.2-SNAPSHOT</version>
++    <version>2.2.1</version>
      <packaging>jar</packaging>
  
      <name>postgis-jdbc-java2d</name>
@@ -71,8 +71,56 @@ Author: Bas Couwenberg <sebastic at debian.org>
          <dependency>
              <groupId>net.postgis</groupId>
              <artifactId>postgis-jdbc</artifactId>
--            <version>2.2.1-SNAPSHOT</version>
-+            <version>2.2.0</version>
+-            <version>2.2.2-SNAPSHOT</version>
++            <version>2.2.1</version>
          </dependency>
      </dependencies>
  
+--- a/tools/osgeo-postgis-jdbc-test-util/pom.xml
++++ b/tools/osgeo-postgis-jdbc-test-util/pom.xml
+@@ -5,11 +5,11 @@
+     <parent>
+         <artifactId>tools</artifactId>
+         <groupId>net.postgis</groupId>
+-        <version>2.2.2-SNAPSHOT</version>
++        <version>2.2.1</version>
+     </parent>
+ 
+     <artifactId>osgeo-postgis-jdbc-test-util</artifactId>
+-    <version>2.2.2-SNAPSHOT</version>
++    <version>2.2.1</version>
+     <packaging>jar</packaging>
+ 
+     <name>osgeo-postgis-jdbc-test-util</name>
+@@ -30,7 +30,7 @@
+         <dependency>
+             <groupId>net.postgis</groupId>
+             <artifactId>postgis-jdbc</artifactId>
+-            <version>2.2.2-SNAPSHOT</version>
++            <version>2.2.1</version>
+         </dependency>
+ 
+         <dependency>
+@@ -96,4 +96,4 @@
+         </plugins>
+     </build>
+ 
+-</project>
+\ No newline at end of file
++</project>
+--- a/tools/pom.xml
++++ b/tools/pom.xml
+@@ -5,11 +5,11 @@
+     <parent>
+         <artifactId>postgis-java-aggregator</artifactId>
+         <groupId>net.postgis</groupId>
+-        <version>2.2.2-SNAPSHOT</version>
++        <version>2.2.1</version>
+     </parent>
+ 
+     <artifactId>tools</artifactId>
+-    <version>2.2.2-SNAPSHOT</version>
++    <version>2.2.1</version>
+     <packaging>pom</packaging>
+ 
+     <name>tools</name>

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