Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
wnm3 committed May 24, 2024
1 parent 3006650 commit 5946c86
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 11 deletions.
17 changes: 17 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,22 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The easiest way to use this library is to include it as a dependency in your Mav
<dependency>
<groupId>com.ibm.jsonata4java</groupId>
<artifactId>JSONata4Java</artifactId>
<version>2.4.9</version>
<version>2.5.0</version>
</dependency>
```

Expand Down Expand Up @@ -53,8 +53,8 @@ Note: to build and deploy the jars to Maven Central you need to use a command li
`mvn clean install deploy -Prelease`

Once you have run the launcher, you can find the jar files in the /target directory. There are two&colon;
* **JSONata4Java-2.4.9-jar-with-dependencies.jar** (thinks includes dependent jar files)
* **JSONata4Java-2.4.9.jar** (only the JSONata4Java code)
* **JSONata4Java-2.5.0-jar-with-dependencies.jar** (thinks includes dependent jar files)
* **JSONata4Java-2.5.0.jar** (only the JSONata4Java code)

The com.api.jsonata4java.Tester program enables you to enter an expression and run it
against the same JSON as is used at the https://try.jsonata.org site. You can also
Expand All @@ -72,6 +72,9 @@ methods are not thread-safe.

Issue 260 to add support for timeoutMS and maxDepth to the evaluate methods in Expression.

### New Feature for Version 2.5.0 ###
Fixed signature checking to allow for functions (see Issue #307)

### New Feature for Version 2.4.9 ###
The $number function was updated to allow strings with 0x, 0o, 0b prefixes for hexadecimal, octal, and binary conversions. The value returned can handle long values.

Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.ibm.jsonata4java</groupId>
<artifactId>JSONata4Java</artifactId>
<version>2.4.9</version>
<version>2.5.0</version>
<name>JSONata4Java</name>
<description>Port of jsonata.js to Java to enable rules for JSON content</description>
<url>https://github.com/IBM/JSONata4Java</url>
Expand Down Expand Up @@ -95,7 +95,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>5.3.34</version>
<version>5.3.36</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -106,7 +106,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.17.0</version>
<version>2.17.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.woodstox/woodstox-core -->
<dependency>
Expand All @@ -117,7 +117,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>2.17.0</version>
<version>2.17.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-text -->
<dependency>
Expand All @@ -129,7 +129,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
<version>2.11.0</version>
</dependency>
</dependencies>
<build>
Expand Down
2 changes: 1 addition & 1 deletion tester.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#! /bin/bash
java -cp target/JSONata4Java-2.4.9-jar-with-dependencies.jar com.api.jsonata4java.Tester $1
java -cp target/JSONata4Java-2.5.0-jar-with-dependencies.jar com.api.jsonata4java.Tester $1
2 changes: 1 addition & 1 deletion testerui.cmd
Original file line number Diff line number Diff line change
@@ -1 +1 @@
java -cp target/JSONata4Java-2.4.9-jar-with-dependencies.jar com.api.jsonata4java.testerui.TesterUI
java -cp target/JSONata4Java-2.5.0-jar-with-dependencies.jar com.api.jsonata4java.testerui.TesterUI
2 changes: 1 addition & 1 deletion testerui.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#! /bin/bash
java -cp target/JSONata4Java-2.4.9-jar-with-dependencies.jar com.api.jsonata4java.testerui.TesterUI
java -cp target/JSONata4Java-2.5.0-jar-with-dependencies.jar com.api.jsonata4java.testerui.TesterUI

0 comments on commit 5946c86

Please sign in to comment.