Skip to content

Commit fda59f1

Browse files
committed
build: make sure we build for JDK 8 (for now)
1 parent 8956385 commit fda59f1

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929

3030
<properties>
3131
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
32-
<maven.compiler.source>17</maven.compiler.source>
33-
<maven.compiler.target>17</maven.compiler.target>
32+
<maven.compiler.source>8</maven.compiler.source>
33+
<maven.compiler.target>8</maven.compiler.target>
3434
<mainClass>org.codejive.jpm.Main</mainClass>
3535
<version.mima>2.4.15</version.mima>
3636
<version.picocli>4.7.6</version.picocli>

src/main/java/org/codejive/jpm/util/ResolverUtils.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ public static List<Path> resolveArtifactPaths(String[] artifactNames)
3333
throws DependencyResolutionException {
3434
List<Artifact> artifacts = parseArtifacts(artifactNames);
3535
List<ArtifactResult> resolvedArtifacts = resolveArtifacts(artifacts);
36-
return resolvedArtifacts.stream().map(ar -> ar.getArtifact().getFile().toPath()).toList();
36+
return resolvedArtifacts.stream()
37+
.map(ar -> ar.getArtifact().getFile().toPath())
38+
.collect(Collectors.toList());
3739
}
3840

3941
/**
@@ -57,7 +59,9 @@ public static List<Artifact> parseArtifacts(String[] artifactNames) {
5759
public static List<ArtifactResult> resolveArtifacts(List<Artifact> artifacts)
5860
throws DependencyResolutionException {
5961
List<Dependency> dependencies =
60-
artifacts.stream().map(a -> new Dependency(a, JavaScopes.RUNTIME)).toList();
62+
artifacts.stream()
63+
.map(a -> new Dependency(a, JavaScopes.RUNTIME))
64+
.collect(Collectors.toList());
6165
ContextOverrides overrides = ContextOverrides.create().build();
6266
Runtime runtime = Runtimes.INSTANCE.getRuntime();
6367
try (Context context = runtime.create(overrides)) {

src/main/java/org/codejive/jpm/util/SearchUtils.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import java.io.InputStreamReader;
88
import java.net.URLEncoder;
99
import java.util.List;
10+
import java.util.stream.Collectors;
1011
import org.apache.http.client.methods.CloseableHttpResponse;
1112
import org.apache.http.client.methods.HttpGet;
1213
import org.apache.http.impl.client.CloseableHttpClient;
@@ -55,18 +56,19 @@ private static SearchResult select(String query, int start, int count) throws IO
5556
String finalQuery;
5657
if (parts.length >= 3) {
5758
// Exact group/artifact match for retrieving versions
58-
finalQuery = "g:%s AND a:%s".formatted(parts[0], parts[1]);
59+
finalQuery = String.format("g:%s AND a:%s", parts[0], parts[1]);
5960
} else if (parts.length == 2) {
6061
// Partial group/artifact match, we will filter the results
6162
// to remove those that match an inverted artifact/group
62-
finalQuery = "%s AND %s".formatted(parts[0], parts[1]);
63+
finalQuery = String.format("%s AND %s", parts[0], parts[1]);
6364
} else {
6465
// Simple partial match
6566
finalQuery = query;
6667
}
6768
String searchUrl =
68-
"https://search.maven.org/solrsearch/select?start=%d&rows=%d&q=%s"
69-
.formatted(start, count, URLEncoder.encode(finalQuery, "UTF-8"));
69+
String.format(
70+
"https://search.maven.org/solrsearch/select?start=%d&rows=%d&q=%s",
71+
start, count, URLEncoder.encode(finalQuery, "UTF-8"));
7072
if (parts.length >= 3) {
7173
searchUrl += "&core=gav";
7274
}
@@ -100,7 +102,7 @@ private static SearchResult select(String query, int start, int count) throws IO
100102
d.a,
101103
"",
102104
d.v != null ? d.v : d.latestVersion))
103-
.toList();
105+
.collect(Collectors.toList());
104106
return new SearchResult(artifacts, query, start, count, result.response.numFound);
105107
}
106108
}

0 commit comments

Comments
 (0)