Merge pull request #327 from eiiches/feature/20240207-update-dependen…

…cies build: update dependencies
eiiches · Feb 6, 2024 · 363b709 · 363b709
2 parents 74c68b7 + 798b4c7
commit 363b709
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 32 deletions.
diff --git a/jackson-jq-cli/pom.xml b/jackson-jq-cli/pom.xml
@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>commons-cli</groupId>
 			<artifactId>commons-cli</artifactId>
-			<version>1.5.0</version>
+			<version>1.6.0</version>
 		</dependency>
 	</dependencies>
 

diff --git a/jackson-jq/pom.xml b/jackson-jq/pom.xml
@@ -15,12 +15,12 @@
 		<dependency>
 			<groupId>org.jruby.joni</groupId>
 			<artifactId>joni</artifactId>
-			<version>2.1.48</version>
+			<version>2.2.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>31.1-jre</version>
+			<version>33.0.0-jre</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/jackson-jq/src/main/java/net/thisptr/jackson/jq/internal/functions/_MatchImplFunction.java b/jackson-jq/src/main/java/net/thisptr/jackson/jq/internal/functions/_MatchImplFunction.java
@@ -98,12 +98,12 @@ private static JsonNode match(final ObjectMapper mapper, final OnigUtils.Pattern
 				// 2. for zero-width match, we do not include captures
 				final Region regions = m.getRegion();
 				if (regions != null && m.getEnd() != m.getBegin()) {
-					for (int i = 1; i < regions.numRegs; ++i) {
+					for (int i = 1; i < regions.getNumRegs(); ++i) {
 						final CaptureObject capture = new CaptureObject();
-						if (regions.beg[i] >= 0) {
-							capture.offset = cindex[regions.beg[i]];
-							capture.length = cindex[regions.end[i]] - cindex[regions.beg[i]];
-							capture.string = new String(ibytes, regions.beg[i], regions.end[i] - regions.beg[i], StandardCharsets.UTF_8);
+						if (regions.getBeg(i) >= 0) {
+							capture.offset = cindex[regions.getBeg(i)];
+							capture.length = cindex[regions.getEnd(i)] - cindex[regions.getBeg(i)];
+							capture.string = new String(ibytes, regions.getBeg(i), regions.getEnd(i) - regions.getBeg(i), StandardCharsets.UTF_8);
 						} else {
 							capture.offset = -1;
 							capture.length = 0;

diff --git a/jackson-jq/src/main/java/net/thisptr/jackson/jq/internal/functions/_SubImplFunction.java b/jackson-jq/src/main/java/net/thisptr/jackson/jq/internal/functions/_SubImplFunction.java
@@ -93,12 +93,12 @@ private static List<JsonNode> match(final ObjectMapper mapper, final OnigUtils.P
 			final ObjectNode captures = mapper.createObjectNode();
 			final Region regions = m.getRegion();
 			if (regions != null) {
-				for (int i = 1; i < regions.numRegs; ++i) {
+				for (int i = 1; i < regions.getNumRegs(); ++i) {
 					final String name = pattern.names[i];
 					if (name == null)
 						continue;
-					if (regions.beg[i] >= 0) {
-						final String value = new String(inputBytes, regions.beg[i], regions.end[i] - regions.beg[i], StandardCharsets.UTF_8);
+					if (regions.getBeg(i) >= 0) {
+						final String value = new String(inputBytes, regions.getBeg(i), regions.getEnd(i) - regions.getBeg(i), StandardCharsets.UTF_8);
 						captures.set(name, TextNode.valueOf(value));
 					} else {
 						captures.set(name, NullNode.getInstance());

diff --git a/pom.xml b/pom.xml
@@ -46,9 +46,9 @@
 
 	<properties>
 		<org.slf4j-version>1.7.36</org.slf4j-version>
-		<com.fasterxml.jackson-version>2.14.2</com.fasterxml.jackson-version>
-		<com.fasterxml.jackson.databind-version>2.14.2</com.fasterxml.jackson.databind-version>
-		<com.google.auto.service-version>1.0.1</com.google.auto.service-version>
+		<com.fasterxml.jackson-version>2.16.1</com.fasterxml.jackson-version>
+		<com.fasterxml.jackson.databind-version>2.16.1</com.fasterxml.jackson.databind-version>
+		<com.google.auto.service-version>1.1.1</com.google.auto.service-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
@@ -61,25 +61,25 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<version>5.9.2</version>
+			<version>5.10.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-params</artifactId>
-			<version>5.9.2</version>
+			<version>5.10.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-			<version>5.9.2</version>
+			<version>5.10.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-			<version>3.24.2</version>
+			<version>3.25.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -190,37 +190,37 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.0.0</version>
+					<version>3.2.5</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.4.0</version>
+					<version>3.6.3</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-source-plugin</artifactId>
-					<version>3.2.1</version>
+					<version>3.3.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>3.1.0</version>
+					<version>3.4.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.felix</groupId>
 					<artifactId>maven-bundle-plugin</artifactId>
-					<version>5.1.8</version>
+					<version>5.1.9</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-release-plugin</artifactId>
-					<version>2.5.3</version>
+					<version>3.0.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.10.1</version>
+					<version>3.12.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -230,27 +230,27 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-install-plugin</artifactId>
-					<version>3.1.0</version>
+					<version>3.1.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-clean-plugin</artifactId>
-					<version>3.2.0</version>
+					<version>3.3.2</version>
 				</plugin>
 				<plugin>
 					<groupId>org.jacoco</groupId>
 					<artifactId>jacoco-maven-plugin</artifactId>
-					<version>0.8.8</version>
+					<version>0.8.11</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-shade-plugin</artifactId>
-					<version>3.3.0</version>
+					<version>3.5.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-site-plugin</artifactId>
-					<version>3.12.0</version>
+					<version>4.0.0-M13</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -270,7 +270,7 @@
 						<dependency>
 							<groupId>net.java.dev.javacc</groupId>
 							<artifactId>javacc</artifactId>
-							<version>7.0.12</version>
+							<version>7.0.13</version>
 						</dependency>
 					</dependencies>
 				</plugin>
@@ -282,7 +282,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-gpg-plugin</artifactId>
-					<version>3.0.1</version>
+					<version>3.1.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.jboss.jandex</groupId>