Merge pull request #60 from geoscript/GEOSCRIPT-JS-GT22

Upgrade to GeoTools 22

Author: jericks

README.md

@@ -1,3 +1,5 @@
+[![Current Status](https://secure.travis-ci.org/geoscript/geoscript-js.png?branch=master)](https://travis-ci.org/geoscript/geoscript-js)
+
 # geoscript.js
 
 ## GeoScript in JavaScript
@@ -8,13 +10,13 @@ Released under the MIT license.  Please see the license.txt for full detail.
 
 ### Download and Installation
 
-The latest release of GeoScript JS can be found on the [downloads page](http://geoscript.org/js/download.html).  To install, extract the zip archive somewhere onto your filesystem.  In the `bin` folder you'll find a `geoscript` executable.  Adding this `bin` folder to your path makes for easy launching of GeoScript from anywhere.
+The latest release of GeoScript JS can be found on the [downloads page](http://geoscript.net/js/download.html).  To install, extract the zip archive somewhere onto your filesystem.  In the `bin` folder you'll find a `geoscript` executable.  Adding this `bin` folder to your path makes for easy launching of GeoScript from anywhere.
 
 ### Running GeoScript JS
 
 Change into the directory where you extracted the GeoScript JS download.  From there, you can launch the GeoScript JS shell.
 
-    ./bin/geoscript
+    ./bin/geoscript-js
 
 Once running the shell, you can pull in GeoScript modules with `require`.
 
@@ -29,11 +31,11 @@ When you're done in the shell, exit with `quit()`.
 
 To run a script that uses the GeoScript JS modules, include the path to your script.
 
-    ./bin/geoscript yourscript.js
+    ./bin/geoscript-js yourscript.js
 
 ### Learning GeoScript JS
 
-See the [GeoScript JS website](http://geoscript.org/js/) for details on getting started using GeoScript JS.
+See the [GeoScript JS website](http://geoscript.net/js/) for details on getting started using GeoScript JS.
 
 ### Getting set up for development
 
@@ -55,4 +57,3 @@ Deploy both the stand-alone archive and a jar with just the GeoScript JS modules
 
     mvn deploy
 
-[![Current Status](https://secure.travis-ci.org/geoscript/geoscript-js.png?branch=master)](https://travis-ci.org/geoscript/geoscript-js)

bin/geoscript bin/geoscript-jsbin/geoscript renamed to bin/geoscript-js

@@ -19,4 +19,4 @@ else
     GEOSCRIPT_HOME=$(dirname -- "$(dirname -- "$SELF_PATH")")
 fi
 
-$GEOSCRIPT_HOME/bin/geoscript -j $GEOSCRIPT_HOME/target/jars -m $GEOSCRIPT_HOME/src/main/resources/org/geoscript/js/lib "$@"
+$GEOSCRIPT_HOME/bin/geoscript-js -j $GEOSCRIPT_HOME/target/jars -m $GEOSCRIPT_HOME/src/main/resources/org/geoscript/js/lib "$@"

bin/geoscript-dev bin/geoscript-js-devbin/geoscript-dev renamed to bin/geoscript-js-dev

@@ -22,7 +22,8 @@ Sample code to new circularstring:
     >> cs.linear.getGeometryType()
     LineString
     >> cs.curvedWkt
-    CIRCULARSTRING(6.12 10.0, 7.07 7.07, 10.0 0.0)
+    CIRCULARSTRING (6.12 10.0, 7.07 7.07, 10.0 0.0)
+
 
 
 Properties

bin/geoscript.cmd bin/geoscript-js.cmdbin/geoscript.cmd renamed to bin/geoscript-js.cmd

@@ -24,7 +24,7 @@ Sample code to new compoundcurve:
     >> cc.linear.getGeometryType()
     LineString
     >> cc.curvedWkt
-    COMPOUNDCURVE(CIRCULARSTRING(10.0 10.0, 0.0 20.0, -10.0 10.0), (-10.0 10.0, -10.0 0.0, 10.0 0.0, 5.0 5.0))
+    COMPOUNDCURVE (CIRCULARSTRING (10.0 10.0, 0.0 20.0, -10.0 10.0), (-10.0 10.0, -10.0 0.0, 10.0 0.0, 5.0 5.0))
 
 
 Properties

doc/api/geom/circularstring.rst

@@ -6,7 +6,7 @@
     <packaging>jar</packaging>
     <version>1.1.0-SNAPSHOT</version>
     <properties>
-        <gt.version>12.0</gt.version>
+        <gt.version>22.0</gt.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
@@ -36,11 +36,6 @@
     </repositories>
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>com.vividsolutions</groupId>
-                <artifactId>jts</artifactId>
-                <version>1.13</version>
-            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
@@ -53,13 +48,21 @@
         <dependency>
             <groupId>org.ringojs</groupId>
             <artifactId>ringojs</artifactId>
-            <version>1.1.0</version>
-            <scope>test</scope>
+            <version>1.2.1</version>
+            <systemPath>${basedir}/lib/ringo-core.jar</systemPath>
+            <scope>system</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ringojs</groupId>
+            <artifactId>ringojs-modules</artifactId>
+            <version>1.2.1</version>
+            <systemPath>${basedir}/lib/ringo-modules.jar</systemPath>
+            <scope>system</scope>
         </dependency>
         <dependency>
             <groupId>org.mozilla</groupId>
             <artifactId>rhino</artifactId>
-            <version>1.7R4</version>
+            <version>1.7.12</version>
         </dependency>
         <dependency>
             <groupId>jline</groupId>
@@ -123,11 +126,6 @@
             <artifactId>gt-jdbc-mysql</artifactId>
             <version>${gt.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.geotools.jdbc</groupId>
-            <artifactId>gt-jdbc-spatialite</artifactId>
-            <version>${gt.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.geotools</groupId>
             <artifactId>gt-property</artifactId>
@@ -156,8 +154,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                     <debug>true</debug>
                     <encoding>UTF-8</encoding>
                     <fork>true</fork>
@@ -224,10 +222,13 @@
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2-beta-2</version>
+                <version>3.3.0</version>
                 <configuration>
-                    <descriptor>src/main/assembly/all.xml</descriptor>
-                    <finalName>geoscript-js-shell-${project.version}</finalName>
+                    <descriptors>
+                        <descriptor>src/main/assembly/all.xml</descriptor>
+                    </descriptors>
+                    <finalName>geoscript-js-${project.version}</finalName>
+                    <appendAssemblyId>false</appendAssemblyId>
                 </configuration>
                 <executions>
                     <execution>
@@ -263,6 +264,45 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <shadedClassifierName>app</shadedClassifierName>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>META-INF/spring.handlers</resource>
+                                </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>META-INF/spring.schemas</resource>
+                                </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>org.geoscript.js.GeoScriptShell</mainClass>
+                                </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                            </transformers>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <extensions>
             <extension>

doc/api/geom/compoundcurve.rst

@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <assembly>
+    <id>dist</id>
     <formats>
+        <format>dir</format>
         <format>zip</format>
     </formats>
     <fileSets>
@@ -14,7 +16,7 @@
             <directory>bin</directory>
             <fileMode>0755</fileMode>
             <excludes>
-                <exclude>geoscript-dev</exclude>
+                <exclude>geoscript-js-dev</exclude>
             </excludes>
         </fileSet>
         <fileSet>