--add-modules java.xml.bind

sillelien · Sep 17, 2017 · 82e1dfe · 82e1dfe
1 parent 0a2ba5e
commit 82e1dfe
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 149 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,8 +5,8 @@ defaults: &defaults
     - image: redis:3-alpine
 
   environment:
-    MAJOR_VERSION: 0.3
-    NEXT_MAJOR_VERSION: 0.4
+    MAJOR_VERSION: 0.4
+    NEXT_MAJOR_VERSION: 0.5
     MAVEN_OPTS: "-Xmx1g -DbuildNumber=${CIRCLE_BUILD_NUM}"
     TZ: "/usr/share/zoneinfo/Europe/London"
 

diff --git a/README.tmpl.md b/README.tmpl.md
@@ -33,11 +33,11 @@ Find out your local air quality:
 
 ```dollar
 //First we get the Geo Location of our IP address
-Value geo= read http://freegeoip.net/json/
-Value lat= geo.latitude
-Value lon= geo.longitude
+var geo= read http://freegeoip.net/json/
+var lat= geo.latitude
+var lon= geo.longitude
 
-Value quality= read ("https://api.openaq.org/v1/measurements?radius=10000&limit=5&coordinates="+ lat + "," + lon) as URI;
+var quality= read ("https://api.openaq.org/v1/measurements?radius=10000&limit=5&coordinates="+ lat + "," + lon) as URI;
 
 //Now output the quality from each result
 quality.results each {

diff --git a/dollar-core/pom.xml b/dollar-core/pom.xml
@@ -130,8 +130,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.jayway.restassured</groupId>
+            <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
+            <version>3.0.3</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>

diff --git a/dollar-core/src/test/java/dollar/DollarHttpTest.java b/dollar-core/src/test/java/dollar/DollarHttpTest.java
@@ -16,9 +16,10 @@
 
 package dollar;
 
-import com.jayway.restassured.RestAssured;
+
 import dollar.api.DollarStatic;
 import dollar.api.Value;
+import io.restassured.RestAssured;
 import org.junit.jupiter.api.BeforeAll;
 
 import java.util.Date;

diff --git a/dollar-docs/src/main/resources/pages/manual.md b/dollar-docs/src/main/resources/pages/manual.md
@@ -782,7 +782,7 @@ Hopefully you'll find Dollar a useful and productive language, but there will be
 
 var variableA="Hello World"
 
-var java = java `out=scope.get(VarKey.of("variableA"));`
+var java = java `out=in.get(0);` (variableA)
 
 java <=> "Hello World"
 

diff --git a/dollar-examples/pom.xml b/dollar-examples/pom.xml
@@ -39,7 +39,7 @@
         </dependency>
 
         <dependency>
-            <groupId>com.jayway.restassured</groupId>
+            <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
         </dependency>
         <dependency>

diff --git a/dollar-examples/src/test/java/dollar/DollarSerializationTest.java b/dollar-examples/src/test/java/dollar/DollarSerializationTest.java
@@ -16,10 +16,10 @@
 
 package dollar;
 
-import com.jayway.restassured.RestAssured;
 import dollar.api.Type;
 import dollar.api.Value;
 import dollar.api.types.DollarFactory;
+import io.restassured.RestAssured;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 

diff --git a/dollar-plugins/dollar-java-plugin/pom.xml b/dollar-plugins/dollar-java-plugin/pom.xml
@@ -39,10 +39,7 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.sillelien</groupId>
-            <artifactId>java-as-script</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>

diff --git a/dollar-plugins/dollar-java-plugin/src/main/java/dollar/java/JavaScriptingLanguage.java b/dollar-plugins/dollar-java-plugin/src/main/java/dollar/java/JavaScriptingLanguage.java
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.sillelien</groupId>
         <artifactId>dollar-parent</artifactId>
-        <version>0.3.119</version>
+        <version>0.3.127</version>
     </parent>
 
     <artifactId>dollar</artifactId>