update dependencies,

allow build on SE 18 Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
eclipse-ee4j · Mar 25, 2022 · 81ebad8 · 81ebad8
1 parent b039f7d
commit 81ebad8
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 24 deletions.
diff --git a/istack-commons/import-properties-plugin/src/test/script/setproxy.groovy b/istack-commons/import-properties-plugin/src/test/script/setproxy.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -16,10 +16,15 @@ if (settings?.proxies) {
     settings?.proxies?.each { proxy ->
         if (proxy.active) {
             if ("http".equals(proxy.protocol)) {
-                itproxy =  "-Dhttp.proxyHost=" + proxy.host
+                itproxy +=  " -Dhttp.proxyHost=" + proxy.host
                 if (proxy.port) {
                     itproxy += " -Dhttp.proxyPort=" + proxy.port
                 }
+            } else if ("https".equals(proxy.protocol)) {
+                itproxy +=  " -Dhttps.proxyHost=" + proxy.host
+                if (proxy.port) {
+                    itproxy += " -Dhttps.proxyPort=" + proxy.port
+                }
             }
             def p = new Node(proxies, "proxy")
             new Node(p, "protocol", proxy.protocol)
@@ -35,14 +40,14 @@ if (settings?.proxies) {
 }
 
 if (itproxy.trim().length() > 0) {
-    log.info("Setting: " + itproxy)
+    log.info("Setting: " + itproxy.trim())
 } else {
     log.info("No proxy found")
 }
 
 def writer = new FileWriter(new File(project.build.directory, "it-settings.xml"))
-XmlNodePrinter printer = new XmlNodePrinter(new PrintWriter(writer))
+groovy.xml.XmlNodePrinter printer = new groovy.xml.XmlNodePrinter(new PrintWriter(writer))
 printer.setPreserveWhitespace(true);
 printer.print(itsettings)
 
-project.getModel().addProperty("ittest-proxy", itproxy)
+project.getModel().addProperty("ittest-proxy", itproxy.trim())
diff --git a/istack-commons/maven-plugin/src/test/script/setproxy.groovy b/istack-commons/maven-plugin/src/test/script/setproxy.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -16,10 +16,15 @@ if (settings?.proxies) {
     settings?.proxies?.each { proxy ->
         if (proxy.active) {
             if ("http".equals(proxy.protocol)) {
-                itproxy =  "-Dhttp.proxyHost=" + proxy.host
+                itproxy +=  " -Dhttp.proxyHost=" + proxy.host
                 if (proxy.port) {
                     itproxy += " -Dhttp.proxyPort=" + proxy.port
                 }
+            } else if ("https".equals(proxy.protocol)) {
+                itproxy +=  " -Dhttps.proxyHost=" + proxy.host
+                if (proxy.port) {
+                    itproxy += " -Dhttps.proxyPort=" + proxy.port
+                }
             }
             def p = new Node(proxies, "proxy")
             new Node(p, "protocol", proxy.protocol)
@@ -35,14 +40,14 @@ if (settings?.proxies) {
 }
 
 if (itproxy.trim().length() > 0) {
-    log.info("Setting: " + itproxy)
+    log.info("Setting: " + itproxy.trim())
 } else {
     log.info("No proxy found")
 }
 
 def writer = new FileWriter(new File(project.build.directory, "it-settings.xml"))
-XmlNodePrinter printer = new XmlNodePrinter(new PrintWriter(writer))
+groovy.xml.XmlNodePrinter printer = new groovy.xml.XmlNodePrinter(new PrintWriter(writer))
 printer.setPreserveWhitespace(true);
 printer.print(itsettings)
 
-project.getModel().addProperty("ittest-proxy", itproxy)
+project.getModel().addProperty("ittest-proxy", itproxy.trim())
diff --git a/istack-commons/pom.xml b/istack-commons/pom.xml
@@ -77,21 +77,21 @@
         <spotbugs.exclude>${config.dir}/spotbugs-exclude.xml</spotbugs.exclude>
         <spotbugs.skip>false</spotbugs.skip>
         <spotbugs.threshold>Low</spotbugs.threshold>
-        <spotbugs.version>4.5.3.0</spotbugs.version>
+        <spotbugs.version>4.6.0.0</spotbugs.version>
 
         <activation.version>2.1.0</activation.version>
-        <maven.api.version>3.8.4</maven.api.version>
+        <maven.api.version>3.8.5</maven.api.version>
         <maven.resolver.version>1.7.3</maven.resolver.version>
         <junit.version>4.13.2</junit.version>
         <ant.version>1.10.12</ant.version>
         <codemodel.version>4.0.0-M4</codemodel.version>
-        <plexus-utils.version>3.3.0</plexus-utils.version>
+        <plexus-utils.version>3.4.1</plexus-utils.version>
         <maven-plugin-annotations.version>3.6.4</maven-plugin-annotations.version>
-        <testng.version>7.4.0</testng.version>
+        <testng.version>7.5</testng.version>
         <args4j.version>2.33</args4j.version>
 
         <maven.compiler.release>11</maven.compiler.release>
-        <maven.compiler.testRelease>11</maven.compiler.testRelease>
+        <maven.compiler.testRelease>${maven.compiler.release}</maven.compiler.testRelease>
         <vendor.name>Eclipse Foundation</vendor.name>
     </properties>
 
@@ -256,7 +256,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.9.0</version>
+                    <version>3.10.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -295,7 +295,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.3.1</version>
+                    <version>3.3.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -310,22 +310,22 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.gmaven</groupId>
                     <artifactId>gmaven-plugin</artifactId>
                     <version>1.5</version>
                     <dependencies>
                         <dependency>
-                            <groupId>org.codehaus.groovy</groupId>
+                            <groupId>org.apache.groovy</groupId>
                             <artifactId>groovy</artifactId>
-                            <version>3.0.8</version>
+                            <version>4.0.1</version>
                         </dependency>
                         <dependency>
-                            <groupId>org.codehaus.groovy</groupId>
+                            <groupId>org.apache.groovy</groupId>
                             <artifactId>groovy-xml</artifactId>
-                            <version>3.0.8</version>
+                            <version>4.0.1</version>
                         </dependency>
                     </dependencies>
                 </plugin>

diff --git a/istack-commons/soimp/src/main/java/com/sun/istack/soimp/Proc.java b/istack-commons/soimp/src/main/java/com/sun/istack/soimp/Proc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -20,7 +20,7 @@ public final class Proc {
     private final Thread t1,t2;
 
     public Proc(String cmd,String[] env,OutputStream out, File workDir) throws IOException {
-        this( Runtime.getRuntime().exec(cmd,env,workDir), null, out );
+        this( Runtime.getRuntime().exec(new String [] {cmd},env,workDir), null, out );
     }
 
     public Proc(String[] cmd,String[] env,OutputStream out, File workDir) throws IOException {