Skip to content
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

Jump to bottom

[MJAR-289] add toolchains support #71

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+38 −0
Draft

[MJAR-289] add toolchains support #71

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 38 additions & 0 deletions src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@
package org.apache.maven.plugins.jar;

import java.io.File;
import java.io.IOException;
import java.nio.file.FileSystems;
import java.util.Arrays;
import java.util.Collections;
import java.util.Map;

import org.apache.maven.archiver.MavenArchiveConfiguration;
Expand All @@ -34,8 +36,14 @@
import org.apache.maven.project.MavenProjectHelper;
import org.apache.maven.shared.model.fileset.FileSet;
import org.apache.maven.shared.model.fileset.util.FileSetManager;
import org.apache.maven.toolchain.Toolchain;
import org.apache.maven.toolchain.ToolchainManager;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
import org.codehaus.plexus.util.cli.StreamConsumer;

/**
* Base class for creating a jar from project classes.
Expand All @@ -53,6 +61,9 @@ public abstract class AbstractJarMojo extends AbstractMojo {

private static final String SEPARATOR = FileSystems.getDefault().getSeparator();

@Component
ToolchainManager toolchainManager;

/**
* List of files to include. Specified as fileset patterns which are relative to the input directory whose contents
* is being packaged into the JAR.
Expand Down Expand Up @@ -250,6 +261,33 @@ public File createArchive() throws MojoExecutionException {
archiver.setArchiver((JarArchiver) archivers.get(archiverName));
archiver.setOutputFile(jarFile);

Toolchain toolchain = toolchainManager.getToolchainFromBuildContext("jdk", session);
if (toolchain != null) {
String javac = toolchain.findTool("javac");
String version = "unknown";
try {
Commandline cl = new Commandline(javac);
cl.createArg().setValue("-version");
CommandLineUtils.StringStreamConsumer out = new CommandLineUtils.StringStreamConsumer();
CommandLineUtils.StringStreamConsumer err = new CommandLineUtils.StringStreamConsumer();
CommandLineUtils.executeCommandLine(cl, out, err);
version = out.getOutput();
if (version.startsWith("javac ")) {
version = version.substring(6);
}
if (version.startsWith("1.")) {
version = version.substring(0, 3);
} else {
version = version.substring(0, 2);
}
} catch (CommandLineException e) {
throw new RuntimeException(e);
}
// TODO cache in MavenSession for reuse?
archive.addManifestEntry("Build-Jdk-Spec", version);
archive.addManifestEntry("Build-Tool-Jdk-Spec", System.getProperty("java.specification.version"));
}

// configure for Reproducible Builds based on outputTimestamp value
archiver.configureReproducibleBuild(outputTimestamp);

Expand Down