From 3c6e0b1dd23c53746ac4a6e774370e9b9f80bb1c Mon Sep 17 00:00:00 2001
From: Corentin Le Molgat <corentinl@google.com>
Date: Mon, 9 Sep 2024 11:36:25 +0200
Subject: [PATCH] java: Bump deps

* remove pom.xml.in dead code
---
 ortools/java/pom-full.xml.in   |   6 +-
 ortools/java/pom-local.xml.in  |   6 +-
 ortools/java/pom-native.xml.in |   6 +-
 ortools/java/pom-sample.xml.in |   8 +-
 ortools/java/pom-test.xml.in   |  20 ++--
 ortools/java/pom.xml.in        | 167 ---------------------------------
 6 files changed, 25 insertions(+), 188 deletions(-)
 delete mode 100644 ortools/java/pom.xml.in

diff --git a/ortools/java/pom-full.xml.in b/ortools/java/pom-full.xml.in
index f77dfa46d54..dc58678ca58 100644
--- a/ortools/java/pom-full.xml.in
+++ b/ortools/java/pom-full.xml.in
@@ -118,7 +118,7 @@
     <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-source-plugin</artifactId>
-      <version>3.2.0</version>
+      <version>3.3.1</version>
       <executions>
         <execution>
           <id>attach-sources</id>
@@ -131,7 +131,7 @@
     <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-javadoc-plugin</artifactId>
-      <version>3.2.0</version>
+      <version>3.8.0</version>
       <configuration>
         <detectJavaApiLink>false</detectJavaApiLink>
         <source>${maven.compiler.source}</source>
@@ -150,7 +150,7 @@
     <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-gpg-plugin</artifactId>
-      <version>1.6</version>
+      <version>3.2.5</version>
       <executions>
         <execution>
           <id>sign-artifacts</id>
diff --git a/ortools/java/pom-local.xml.in b/ortools/java/pom-local.xml.in
index 5cf680afba1..5129ac592f6 100644
--- a/ortools/java/pom-local.xml.in
+++ b/ortools/java/pom-local.xml.in
@@ -90,7 +90,7 @@
     <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-source-plugin</artifactId>
-      <version>3.2.0</version>
+      <version>3.3.1</version>
       <executions>
         <execution>
           <id>attach-sources</id>
@@ -103,7 +103,7 @@
     <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-javadoc-plugin</artifactId>
-      <version>3.2.0</version>
+      <version>3.8.0</version>
       <configuration>
         <detectJavaApiLink>false</detectJavaApiLink>
         <source>${maven.compiler.source}</source>
@@ -122,7 +122,7 @@
     <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-gpg-plugin</artifactId>
-      <version>1.6</version>
+      <version>3.2.5</version>
       <executions>
         <execution>
           <id>sign-artifacts</id>
diff --git a/ortools/java/pom-native.xml.in b/ortools/java/pom-native.xml.in
index 29ba460145e..ef7fb72eb8d 100644
--- a/ortools/java/pom-native.xml.in
+++ b/ortools/java/pom-native.xml.in
@@ -70,7 +70,7 @@
     <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-source-plugin</artifactId>
-      <version>3.2.0</version>
+      <version>3.3.1</version>
       <configuration>
         <excludes>
           <exclude>**/*.cxx</exclude>
@@ -88,7 +88,7 @@
     <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-javadoc-plugin</artifactId>
-      <version>3.2.0</version>
+      <version>3.8.0</version>
       <configuration>
         <detectJavaApiLink>false</detectJavaApiLink>
         <source>${maven.compiler.source}</source>
@@ -107,7 +107,7 @@
     <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-gpg-plugin</artifactId>
-      <version>1.6</version>
+      <version>3.2.5</version>
       <executions>
         <execution>
           <id>sign-artifacts</id>
diff --git a/ortools/java/pom-sample.xml.in b/ortools/java/pom-sample.xml.in
index cfaaa272e89..4640c57f536 100644
--- a/ortools/java/pom-sample.xml.in
+++ b/ortools/java/pom-sample.xml.in
@@ -77,7 +77,7 @@
   <dependency>
     <groupId>com.google.guava</groupId>
     <artifactId>guava</artifactId>
-    <version>30.1.1-jre</version>
+    <version>33.3.0-jre</version>
   </dependency>
 </dependencies>
 
@@ -86,7 +86,7 @@
     <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-source-plugin</artifactId>
-      <version>3.2.0</version>
+      <version>3.3.1</version>
       <executions>
         <execution>
           <id>attach-sources</id>
@@ -99,7 +99,7 @@
     <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-javadoc-plugin</artifactId>
-      <version>3.2.0</version>
+      <version>3.8.0</version>
       <configuration>
         <detectJavaApiLink>false</detectJavaApiLink>
         <source>${maven.compiler.source}</source>
@@ -118,7 +118,7 @@
     <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-gpg-plugin</artifactId>
-      <version>1.6</version>
+      <version>3.2.5</version>
       <executions>
         <execution>
           <id>sign-artifacts</id>
diff --git a/ortools/java/pom-test.xml.in b/ortools/java/pom-test.xml.in
index 0737b1e5d79..fe81bd6b6da 100644
--- a/ortools/java/pom-test.xml.in
+++ b/ortools/java/pom-test.xml.in
@@ -76,24 +76,24 @@
   <dependency>
     <groupId>org.junit.jupiter</groupId>
     <artifactId>junit-jupiter-engine</artifactId>
-    <version>5.7.0</version>
+    <version>5.11.0</version>
     <scope>test</scope>
   </dependency>
   <dependency>
     <groupId>com.google.truth</groupId>
     <artifactId>truth</artifactId>
-    <version>1.1.3</version>
+    <version>1.4.4</version>
     <scope>test</scope>
   </dependency>
   <dependency>
     <groupId>com.google.guava</groupId>
     <artifactId>guava</artifactId>
-    <version>30.1.1-jre</version>
+    <version>33.3.0-jre</version>
   </dependency>
   <dependency>
     <groupId>com.google.auto.value</groupId>
     <artifactId>auto-value</artifactId>
-    <version>1.8.2</version>
+    <version>1.11.0</version>
     <scope>provided</scope>
   </dependency>
 </dependencies>
@@ -102,12 +102,16 @@
   <plugins>
     <plugin>
       <artifactId>maven-surefire-plugin</artifactId>
-      <version>2.22.2</version>
+      <version>3.5.0</version>
+      <configuration>
+        <!-- Activate the use of TCP to transmit events to the plugin -->
+        <forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
+      </configuration>
     </plugin>
     <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-source-plugin</artifactId>
-      <version>3.2.0</version>
+      <version>3.3.1</version>
       <executions>
         <execution>
           <id>attach-sources</id>
@@ -120,7 +124,7 @@
     <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-javadoc-plugin</artifactId>
-      <version>3.2.0</version>
+      <version>3.8.0</version>
       <configuration>
         <detectJavaApiLink>false</detectJavaApiLink>
         <source>${maven.compiler.source}</source>
@@ -139,7 +143,7 @@
     <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-gpg-plugin</artifactId>
-      <version>1.6</version>
+      <version>3.2.5</version>
       <executions>
         <execution>
           <id>sign-artifacts</id>
diff --git a/ortools/java/pom.xml.in b/ortools/java/pom.xml.in
deleted file mode 100644
index 4c3795d8935..00000000000
--- a/ortools/java/pom.xml.in
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-<modelVersion>4.0.0</modelVersion>
-
-<groupId>@JAVA_PACKAGE@</groupId>
-<artifactId>@JAVA_PROJECT@</artifactId>
-<version>@PROJECT_VERSION@</version>
-<packaging>jar</packaging>
-
-<name>${project.groupId}:${project.artifactId}</name>
-<description>Google OR-Tools Java project.</description>
-<url>https://github.com/google/or-tools</url>
-
-<licenses>
-  <license>
-    <name>The Apache License, Version 2.0</name>
-    <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-  </license>
-</licenses>
-
-<developers>
-  <developer>
-    <name>Corentin "Mizux" Le Molgat</name>
-    <email>corentinl@google.com</email>
-    <organization>Google LLC</organization>
-    <organizationUrl>http://www.google.com</organizationUrl>
-  </developer>
-  <developer>
-    <name>Laurent Perron</name>
-    <email>lperron@google.com</email>
-    <organization>Google LLC</organization>
-    <organizationUrl>http://www.google.com</organizationUrl>
-  </developer>
-</developers>
-
-<scm>
-  <connection>scm:git:git://github.com/google/or-tools.git</connection>
-  <developerConnection>scm:git:ssh://github.com:google/or-tools.git</developerConnection>
-  <url>http://github.com/google/or-tools/tree/main</url>
-  <tag>HEAD</tag>
-</scm>
-
-<issueManagement>
-  <system>GitHub Issues</system>
-  <url>http://github.com/google/or-tools/issues</url>
-</issueManagement>
-
-<distributionManagement>
-  <snapshotRepository>
-    <id>ossrh</id>
-    <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-  </snapshotRepository>
-  <repository>
-    <id>ossrh</id>
-    <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-  </repository>
-</distributionManagement>
-
-<properties>
-  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  <maven.compiler.source>1.8</maven.compiler.source>
-  <maven.compiler.target>1.8</maven.compiler.target>
-</properties>
-
-<dependencies>
-  <dependency>
-    <groupId>com.google.protobuf</groupId>
-    <artifactId>protobuf-java</artifactId>
-    <version>4.27.3</version>
-  </dependency>
-  <dependency>
-    <groupId>junit</groupId>
-    <artifactId>junit</artifactId>
-    <version>4.11</version>
-    <scope>test</scope>
-  </dependency>
-</dependencies>
-
-<build>
-  <plugins>
-    <plugin>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-source-plugin</artifactId>
-      <version>3.2.0</version>
-      <executions>
-        <execution>
-          <id>attach-sources</id>
-          <goals>
-            <goal>jar-no-fork</goal>
-          </goals>
-        </execution>
-      </executions>
-    </plugin>
-    <plugin>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-javadoc-plugin</artifactId>
-      <version>3.2.0</version>
-      <configuration>
-        <detectJavaApiLink>false</detectJavaApiLink>
-        <source>${maven.compiler.source}</source>
-        <target>${maven.compiler.target}</target>
-        <additionalJOption>-Xdoclint:none</additionalJOption>
-      </configuration>
-      <executions>
-        <execution>
-          <id>attach-javadocs</id>
-          <goals>
-            <goal>jar</goal>
-          </goals>
-        </execution>
-      </executions>
-    </plugin>
-    <plugin>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-gpg-plugin</artifactId>
-      <version>1.6</version>
-      <executions>
-        <execution>
-          <id>sign-artifacts</id>
-          <phase>verify</phase>
-          <goals>
-            <goal>sign</goal>
-          </goals>
-        </execution>
-      </executions>
-    </plugin>
-  </plugins>
-</build>
-
-<profiles>
-  <profile>
-    <id>build-fat-jar</id>
-    <activation>
-      <property>
-        <name>fatjar</name>
-        <value>true</value>
-      </property>
-    </activation>
-    <build>
-      <plugins>
-        <plugin>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <configuration>
-            <descriptorRefs>
-              <descriptorRef>jar-with-dependencies</descriptorRef>
-            </descriptorRefs>
-            <appendAssemblyId>false</appendAssemblyId>
-          </configuration>
-          <executions>
-            <execution>
-              <id>make-assembly</id> <!-- this is used for inheritance merges -->
-              <phase>package</phase> <!-- bind to the packaging phase -->
-              <goals>
-                <goal>single</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-      </plugins>
-    </build>
-  </profile>
-</profiles>
-
-</project>