Skip to content

plugin: Try to get "jdk 1.8" from toolchains.xml, bump Maven to >= 3.3.9 #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

plugin: Try to get "jdk 1.8" from toolchains.xml, bump Maven to >= 3.3.9 #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions retrolambda-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<packaging>maven-plugin</packaging>

<prerequisites>
<maven>3.0</maven>
<maven>3.3.9</maven>
</prerequisites>

<dependencies>
Expand All @@ -29,10 +29,17 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>3.3.9</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>3.0</version>
<version>3.3.9</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
Expand All @@ -50,7 +57,7 @@
<dependency>
<groupId>org.twdata.maven</groupId>
<artifactId>mojo-executor</artifactId>
<version>2.2.0</version>
<version>2.4.1-m2</version>
</dependency>

<dependency>
Expand All @@ -70,6 +77,7 @@

<plugin>
<artifactId>maven-toolchains-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<toolchains>
<jdk>
Expand Down
46 changes: 31 additions & 15 deletions ...lambda-maven-plugin/src/main/java/net/orfjackal/retrolambda/maven/ProcessClassesMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,21 +222,37 @@ private void retrieveRetrolambdaJar(String version) throws MojoExecutionExceptio
}

String getJavaCommand() {
String javaCommand = getJavaCommand(new File(System.getProperty("java.home")));

Toolchain tc = toolchainManager.getToolchainFromBuildContext("jdk", session);
if (tc != null) {
getLog().info("Toolchain in retrolambda-maven-plugin: " + tc);
javaCommand = tc.findTool("java");
}

if (java8home != null) {
if (tc != null) {
getLog().warn("Toolchains are ignored, 'java8home' parameter is set to " + java8home);
}
javaCommand = getJavaCommand(java8home);
}
return javaCommand;
String javaCommand = null;

List<Toolchain> tcCandidates = toolchainManager.getToolchains(session, "jdk", Collections
.singletonMap("version", "1.8"));
for (Toolchain tc : tcCandidates) {
String cmd = tc.findTool("java");
if (cmd != null) {
getLog().info("Toolchain in retrolambda-maven-plugin: " + tc);
javaCommand = cmd;
break;
}
}

Toolchain tc = toolchainManager.getToolchainFromBuildContext("jdk", session);
if (javaCommand == null && tc != null) {
getLog().info("Toolchain in retrolambda-maven-plugin: " + tc);
javaCommand = tc.findTool("java");
}

if (java8home != null) {
if (tc != null) {
getLog().warn("Toolchains are ignored, 'java8home' parameter is set to " + java8home);
}
javaCommand = getJavaCommand(java8home);
}

if (javaCommand == null) {
javaCommand = getJavaCommand(new File(System.getProperty("java.home")));
}

return javaCommand;
}

private static String getJavaCommand(File javaHome) {
Expand Down
9 changes: 6 additions & 3 deletions ...da-maven-plugin/src/main/java/net/orfjackal/retrolambda/maven/ProcessTestClassesMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@

package net.orfjackal.retrolambda.maven;

import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.plugins.annotations.*;

import java.io.File;
import java.util.List;

import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;

/**
* Processes test classes compiled with Java 8 so that they will be compatible with
* Java 5, 6 or 7 runtime.
Expand Down
13 changes: 12 additions & 1 deletion ...da-maven-plugin/src/test/java/net/orfjackal/retrolambda/maven/ProcessClassesMojoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,20 @@ public Toolchain getToolchainFromBuildContext(String type, MavenSession context)
return toolChainsByType.get(type);
}

public void setJdkToolChain(JavaToolChain toolChain) {
public void setJdkToolChain(JavaToolchain toolChain) {
toolChainsByType.put("jdk", toolChain);
}

@Override
public List<Toolchain> getToolchains(MavenSession session, String type,
Map<String, String> requirements) {
Toolchain tc = toolChainsByType.get("jdk");
if(tc == null) {
return Collections.emptyList();
} else {
return Collections.singletonList(tc);
}
}
}

private static class FakeJavaToolChain extends DefaultJavaToolChain {
Expand Down