Skip to content

Commit 518a9d7

Browse files
philliprossphillipross
committed
Merge pull request #31 from phillipross/master
cherry picks from v2.1-maintenance branch
2 parents 0568b11 + 5efc2dd commit 518a9d7

File tree

4 files changed

+33
-24
lines changed

4 files changed

+33
-24
lines changed

‎jdbc/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<parent>
8-
<groupId>org.postgis</groupId>
8+
<groupId>net.postgis</groupId>
99
<artifactId>postgis-java-aggregator</artifactId>
1010
<version>2.2.0-SNAPSHOT</version>
1111
</parent>

‎jdbc_jtsparser/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<parent>
8-
<groupId>org.postgis</groupId>
8+
<groupId>net.postgis</groupId>
99
<artifactId>postgis-java-aggregator</artifactId>
1010
<version>2.2.0-SNAPSHOT</version>
1111
</parent>
@@ -27,7 +27,7 @@
2727

2828
<dependencies>
2929
<dependency>
30-
<groupId>org.postgis</groupId>
30+
<groupId>net.postgis</groupId>
3131
<artifactId>postgis-jdbc</artifactId>
3232
<version>[2.1.0,)</version>
3333
</dependency>

‎pom.xml‎

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>org.postgis</groupId>
7+
<groupId>net.postgis</groupId>
88
<artifactId>postgis-java-aggregator</artifactId>
99
<version>2.2.0-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

12-
<name>Postgis Java Project</name>
13-
<description>Aggregates java projects associated with the Postgis project.</description>
12+
<name>PostGIS Java Project</name>
13+
<description>Aggregates java projects associated with the PostGIS project.</description>
1414
<url>http://postgis.net</url>
1515
<licenses>
1616
<license>
@@ -22,15 +22,15 @@
2222

2323
<developers>
2424
<developer>
25-
<name>Postgis Development Team</name>
25+
<name>PostGIS Development Team</name>
26+
<url>http://postgis.net</url>
2627
</developer>
2728
<developer>
28-
<name>María Arias de Reyna</name>
29-
<email>delawen en gmail.com</email>
30-
</developer>
31-
<developer>
32-
<name>Baris ERGUN</name>
33-
<email>[email protected]</email>
29+
<name>Phillip Ross</name>
30+
<email>phillip.w.g.ross at gmail.com</email>
31+
<roles>
32+
<role>Maintainer</role>
33+
</roles>
3434
</developer>
3535
</developers>
3636
<contributors>
@@ -76,19 +76,22 @@
7676
</modules>
7777

7878
<scm>
79-
<url>http://trac.osgeo.org/postgis/browser/trunk</url>
80-
<connection>scm:svn:http://svn.osgeo.org/postgis/trunk</connection>
81-
<developerConnection>scm:svn:http://svn.osgeo.org/postgis/trunk</developerConnection>
79+
<url>https://github.com/postgis/postgis-java</url>
80+
<connection>scm:git:git://github.com/postgis/postgis-java.git</connection>
81+
<developerConnection>scm:git:[email protected]:postgis/postgis-java.git</developerConnection>
8282
</scm>
8383
<issueManagement>
84-
<system>Trac</system>
85-
<url>http://trac.osgeo.org/postgis/</url>
84+
<system>GitHub Issues</system>
85+
<url>https://github.com/postgis/postgis-java/issues</url>
8686
</issueManagement>
8787
<distributionManagement>
88+
<snapshotRepository>
89+
<id>ossrh</id>
90+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
91+
</snapshotRepository>
8892
<repository>
89-
<id>sonatype-postgis-releases</id>
90-
<name>Sonatype Postgis Releases Repo</name>
91-
<url>http://oss.sonatype.org/content/repositories/postgis-releases</url>
93+
<id>ossrh</id>
94+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
9295
</repository>
9396
</distributionManagement>
9497

@@ -103,13 +106,14 @@
103106
<maven-clean-plugin.version>2.6.1</maven-clean-plugin.version>
104107
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
105108
<maven-dependency-plugin.version>2.10</maven-dependency-plugin.version>
106-
<maven-ear-plugin.version>2.10</maven-ear-plugin.version>
109+
<maven-ear-plugin.version>2.10.1</maven-ear-plugin.version>
107110
<maven-enforcer-plugin.version>1.4</maven-enforcer-plugin.version>
108111
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
109112
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
110113
<maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
111114
<maven-jar-plugin.version>2.6</maven-jar-plugin.version>
112115
<maven-jarsigner-plugin.version>1.4</maven-jarsigner-plugin.version>
116+
<maven-release-plugin.version>2.5.2</maven-release-plugin.version>
113117
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
114118
<maven-source-plugin.version>2.4</maven-source-plugin.version>
115119
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
@@ -215,6 +219,11 @@
215219
<artifactId>maven-jarsigner-plugin</artifactId>
216220
<version>${maven-jarsigner-plugin.version}</version>
217221
</plugin>
222+
<plugin>
223+
<groupId>org.apache.maven.plugins</groupId>
224+
<artifactId>maven-release-plugin</artifactId>
225+
<version>${maven-release-plugin.version}</version>
226+
</plugin>
218227
<plugin>
219228
<groupId>org.apache.maven.plugins</groupId>
220229
<artifactId>maven-resources-plugin</artifactId>

‎postgis-jdbc-java2d/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<parent>
8-
<groupId>org.postgis</groupId>
8+
<groupId>net.postgis</groupId>
99
<artifactId>postgis-java-aggregator</artifactId>
1010
<version>2.2.0-SNAPSHOT</version>
1111
</parent>
@@ -27,7 +27,7 @@
2727

2828
<dependencies>
2929
<dependency>
30-
<groupId>org.postgis</groupId>
30+
<groupId>net.postgis</groupId>
3131
<artifactId>postgis-jdbc</artifactId>
3232
<version>2.2.0-SNAPSHOT</version>
3333
</dependency>

0 commit comments

Comments
 (0)