Skip to content

cherry picks from v2.1-maintenance branch #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2015
Merged

cherry picks from v2.1-maintenance branch #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jdbc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.postgis</groupId>
<groupId>net.postgis</groupId>
<artifactId>postgis-java-aggregator</artifactId>
<version>2.2.0-SNAPSHOT</version>
</parent>
Expand Down
4 changes: 2 additions & 2 deletions jdbc_jtsparser/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.postgis</groupId>
<groupId>net.postgis</groupId>
<artifactId>postgis-java-aggregator</artifactId>
<version>2.2.0-SNAPSHOT</version>
</parent>
Expand All @@ -27,7 +27,7 @@

<dependencies>
<dependency>
<groupId>org.postgis</groupId>
<groupId>net.postgis</groupId>
<artifactId>postgis-jdbc</artifactId>
<version>[2.1.0,)</version>
</dependency>
Expand Down
47 changes: 28 additions & 19 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<groupId>org.postgis</groupId>
<groupId>net.postgis</groupId>
<artifactId>postgis-java-aggregator</artifactId>
<version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Postgis Java Project</name>
<description>Aggregates java projects associated with the Postgis project.</description>
<name>PostGIS Java Project</name>
<description>Aggregates java projects associated with the PostGIS project.</description>
<url>http://postgis.net</url>
<licenses>
<license>
Expand All @@ -22,15 +22,15 @@

<developers>
<developer>
<name>Postgis Development Team</name>
<name>PostGIS Development Team</name>
<url>http://postgis.net</url>
</developer>
<developer>
<name>María Arias de Reyna</name>
<email>delawen en gmail.com</email>
</developer>
<developer>
<name>Baris ERGUN</name>
<email>barisergun75@gmail.com</email>
<name>Phillip Ross</name>
<email>phillip.w.g.ross at gmail.com</email>
<roles>
<role>Maintainer</role>
</roles>
</developer>
</developers>
<contributors>
Expand Down Expand Up @@ -76,19 +76,22 @@
</modules>

<scm>
<url>http://trac.osgeo.org/postgis/browser/trunk</url>
<connection>scm:svn:http://svn.osgeo.org/postgis/trunk</connection>
<developerConnection>scm:svn:http://svn.osgeo.org/postgis/trunk</developerConnection>
<url>https://github.com/postgis/postgis-java</url>
<connection>scm:git:git://github.com/postgis/postgis-java.git</connection>
<developerConnection>scm:git:git@github.com:postgis/postgis-java.git</developerConnection>
</scm>
<issueManagement>
<system>Trac</system>
<url>http://trac.osgeo.org/postgis/</url>
<system>GitHub Issues</system>
<url>https://github.com/postgis/postgis-java/issues</url>
</issueManagement>
<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>sonatype-postgis-releases</id>
<name>Sonatype Postgis Releases Repo</name>
<url>http://oss.sonatype.org/content/repositories/postgis-releases</url>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

Expand All @@ -103,13 +106,14 @@
<maven-clean-plugin.version>2.6.1</maven-clean-plugin.version>
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
<maven-dependency-plugin.version>2.10</maven-dependency-plugin.version>
<maven-ear-plugin.version>2.10</maven-ear-plugin.version>
<maven-ear-plugin.version>2.10.1</maven-ear-plugin.version>
<maven-enforcer-plugin.version>1.4</maven-enforcer-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
<maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
<maven-jar-plugin.version>2.6</maven-jar-plugin.version>
<maven-jarsigner-plugin.version>1.4</maven-jarsigner-plugin.version>
<maven-release-plugin.version>2.5.2</maven-release-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<maven-source-plugin.version>2.4</maven-source-plugin.version>
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
Expand Down Expand Up @@ -215,6 +219,11 @@
<artifactId>maven-jarsigner-plugin</artifactId>
<version>${maven-jarsigner-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>${maven-release-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions postgis-jdbc-java2d/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.postgis</groupId>
<groupId>net.postgis</groupId>
<artifactId>postgis-java-aggregator</artifactId>
<version>2.2.0-SNAPSHOT</version>
</parent>
Expand All @@ -27,7 +27,7 @@

<dependencies>
<dependency>
<groupId>org.postgis</groupId>
<groupId>net.postgis</groupId>
<artifactId>postgis-jdbc</artifactId>
<version>2.2.0-SNAPSHOT</version>
</dependency>
Expand Down