Skip to content

Commit 6ef45cf

Browse files
jericksjericks
authored
Merge pull request #60 from geoscript/GEOSCRIPT-JS-GT22
Upgrade to GeoTools 22
2 parents 74f385a + 48c8733 commit 6ef45cf

37 files changed

+234
-188
lines changed

‎README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[![Current Status](https://secure.travis-ci.org/geoscript/geoscript-js.png?branch=master)](https://travis-ci.org/geoscript/geoscript-js)
2+
13
# geoscript.js
24

35
## GeoScript in JavaScript
@@ -8,13 +10,13 @@ Released under the MIT license. Please see the license.txt for full detail.
810

911
### Download and Installation
1012

11-
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.
13+
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.
1214

1315
### Running GeoScript JS
1416

1517
Change into the directory where you extracted the GeoScript JS download. From there, you can launch the GeoScript JS shell.
1618

17-
./bin/geoscript
19+
./bin/geoscript-js
1820

1921
Once running the shell, you can pull in GeoScript modules with `require`.
2022

@@ -29,11 +31,11 @@ When you're done in the shell, exit with `quit()`.
2931

3032
To run a script that uses the GeoScript JS modules, include the path to your script.
3133

32-
./bin/geoscript yourscript.js
34+
./bin/geoscript-js yourscript.js
3335

3436
### Learning GeoScript JS
3537

36-
See the [GeoScript JS website](http://geoscript.org/js/) for details on getting started using GeoScript JS.
38+
See the [GeoScript JS website](http://geoscript.net/js/) for details on getting started using GeoScript JS.
3739

3840
### Getting set up for development
3941

@@ -55,4 +57,3 @@ Deploy both the stand-alone archive and a jar with just the GeoScript JS modules
5557

5658
mvn deploy
5759

58-
[![Current Status](https://secure.travis-ci.org/geoscript/geoscript-js.png?branch=master)](https://travis-ci.org/geoscript/geoscript-js)

‎bin/geoscript renamed to ‎bin/geoscript-js

File renamed without changes.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ else
1919
GEOSCRIPT_HOME=$(dirname -- "$(dirname -- "$SELF_PATH")")
2020
fi
2121

22-
$GEOSCRIPT_HOME/bin/geoscript -j $GEOSCRIPT_HOME/target/jars -m $GEOSCRIPT_HOME/src/main/resources/org/geoscript/js/lib "$@"
22+
$GEOSCRIPT_HOME/bin/geoscript-js -j $GEOSCRIPT_HOME/target/jars -m $GEOSCRIPT_HOME/src/main/resources/org/geoscript/js/lib "$@"

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

File renamed without changes.

‎doc/api/geom/circularstring.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ Sample code to new circularstring:
2222
>> cs.linear.getGeometryType()
2323
LineString
2424
>> cs.curvedWkt
25-
CIRCULARSTRING(6.12 10.0, 7.07 7.07, 10.0 0.0)
25+
CIRCULARSTRING (6.12 10.0, 7.07 7.07, 10.0 0.0)
26+
2627
2728
2829
Properties

‎doc/api/geom/compoundcurve.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Sample code to new compoundcurve:
2424
>> cc.linear.getGeometryType()
2525
LineString
2626
>> cc.curvedWkt
27-
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))
27+
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))
2828
2929
3030
Properties

‎lib/ringo-core.jar

197 KB
Binary file not shown.

‎lib/ringo-modules.jar

135 KB
Binary file not shown.

‎pom.xml

Lines changed: 59 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<packaging>jar</packaging>
77
<version>1.1.0-SNAPSHOT</version>
88
<properties>
9-
<gt.version>12.0</gt.version>
9+
<gt.version>22.0</gt.version>
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1111
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1212
</properties>
@@ -36,11 +36,6 @@
3636
</repositories>
3737
<dependencyManagement>
3838
<dependencies>
39-
<dependency>
40-
<groupId>com.vividsolutions</groupId>
41-
<artifactId>jts</artifactId>
42-
<version>1.13</version>
43-
</dependency>
4439
<dependency>
4540
<groupId>junit</groupId>
4641
<artifactId>junit</artifactId>
@@ -53,13 +48,21 @@
5348
<dependency>
5449
<groupId>org.ringojs</groupId>
5550
<artifactId>ringojs</artifactId>
56-
<version>1.1.0</version>
57-
<scope>test</scope>
51+
<version>1.2.1</version>
52+
<systemPath>${basedir}/lib/ringo-core.jar</systemPath>
53+
<scope>system</scope>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.ringojs</groupId>
57+
<artifactId>ringojs-modules</artifactId>
58+
<version>1.2.1</version>
59+
<systemPath>${basedir}/lib/ringo-modules.jar</systemPath>
60+
<scope>system</scope>
5861
</dependency>
5962
<dependency>
6063
<groupId>org.mozilla</groupId>
6164
<artifactId>rhino</artifactId>
62-
<version>1.7R4</version>
65+
<version>1.7.12</version>
6366
</dependency>
6467
<dependency>
6568
<groupId>jline</groupId>
@@ -123,11 +126,6 @@
123126
<artifactId>gt-jdbc-mysql</artifactId>
124127
<version>${gt.version}</version>
125128
</dependency>
126-
<dependency>
127-
<groupId>org.geotools.jdbc</groupId>
128-
<artifactId>gt-jdbc-spatialite</artifactId>
129-
<version>${gt.version}</version>
130-
</dependency>
131129
<dependency>
132130
<groupId>org.geotools</groupId>
133131
<artifactId>gt-property</artifactId>
@@ -156,8 +154,8 @@
156154
<artifactId>maven-compiler-plugin</artifactId>
157155
<version>2.3</version>
158156
<configuration>
159-
<source>1.7</source>
160-
<target>1.7</target>
157+
<source>1.8</source>
158+
<target>1.8</target>
161159
<debug>true</debug>
162160
<encoding>UTF-8</encoding>
163161
<fork>true</fork>
@@ -224,10 +222,13 @@
224222
</plugin>
225223
<plugin>
226224
<artifactId>maven-assembly-plugin</artifactId>
227-
<version>2.2-beta-2</version>
225+
<version>3.3.0</version>
228226
<configuration>
229-
<descriptor>src/main/assembly/all.xml</descriptor>
230-
<finalName>geoscript-js-shell-${project.version}</finalName>
227+
<descriptors>
228+
<descriptor>src/main/assembly/all.xml</descriptor>
229+
</descriptors>
230+
<finalName>geoscript-js-${project.version}</finalName>
231+
<appendAssemblyId>false</appendAssemblyId>
231232
</configuration>
232233
<executions>
233234
<execution>
@@ -263,6 +264,45 @@
263264
</execution>
264265
</executions>
265266
</plugin>
267+
<plugin>
268+
<groupId>org.apache.maven.plugins</groupId>
269+
<artifactId>maven-shade-plugin</artifactId>
270+
<version>3.2.1</version>
271+
<executions>
272+
<execution>
273+
<phase>package</phase>
274+
<goals>
275+
<goal>shade</goal>
276+
</goals>
277+
<configuration>
278+
<shadedArtifactAttached>true</shadedArtifactAttached>
279+
<shadedClassifierName>app</shadedClassifierName>
280+
<transformers>
281+
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
282+
<resource>META-INF/spring.handlers</resource>
283+
</transformer>
284+
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
285+
<resource>META-INF/spring.schemas</resource>
286+
</transformer>
287+
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
288+
<mainClass>org.geoscript.js.GeoScriptShell</mainClass>
289+
</transformer>
290+
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
291+
</transformers>
292+
<filters>
293+
<filter>
294+
<artifact>*:*</artifact>
295+
<excludes>
296+
<exclude>META-INF/*.SF</exclude>
297+
<exclude>META-INF/*.DSA</exclude>
298+
<exclude>META-INF/*.RSA</exclude>
299+
</excludes>
300+
</filter>
301+
</filters>
302+
</configuration>
303+
</execution>
304+
</executions>
305+
</plugin>
266306
</plugins>
267307
<extensions>
268308
<extension>

‎src/main/assembly/all.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?xml version="1.0"?>
22
<assembly>
3+
<id>dist</id>
34
<formats>
5+
<format>dir</format>
46
<format>zip</format>
57
</formats>
68
<fileSets>
@@ -14,7 +16,7 @@
1416
<directory>bin</directory>
1517
<fileMode>0755</fileMode>
1618
<excludes>
17-
<exclude>geoscript-dev</exclude>
19+
<exclude>geoscript-js-dev</exclude>
1820
</excludes>
1921
</fileSet>
2022
<fileSet>

0 commit comments

Comments
 (0)