From 5946c865f4465d2f5ba2cfcc033181b963c8af79 Mon Sep 17 00:00:00 2001
From: wnm3 <wnm3@us.ibm.com>
Date: Fri, 24 May 2024 09:59:47 -0400
Subject: [PATCH] IBM/JSONata4Java#309

---
 .classpath   | 17 +++++++++++++++++
 README.md    |  9 ++++++---
 pom.xml      | 10 +++++-----
 tester.sh    |  2 +-
 testerui.cmd |  2 +-
 testerui.sh  |  2 +-
 6 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/.classpath b/.classpath
index f2e3c82..8e1936a 100644
--- a/.classpath
+++ b/.classpath
@@ -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>
diff --git a/README.md b/README.md
index 0735609..0423276 100644
--- a/README.md
+++ b/README.md
@@ -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>
 ```
 
@@ -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 
@@ -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.
 
diff --git a/pom.xml b/pom.xml
index ce04651..3ae3438 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
diff --git a/tester.sh b/tester.sh
index 5f7d8ee..d192ca0 100755
--- a/tester.sh
+++ b/tester.sh
@@ -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
diff --git a/testerui.cmd b/testerui.cmd
index d90f151..fe2a45b 100644
--- a/testerui.cmd
+++ b/testerui.cmd
@@ -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
diff --git a/testerui.sh b/testerui.sh
index 7858210..792d2c7 100755
--- a/testerui.sh
+++ b/testerui.sh
@@ -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