update to JsonPath 2.9.0, set version to 1.2.0-SNAPSHOT

wcm-io-caravan · Jan 25, 2024 · 32e2118 · 32e2118
1 parent 621c535
commit 32e2118
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/jsonpath/changes.xml b/jsonpath/changes.xml
@@ -23,6 +23,12 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="1.2.0" date="not released">
+      <action type="update" dev="sseifert">
+        Update to JSONPath 2.9.0.
+      </action>
+    </release>
+
     <release version="1.1.0" date="2021-10-26">
       <action type="update" dev="sseifert">
         Update to JSONPath 2.6.0.

diff --git a/jsonpath/pom.xml b/jsonpath/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>io.wcm.caravan</groupId>
   <artifactId>io.wcm.caravan.commons.jsonpath</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>Commons JsonPath</name>
@@ -102,11 +102,12 @@
               com.jayway.jsonpath.spi.*;version=${jsonpath.version}
             </_exportcontents>
             <Import-Package>
-              <!-- dependency versions from https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/2.6.0/json-path-2.6.0.pom -->
-              com.google.gson.*;version=2.8.6;resolution:=optional,
-              org.apache.tapestry5.*;version=5.7.2;resolution:=optional,
-              org.codehaus.jettison.*;version=1.4.1;resolution:=optional,
-              org.json.*;version=20140107;resolution:=optional,
+              <!-- exclude optional dependencies -->
+              com.google.gson.*;resolution:=optional,
+              org.apache.tapestry5.*;resolution:=optional,
+              org.codehaus.jettison.*;resolution:=optional,
+              org.json.*;resolution:=optional,
+              jakarta.json.*;resolution:=optional,
               *
             </Import-Package>
             <Bundle-Activator>io.wcm.caravan.commons.jsonpath.impl.BundleActivator</Bundle-Activator>
@@ -118,6 +119,10 @@
             <goals>
               <goal>baseline</goal>
             </goals>
+            <configuration>
+              <!-- Skip baseline check as JsonPath 2.6.0 -> 2.9.0 has incompatible API changes -->
+              <skip>true</skip>
+            </configuration>
           </execution>
         </executions>
       </plugin>