Set default source level to 11, update maven plugins to use 17 when n…

…eeed, do not use unavailable toList method in OSSLCodesigner. (#365)
eclipse-cbi · Nov 6, 2023 · fd067e4 · fd067e4
1 parent 87ce4bb
commit fd067e4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -13,7 +13,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.compiler.release>17</maven.compiler.release>
+    <maven.compiler.release>11</maven.compiler.release>
 
     <auto-value.version>1.10.4</auto-value.version>
   </properties>

diff --git a/maven-plugins/eclipse-cbi-plugin/pom.xml b/maven-plugins/eclipse-cbi-plugin/pom.xml
@@ -25,6 +25,10 @@
     <relativePath>../pom.xml</relativePath>
   </parent>
 
+  <properties>
+    <maven.compiler.release>17</maven.compiler.release>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>

diff --git a/maven-plugins/eclipse-jarsigner-plugin/pom.xml b/maven-plugins/eclipse-jarsigner-plugin/pom.xml
@@ -24,6 +24,10 @@
     <relativePath>../pom.xml</relativePath>
   </parent>
 
+  <properties>
+    <maven.compiler.release>17</maven.compiler.release>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>

diff --git a/...ning/windows/src/main/java/org/eclipse/cbi/webservice/signing/windows/OSSLCodesigner.java b/...ning/windows/src/main/java/org/eclipse/cbi/webservice/signing/windows/OSSLCodesigner.java
@@ -19,6 +19,7 @@
 import java.nio.file.StandardCopyOption;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 import com.google.auto.value.AutoValue;
 import com.google.common.base.Joiner;
@@ -74,7 +75,7 @@ private ImmutableList<String> createCommand(Path in, Path out) {
 				.add("-pass", pkcs12Password())
 				.add("-n", description())
 				.add("-i", uri().toString())
-				.addAll(timestampURIs().stream().map(x -> List.of("-t", x.toString())).flatMap(List::stream).toList())
+				.addAll(timestampURIs().stream().map(x -> List.of("-t", x.toString())).flatMap(List::stream).collect(Collectors.toList()))
 				.add("-in", in.toString())
 				.add("-out", out.toString())
 				.build();