Skip to content

Commit 2f5afd4

Browse files
committed
Upgrade geotools and other dependencies
1 parent caf79ab commit 2f5afd4

File tree

3 files changed

+33
-28
lines changed

3 files changed

+33
-28
lines changed

Diff for: pom.xml

+30-25
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@
3939
<dependency>
4040
<groupId>org.geotools</groupId>
4141
<artifactId>gt-main</artifactId>
42-
<version>13.6</version>
42+
<version>24.0</version>
4343
</dependency>
4444
<dependency>
4545
<groupId>org.geotools</groupId>
4646
<artifactId>gt-epsg-hsql</artifactId>
47-
<version>13.6</version>
47+
<version>24.0</version>
4848
</dependency>
4949
<dependency>
5050
<groupId>junit</groupId>
@@ -61,51 +61,56 @@
6161
</dependencies>
6262
<repositories>
6363
<repository>
64-
<id>springsource-ext-release</id>
65-
<url>http://repo.springsource.org/simple/ext-release-local/</url>
66-
</repository>
67-
<repository>
68-
<id>geosolutions</id>
69-
<url>http://maven.geo-solutions.it/</url>
64+
<id>osgeo-releases</id>
65+
<name>OSGeo Nexus Release Repository</name>
66+
<url>https://repo.osgeo.org/repository/release/</url>
67+
<snapshots>
68+
<enabled>false</enabled>
69+
</snapshots>
70+
<releases>
71+
<enabled>true</enabled>
72+
</releases>
7073
</repository>
7174
<repository>
72-
<id>boundless</id>
73-
<name>Boundless Maven Repository</name>
74-
<url>http://repo.boundlessgeo.org/main</url>
75+
<id>osgeo-snapshots</id>
76+
<name>OSGeo Nexus Snapshot Repository</name>
77+
<url>https://repo.osgeo.org/repository/snapshot/</url>
7578
<snapshots>
7679
<enabled>true</enabled>
7780
</snapshots>
81+
<releases>
82+
<enabled>false</enabled>
83+
</releases>
7884
</repository>
85+
<!-- <repository>-->
86+
<!-- <id>springsource-ext-release</id>-->
87+
<!-- <url>http://repo.springsource.org/simple/ext-release-local/</url>-->
88+
<!-- </repository>-->
7989
<repository>
80-
<id>osgeo</id>
81-
<name>Open Source Geospatial Foundation Repository</name>
82-
<url>http://download.osgeo.org/webdav/geotools</url>
83-
</repository>
84-
<repository>
85-
<id>maven2-repository.dev.java.net</id>
86-
<name>Java.net repository</name>
87-
<url>http://download.java.net/maven/2</url>
90+
<id>geosolutions</id>
91+
<url>http://maven.geo-solutions.it/</url>
8892
</repository>
8993
</repositories>
9094
<build>
9195
<plugins>
9296
<plugin>
9397
<groupId>org.apache.maven.plugins</groupId>
9498
<artifactId>maven-compiler-plugin</artifactId>
99+
<version>3.8.0</version>
95100
<configuration>
96-
<source>1.6</source>
97-
<target>1.6</target>
101+
<source>1.8</source>
102+
<target>1.8</target>
98103
</configuration>
99104
</plugin>
100105
<plugin>
101106
<groupId>org.codehaus.mojo</groupId>
102107
<artifactId>cobertura-maven-plugin</artifactId>
103-
<version>2.6</version>
108+
<version>2.7</version>
104109
</plugin>
105110
<plugin>
106111
<groupId>org.apache.maven.plugins</groupId>
107112
<artifactId>maven-jar-plugin</artifactId>
108-
<version>2.3.1</version>
113+
<version>3.2.0</version>
109114
<configuration>
110115
<archive>
111116
<manifest>
@@ -117,7 +122,7 @@
117122
</plugin>
118123
<plugin>
119124
<artifactId>maven-assembly-plugin</artifactId>
120-
<version>2.2.2</version>
125+
<version>3.3.0</version>
121126
<configuration>
122127
<descriptors>
123128
<descriptor>src/main/assembly/dir.xml</descriptor>
@@ -137,7 +142,7 @@
137142
<plugin>
138143
<groupId>org.apache.maven.plugins</groupId>
139144
<artifactId>maven-shade-plugin</artifactId>
140-
<version>1.7.1</version>
145+
<version>3.2.4</version>
141146
<executions>
142147
<execution>
143148
<phase>package</phase>

Diff for: src/test/java/org/geoserver/shell/FeatureTypeCommandsTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public void getFeatureType() throws Exception {
158158
" numDecimals: 0" + OsUtils.LINE_SEPARATOR +
159159
" Attributes: " + OsUtils.LINE_SEPARATOR +
160160
" the_geom" + OsUtils.LINE_SEPARATOR +
161-
" Binding: com.vividsolutions.jts.geom.MultiPoint" + OsUtils.LINE_SEPARATOR +
161+
" Binding: org.locationtech.jts.geom.MultiPoint" + OsUtils.LINE_SEPARATOR +
162162
" Min Occurs: 0" + OsUtils.LINE_SEPARATOR +
163163
" Max Occurs: 1" + OsUtils.LINE_SEPARATOR +
164164
" Nillable: true" + OsUtils.LINE_SEPARATOR +
@@ -252,7 +252,7 @@ public void createFeatureType() throws Exception {
252252
assertTrue(result);
253253
String actual = server.getCalls().get(0).getPostBody();
254254
String expected = "<featureType><name>taz_soils</name><attributes><attribute><name>the_geom</name>" +
255-
"<binding>com.vividsolutions.jts.geom.LineString</binding></attribute><attribute>" +
255+
"<binding>org.locationtech.jts.geom.LineString</binding></attribute><attribute>" +
256256
"<name>name</name><binding>java.lang.String</binding></attribute><attribute>" +
257257
"<name>id</name><binding>java.lang.Integer</binding></attribute></attributes>" +
258258
"<srs>EPSG:4326</srs><title>Soils</title><description>Soil Survey Polygons</description>" +

Diff for: src/test/resources/featuretype.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<minOccurs>0</minOccurs>
5555
<maxOccurs>1</maxOccurs>
5656
<nillable>true</nillable>
57-
<binding>com.vividsolutions.jts.geom.MultiPoint</binding>
57+
<binding>org.locationtech.jts.geom.MultiPoint</binding>
5858
</attribute>
5959
<attribute>
6060
<name>CITY_NAME</name>

0 commit comments

Comments
 (0)