Merge branch '3.x' into master-3.x

eclipse-tahu · Jan 14, 2025 · 66e6735 · 66e6735
2 parents e5ef519 + 9693a61
commit 66e6735
Show file tree

Hide file tree

Showing 15 changed files with 120 additions and 0 deletions.
diff --git a/java/compat_impl/edge/pom.xml b/java/compat_impl/edge/pom.xml
@@ -57,6 +57,14 @@
         <configuration>
           <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
         </configuration>
+        <!-- https://stackoverflow.com/questions/70153962/nexus-staging-maven-plugin-maven-deploy-failed-an-api-incompatibility-was-enco -->
+        <dependencies>
+          <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.15</version> <!-- apparently this needs to be exactly this version -->
+          </dependency>
+        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

diff --git a/java/compat_impl/host/pom.xml b/java/compat_impl/host/pom.xml
@@ -47,6 +47,14 @@
         <configuration>
           <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
         </configuration>
+        <!-- https://stackoverflow.com/questions/70153962/nexus-staging-maven-plugin-maven-deploy-failed-an-api-incompatibility-was-enco -->
+        <dependencies>
+          <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.15</version> <!-- apparently this needs to be exactly this version -->
+          </dependency>
+        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

diff --git a/java/examples/device_timestamp/pom.xml b/java/examples/device_timestamp/pom.xml
@@ -41,6 +41,14 @@
         <configuration>
           <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
         </configuration>
+        <!-- https://stackoverflow.com/questions/70153962/nexus-staging-maven-plugin-maven-deploy-failed-an-api-incompatibility-was-enco -->
+        <dependencies>
+          <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.15</version> <!-- apparently this needs to be exactly this version -->
+          </dependency>
+        </dependencies>
       </plugin>
 
       <!-- New Build mechanism - replaces maven-assembly-plugin -->

diff --git a/java/examples/edge_node_control/pom.xml b/java/examples/edge_node_control/pom.xml
@@ -42,6 +42,14 @@
         <configuration>
           <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
         </configuration>
+        <!-- https://stackoverflow.com/questions/70153962/nexus-staging-maven-plugin-maven-deploy-failed-an-api-incompatibility-was-enco -->
+        <dependencies>
+          <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.15</version> <!-- apparently this needs to be exactly this version -->
+          </dependency>
+        </dependencies>
       </plugin>
 
       <!-- New Build mechanism - replaces maven-assembly-plugin -->

diff --git a/java/examples/host_file/pom.xml b/java/examples/host_file/pom.xml
@@ -46,6 +46,14 @@
         <configuration>
           <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
         </configuration>
+        <!-- https://stackoverflow.com/questions/70153962/nexus-staging-maven-plugin-maven-deploy-failed-an-api-incompatibility-was-enco -->
+        <dependencies>
+          <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.15</version> <!-- apparently this needs to be exactly this version -->
+          </dependency>
+        </dependencies>
       </plugin>
 
       <!-- New Build mechanism - replaces maven-assembly-plugin -->

diff --git a/java/examples/listener/pom.xml b/java/examples/listener/pom.xml
@@ -42,6 +42,14 @@
         <configuration>
           <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
         </configuration>
+        <!-- https://stackoverflow.com/questions/70153962/nexus-staging-maven-plugin-maven-deploy-failed-an-api-incompatibility-was-enco -->
+        <dependencies>
+          <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.15</version> <!-- apparently this needs to be exactly this version -->
+          </dependency>
+        </dependencies>
       </plugin>
 
       <!-- New Build mechanism - replaces maven-assembly-plugin -->

diff --git a/java/examples/pom.xml b/java/examples/pom.xml
@@ -241,6 +241,14 @@
           <autoReleaseAfterClose>true</autoReleaseAfterClose>
           <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
         </configuration>
+        <!-- https://stackoverflow.com/questions/70153962/nexus-staging-maven-plugin-maven-deploy-failed-an-api-incompatibility-was-enco -->
+        <dependencies>
+          <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.15</version> <!-- apparently this needs to be exactly this version -->
+          </dependency>
+        </dependencies>
       </plugin>
     </plugins>
     <extensions>

diff --git a/java/examples/raspberry_pi/pom.xml b/java/examples/raspberry_pi/pom.xml
@@ -58,6 +58,14 @@
         <configuration>
           <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
         </configuration>
+        <!-- https://stackoverflow.com/questions/70153962/nexus-staging-maven-plugin-maven-deploy-failed-an-api-incompatibility-was-enco -->
+        <dependencies>
+          <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.15</version> <!-- apparently this needs to be exactly this version -->
+          </dependency>
+        </dependencies>
       </plugin>
 
       <!-- New Build mechanism - replaces maven-assembly-plugin -->

diff --git a/java/examples/records/pom.xml b/java/examples/records/pom.xml
@@ -41,6 +41,14 @@
         <configuration>
           <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
         </configuration>
+        <!-- https://stackoverflow.com/questions/70153962/nexus-staging-maven-plugin-maven-deploy-failed-an-api-incompatibility-was-enco -->
+        <dependencies>
+          <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.15</version> <!-- apparently this needs to be exactly this version -->
+          </dependency>
+        </dependencies>
       </plugin>
 
       <!-- New Build mechanism - replaces maven-assembly-plugin -->

diff --git a/java/examples/simple/pom.xml b/java/examples/simple/pom.xml
@@ -41,6 +41,14 @@
         <configuration>
           <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
         </configuration>
+        <!-- https://stackoverflow.com/questions/70153962/nexus-staging-maven-plugin-maven-deploy-failed-an-api-incompatibility-was-enco -->
+        <dependencies>
+          <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.15</version> <!-- apparently this needs to be exactly this version -->
+          </dependency>
+        </dependencies>
       </plugin>
 
       <!-- New Build mechanism - replaces maven-assembly-plugin -->

diff --git a/java/examples/udt/pom.xml b/java/examples/udt/pom.xml
@@ -41,6 +41,14 @@
         <configuration>
           <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
         </configuration>
+        <!-- https://stackoverflow.com/questions/70153962/nexus-staging-maven-plugin-maven-deploy-failed-an-api-incompatibility-was-enco -->
+        <dependencies>
+          <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.15</version> <!-- apparently this needs to be exactly this version -->
+          </dependency>
+        </dependencies>
       </plugin>
 
       <!-- New Build mechanism - replaces maven-assembly-plugin -->

diff --git a/java/lib/core/pom.xml b/java/lib/core/pom.xml
@@ -47,6 +47,14 @@
         <configuration>
           <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
         </configuration>
+        <!-- https://stackoverflow.com/questions/70153962/nexus-staging-maven-plugin-maven-deploy-failed-an-api-incompatibility-was-enco -->
+        <dependencies>
+          <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.15</version> <!-- apparently this needs to be exactly this version -->
+          </dependency>
+        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

diff --git a/java/lib/edge/pom.xml b/java/lib/edge/pom.xml
@@ -42,6 +42,14 @@
         <configuration>
           <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
         </configuration>
+        <!-- https://stackoverflow.com/questions/70153962/nexus-staging-maven-plugin-maven-deploy-failed-an-api-incompatibility-was-enco -->
+        <dependencies>
+          <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.15</version> <!-- apparently this needs to be exactly this version -->
+          </dependency>
+        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

diff --git a/java/lib/host/pom.xml b/java/lib/host/pom.xml
@@ -42,6 +42,14 @@
         <configuration>
           <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
         </configuration>
+        <!-- https://stackoverflow.com/questions/70153962/nexus-staging-maven-plugin-maven-deploy-failed-an-api-incompatibility-was-enco -->
+        <dependencies>
+          <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.15</version> <!-- apparently this needs to be exactly this version -->
+          </dependency>
+        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

diff --git a/java/pom.xml b/java/pom.xml
@@ -243,6 +243,14 @@
           <autoReleaseAfterClose>true</autoReleaseAfterClose>
           <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
         </configuration>
+        <!-- https://stackoverflow.com/questions/70153962/nexus-staging-maven-plugin-maven-deploy-failed-an-api-incompatibility-was-enco -->
+        <dependencies>
+          <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.15</version> <!-- apparently this needs to be exactly this version -->
+          </dependency>
+        </dependencies>
       </plugin>
     </plugins>
     <extensions>