#2626 removing properties from version tag also removing explicit plugin declarations...

git-svn-id: http://svn.osgeo.org/postgis/trunk@12291 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/java/jdbc/pom.xml b/java/jdbc/pom.xml
index 4507d8c9fd26a944cf6bdfc58b2e36c93fb34735..0b2e87156df946007ea6e8a7e13850b1527faf5e 100644 (file)
--- a/java/jdbc/pom.xml
+++ b/java/jdbc/pom.xml
@@ -1,182 +1,126 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-       <modelVersion>4.0.0</modelVersion>
-
-       <groupId>org.postgis</groupId>
-       <artifactId>postgis-jdbc</artifactId>
-       <version>${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}</version>
-       <packaging>jar</packaging>
-
-       <name>Postgis JDBC Driver</name>
-       <url>http://www.postgis.org</url>
-       <description>PostGIS adds support for geographic objects to the PostgreSQL object-relational database.</description>
-
-       <licenses>
-               <license>
-                       <name>GNU Lesser General Public License</name>
-                       <url>http://www.gnu.org/licenses/lgpl-2.1.txt</url>
-                       <distribution>repo</distribution>
-               </license>
-       </licenses>
-
-       <developers>
-               <developer>
-                       <name>Postgis Development Team</name>
-               </developer>
-               <developer>
-                       <name>María Arias de Reyna</name>
-                       <email>delawen en gmail.com</email>
-               </developer>
-       </developers>
-       <contributors>
-               <contributor>
-                       <name>Hakan Tandogan</name>
-                       <email>hakan@gurkensalat.com</email>
-                       <url>http://www.gurkensalat.com/</url>
-                       <roles>
-                               <role>Maven Packager</role>
-                       </roles>
-               </contributor>
-       </contributors>
-       <mailingLists>
-               <mailingList>
-                       <name>User List</name>
-                       <subscribe>postgis-users-subscribe@lists.osgeo.org</subscribe>
-                       <unsubscribe>postgis-users-unsubscribe@lists.osgeo.org</unsubscribe>
-                       <post>postgis-users@lists.osgeo.org</post>
-                       <archive>http://lists.osgeo.org/pipermail/postgis-users/</archive>
-               </mailingList>
-               <mailingList>
-                       <name>Developer List</name>
-                       <subscribe>postgis-devel-subscribe@lists.osgeo.org</subscribe>
-                       <unsubscribe>postgis-devel-unsubscribe@lists.osgeo.org</unsubscribe>
-                       <post>postgis-devel@lists.osgeo.org</post>
-                       <archive>http://lists.osgeo.org/pipermail/postgis-devel/</archive>
-               </mailingList>
-       </mailingLists>
-       <issueManagement>
-               <system>Trac</system>
-               <url>http://trac.osgeo.org/postgis/</url>
-       </issueManagement>
-       <scm>
-               <url>http://trac.osgeo.org/postgis/browser/tags/2.0.0</url>
-               <connection>scm:svn:http://svn.osgeo.org/postgis/tags/2.0.0/</connection>
-               <developerConnection>scm:svn:http://svn.osgeo.org/postgis/tags/2.0.0/</developerConnection>
-       </scm>
-
-       <build>
+    <modelVersion>4.0.0</modelVersion>
+       
+    <parent>
+        <groupId>org.sonatype.oss</groupId>
+        <artifactId>oss-parent</artifactId>
+        <version>7</version>
+    </parent>
 
-               <sourceDirectory>${basedir}/src</sourceDirectory>
-               <!-- For the driverconfig property file -->
-               <resources>
-                       <resource>
-                               <directory>src</directory>
-                               <filtering>true</filtering>
-                               <includes>
-                                       <include>**/*.properties</include>
-                               </includes>
-                               <excludes>
-                                       <exclude>**/*.java</exclude>
-                               </excludes>
-                       </resource>
-               </resources>
+    <groupId>org.postgis</groupId>
+    <artifactId>postgis-jdbc</artifactId>
+    <version>2.1.0SVN</version>
+    <packaging>jar</packaging>
+    <name>Postgis JDBC Driver</name>
+    <url>http://www.postgis.org</url>
+    <description>PostGIS adds support for geographic objects to the PostgreSQL object-relational database.</description>
 
-               <plugins><!--
+    <licenses>
+        <license>
+            <name>GNU Lesser General Public License</name>
+            <url>http://www.gnu.org/licenses/lgpl-2.1.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
 
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>attach-sources</id>
-                                               <phase>verify</phase>
-                                               <goals>
-                                                       <goal>jar</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin><plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-javadoc-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>attach-javadocs</id>
-                                               <phase>verify</phase>
-                                               <goals>
-                                                       <goal>jar</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin>
+    <developers>
+        <developer>
+            <name>Postgis Development Team</name>
+        </developer>
+        <developer>
+            <name>María Arias de Reyna</name>
+            <email>delawen en gmail.com</email>
+        </developer>
+    </developers>
+    <contributors>
+        <contributor>
+            <name>Hakan Tandogan</name>
+            <email>hakan@gurkensalat.com</email>
+            <url>http://www.gurkensalat.com/</url>
+            <roles>
+                <role>Maven Packager</role>
+            </roles>
+        </contributor>
+        <contributor>
+            <name>Baris Ergun</name>
+            <email>barisergun75@gmail.com</email>
+            <url>http://www.barisergun.com/</url>
+            <roles>
+                <role>Maven Packager</role>
+            </roles>
+        </contributor>
+    </contributors>
+    <mailingLists>
+        <mailingList>
+            <name>User List</name>
+            <subscribe>postgis-users-subscribe@lists.osgeo.org</subscribe>
+            <unsubscribe>postgis-users-unsubscribe@lists.osgeo.org</unsubscribe>
+            <post>postgis-users@lists.osgeo.org</post>
+            <archive>http://lists.osgeo.org/pipermail/postgis-users/</archive>
+        </mailingList>
+        <mailingList>
+            <name>Developer List</name>
+            <subscribe>postgis-devel-subscribe@lists.osgeo.org</subscribe>
+            <unsubscribe>postgis-devel-unsubscribe@lists.osgeo.org</unsubscribe>
+            <post>postgis-devel@lists.osgeo.org</post>
+            <archive>http://lists.osgeo.org/pipermail/postgis-devel/</archive>
+        </mailingList>
+    </mailingLists>
+    <issueManagement>
+        <system>Trac</system>
+        <url>http://trac.osgeo.org/postgis/</url>
+    </issueManagement>
+    <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>
+    </scm>
 
-                       -->
-               </plugins>
+    <build>
 
-       </build>
+        <sourceDirectory>${basedir}/src</sourceDirectory>
+        <!-- For the driverconfig property file -->
+        <resources>
+            <resource>
+                <directory>src</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/*.properties</include>
+                </includes>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+            </resource>
+        </resources>
 
-       <dependencies>
-               <dependency>
-                       <groupId>postgresql</groupId>
-                       <artifactId>postgresql</artifactId>
-                       <version>9.1-901.jdbc3</version>
-               </dependency>
-       </dependencies>
-       <reporting>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-javadoc-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-project-info-reports-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-surefire-report-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>findbugs-maven-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>javancss-maven-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>jdepend-maven-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>jxr-maven-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>taglist-maven-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>versions-maven-plugin</artifactId>
-                       </plugin>
-               </plugins>
-       </reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9.1</version>
+                <configuration>
+                    <overview>${basedir}/src/java/org/postgis/overview.html</overview>
+                </configuration>
+            </plugin>
+        </plugins>
 
+    </build>
 
-       <distributionManagement>
-               <repository>
-                       <id>sonatype-postgis-releases</id>
-                       <name>Sonatype Postgis Releases Repo</name>
-                       <url>http://oss.sonatype.org/content/repositories/postgis-releases</url>
-               </repository>
-       </distributionManagement>
-       
+    <dependencies>
+        <dependency>
+            <groupId>postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>9.1-901.jdbc3</version>
+        </dependency>
+    </dependencies>
        
-  <properties>
-    <POSTGIS_MAJOR_VERSION>2</POSTGIS_MAJOR_VERSION>
-    <POSTGIS_MINOR_VERSION>1</POSTGIS_MINOR_VERSION>
-    <POSTGIS_MICRO_VERSION>0SVN</POSTGIS_MICRO_VERSION>
-  </properties>
+    <distributionManagement>
+        <repository>
+            <id>sonatype-postgis-releases</id>
+            <name>Sonatype Postgis Releases Repo</name>
+            <url>http://oss.sonatype.org/content/repositories/postgis-releases</url>
+        </repository>
+    </distributionManagement>
        
 </project>

diff --git a/java/jdbc/src/org/postgis/overview.html b/java/jdbc/src/org/postgis/overview.html
new file mode 100644 (file)
index 0000000..726a4b9
--- /dev/null
+++ b/java/jdbc/src/org/postgis/overview.html
@@ -0,0 +1,15 @@
+<BODY>
+    <P>
+        The JDBC extensions provide Java objects corresponding to the internal PostGIS types. These objects can be used to write Java clients which query the PostGIS database and draw or do calculations on the GIS data in PostGIS.
+    </P>
+    <ul>
+        <li>Enter the java/jdbc sub-directory of the PostGIS distribution.</li>
+        <li>Run the mvn clean install command. postgis.jar file will be deployed on your local maven repository</li>
+    </ul>
+    <P>
+        The JDBC extensions require a PostgreSQL JDBC driver to be present in the current CLASSPATH during the build process.
+    </P>
+    <P>
+        PostgreSQL JDBC drivers can be downloaded from http://jdbc.postgresql.org or Sonatype Central Maven repository.
+    </P>
+</BODY>