Commit 2cfcc0c4 authored by Torben Barsballe's avatar Torben Barsballe
Browse files

[GEOS-9082] Update community script plugins for Java 11 compatibility

- Update script-py and script-groovy to latest geoscript releases
- Re-enable script-py assembly
- Update classes and dependencies for geotools 21 restructure
parent 88177f9b
......@@ -210,7 +210,7 @@
<module>dds</module>
<!-- <module>spatialite</module> -->
<module>jdbcconfig</module>
<!--module>script</module-->
<module>script</module>
<module>wms-eo</module>
<module>colormap</module>
<module>mbtiles</module>
......
......@@ -33,12 +33,13 @@
<artifactId>gs-wps-download</artifactId>
<version>${project.version}</version>
</dependency>
<!--
<dependency>
<groupId>org.geoserver.script</groupId>
<artifactId>gs-script-py</artifactId>
<version>${project.version}</version>
</dependency>
<!--
<dependency>
<groupId>org.geoserver.script</groupId>
<artifactId>gs-script-js</artifactId>
......
......@@ -24,7 +24,22 @@
<dependency>
<groupId>org.geoscript</groupId>
<artifactId>geoscript-groovy</artifactId>
<version>1.11-SNAPSHOT</version>
<version>1.13-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-jsr223</artifactId>
<version>2.5.5</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-ant</artifactId>
<version>2.5.5</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-groovydoc</artifactId>
<version>2.5.5</version>
</dependency>
<dependency>
<!-- this dependency taken from geoscript-groovy pom but upgraded to 1.0.9 -->
......
......@@ -53,6 +53,11 @@
<artifactId>gt-process</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-metadata</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geoserver</groupId>
<artifactId>gs-main</artifactId>
......@@ -123,7 +128,7 @@
<profile>
<id>script-groovy</id>
<activation>
<activeByDefault>true</activeByDefault>
<activeByDefault>false</activeByDefault>
</activation>
<modules>
<module>groovy</module>
......@@ -141,7 +146,7 @@
<profile>
<id>script-js</id>
<activation>
<activeByDefault>true</activeByDefault>
<activeByDefault>false</activeByDefault>
</activation>
<modules>
<module>js</module>
......@@ -150,7 +155,7 @@
<profile>
<id>script-rb</id>
<activation>
<activeByDefault>true</activeByDefault>
<activeByDefault>false</activeByDefault>
</activation>
<modules>
<module>rb</module>
......
......@@ -45,7 +45,7 @@
<dependency>
<groupId>org.geoscript</groupId>
<artifactId>geoscript-py</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.geoserver.script</groupId>
......
......@@ -10,8 +10,8 @@ import org.geoserver.script.wps.ScriptProcessFactory;
import org.geoserver.script.wps.ScriptProcessTestSupport;
import org.geoserver.wps.WPSException;
import org.geotools.data.Parameter;
import org.geotools.data.util.DefaultProgressListener;
import org.geotools.process.ProcessException;
import org.geotools.util.DefaultProgressListener;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.io.WKTReader;
import org.opengis.feature.type.Name;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment