Skip to content

Commit

Permalink
Declare all GeoTools dependencies in the root pom's dependency manage…
Browse files Browse the repository at this point in the history
…ment section

* Centralize the declaration of geotools dependencies to the root pom's
  dependencyManagement and remove `<version>${gt.version}</version>` in
  module poms for consistency.

* Exclude `xml-apis` and apache `fop` in the root pom dependency management section
  Of especial interes for the `gt-app-schema` module not to carry over the
  unnecessary (sice Java 1.6) `xml-apis` jar, whose presence also makes the
  eclipse IDE complain there are multiple sources for classes
  in the `javax.xml.namespace`, `org.w3c.dom`, and other packages.

commit 397981a4e9dc310219270f82b2e560f6d3de4127
Author: Gabriel Roldan <[email protected]>
Date:   Tue Aug 6 12:05:38 2024 -0300
  • Loading branch information
groldan committed Nov 4, 2024
1 parent 9e0f31b commit 95852c2
Show file tree
Hide file tree
Showing 84 changed files with 209 additions and 216 deletions.
4 changes: 0 additions & 4 deletions src/community/app-schema/webservice-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,10 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-webservice</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-webservice</artifactId>
<version>${gt.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Expand All @@ -62,7 +60,6 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-jdbc</artifactId>
<version>${gt.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand All @@ -73,7 +70,6 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-app-schema</artifactId>
<version>${gt.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Expand Down
1 change: 0 additions & 1 deletion src/community/backup-restore/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
<dependency>
<groupId>org.geotools.jdbc</groupId>
<artifactId>gt-jdbc-h2</artifactId>
<version>${gt.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 0 additions & 2 deletions src/community/cog/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-geotiff</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geoserver.web</groupId>
Expand All @@ -57,7 +56,6 @@
<dependency>
<groupId>org.geotools.jdbc</groupId>
<artifactId>gt-jdbc-h2</artifactId>
<version>${gt.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion src/community/datadir-catalog-loader/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
<dependency>
<groupId>org.geotools.jdbc</groupId>
<artifactId>gt-jdbc-postgis</artifactId>
<version>${gt.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion src/community/dds/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-sample-data</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geoserver</groupId>
Expand Down
1 change: 0 additions & 1 deletion src/community/elasticsearch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-elasticsearch</artifactId>
<version>${gt.version}</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-main</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geoserver</groupId>
Expand All @@ -57,26 +56,22 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-sample-data</artifactId>
<version>${gt.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-jdbc</artifactId>
<version>${gt.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-jdbc</artifactId>
<version>${gt.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.geotools.jdbc</groupId>
<artifactId>gt-jdbc-postgis</artifactId>
<version>${gt.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
11 changes: 0 additions & 11 deletions src/community/features-templating/features-templating-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,14 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-main</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-complex</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-geojson-core</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>com.github.jsonld-java</groupId>
Expand All @@ -53,17 +50,14 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-app-schema</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-http</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-referencing</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geoserver</groupId>
Expand All @@ -88,33 +82,28 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-app-schema</artifactId>
<version>${gt.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-sample-data</artifactId>
<version>${gt.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-jdbc</artifactId>
<version>${gt.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-jdbc</artifactId>
<version>${gt.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.geotools.jdbc</groupId>
<artifactId>gt-jdbc-postgis</artifactId>
<version>${gt.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,11 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-app-schema</artifactId>
<version>${gt.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-app-schema</artifactId>
<version>${gt.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Expand All @@ -95,26 +93,22 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-sample-data</artifactId>
<version>${gt.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-jdbc</artifactId>
<version>${gt.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-jdbc</artifactId>
<version>${gt.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.geotools.jdbc</groupId>
<artifactId>gt-jdbc-postgis</artifactId>
<version>${gt.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-app-schema</artifactId>
<version>${gt.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -91,33 +90,28 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-app-schema</artifactId>
<version>${gt.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-sample-data</artifactId>
<version>${gt.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-jdbc</artifactId>
<version>${gt.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-jdbc</artifactId>
<version>${gt.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.geotools.jdbc</groupId>
<artifactId>gt-jdbc-postgis</artifactId>
<version>${gt.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-http</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geoserver</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-http</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geoserver</groupId>
Expand Down
1 change: 0 additions & 1 deletion src/community/flatgeobuf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-flatgeobuf</artifactId>
<version>${gt.version}</version>
</dependency>
</dependencies>
</project>
4 changes: 0 additions & 4 deletions src/community/geopkg/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,14 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-process</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-geopkg</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-render</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geoserver.extension</groupId>
Expand Down Expand Up @@ -96,7 +93,6 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-sample-data</artifactId>
<version>${gt.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion src/community/graticule/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-graticule</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
Expand Down
2 changes: 0 additions & 2 deletions src/community/gsr/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-main</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
Expand Down Expand Up @@ -91,7 +90,6 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-main</artifactId>
<version>${gt.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Expand Down
2 changes: 0 additions & 2 deletions src/community/importer-jdbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-transform</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geoserver.importer</groupId>
Expand Down Expand Up @@ -65,7 +64,6 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-sample-data</artifactId>
<version>${gt.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion src/community/mbtiles-store/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-mbtiles</artifactId>
<version>${gt.version}</version>
</dependency>
</dependencies>

Expand Down
3 changes: 0 additions & 3 deletions src/community/mbtiles/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,10 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-mbtiles</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-render</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geoserver.extension</groupId>
Expand Down Expand Up @@ -81,7 +79,6 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-sample-data</artifactId>
<version>${gt.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 0 additions & 2 deletions src/community/ncwms/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-brewer</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geoserver.community</groupId>
Expand Down Expand Up @@ -72,7 +71,6 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-iau-wkt</artifactId>
<version>${gt.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Loading

0 comments on commit 95852c2

Please sign in to comment.