Skip to content

Bump maven-archiver from 2.4 to 3.5.2 #13

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

Closed
dependabot wants to merge 5 commits into from
Closed

Bump maven-archiver from 2.4 to 3.5.2 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6fb2472
Start development of 2.5.2
lasselindqvist Sep 27, 2021
259c5c2
Keep dependency injar archive if outjar is a directory
aasakawa Feb 7, 2020
9020ab9
Merge branch 'keep_dependency_injar_archive_if_outjar_is_a_directory'
aasakawa Oct 8, 2021
66ea958
ローカルリリース向けにgroupIdとversionを変更した
aasakawa Oct 8, 2021
277b372
Bump maven-archiver from 2.4 to 3.5.2
dependabot[bot] Jan 5, 2022
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
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
</properties>


<groupId>com.github.wvengen</groupId>
<groupId>net.astah.maven.plugin</groupId>
<artifactId>proguard-maven-plugin</artifactId>
<name>proguard-maven-plugin</name>
<version>2.5.1</version>
<version>2.5.2</version>
<packaging>maven-plugin</packaging>

<description>Maven 3 Plugin for ProGuard</description>
Expand Down Expand Up @@ -103,7 +103,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
<version>2.4</version>
<version>3.5.2</version>
</dependency>

<dependency>
Expand Down
47 changes: 37 additions & 10 deletions src/main/java/com/github/wvengen/maven/proguard/ProGuardMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,8 @@ public void execute() throws MojoExecutionException, MojoFailureException {
inJarFile = baseFile;
}

boolean outJarArchive = isArchive(outJarFile);

ArrayList<String> args = new ArrayList<String>();
ArrayList<File> libraryJars = new ArrayList<File>();

Expand Down Expand Up @@ -528,25 +530,31 @@ public void execute() throws MojoExecutionException, MojoFailureException {

for (Entry<Artifact, Inclusion> entry : injars.entrySet()) {
log.info("--- ADD injars:" + entry.getKey().getArtifactId());
File file = getClasspathElement(entry.getKey(), mavenProject);
File file = getClasspathElement(entry.getKey(), mavenProject, !outJarArchive);
inPath.add(file.toString());
StringBuilder filter = new StringBuilder(fileToString(file));
filter.append("(!META-INF/MANIFEST.MF");
int start = filter.length();
if (outJarArchive) {
filter.append("(!META-INF/MANIFEST.MF");
}
if (!addMavenDescriptor) {
filter.append(",");
filter.append(filter.length() > start ? "," : "(");
filter.append("!META-INF/maven/**");
}
if (entry.getValue().filter != null) {
filter.append(",").append(entry.getValue().filter);
filter.append(filter.length() > start ? "," : "(");
filter.append(entry.getValue().filter);
}
if (filter.length() > start) {
filter.append(")");
}
filter.append(")");
args.add("-injars");
args.add(filter.toString());
}

for (Entry<Artifact, Inclusion> entry : libraryjars.entrySet()) {
log.info("--- ADD libraryjars:" + entry.getKey().getArtifactId());
File file = getClasspathElement(entry.getKey(), mavenProject);
File file = getClasspathElement(entry.getKey(), mavenProject, false);
hasInclusionLibrary = true;
inPath.add(file.toString());
if (putLibraryJarsInTempDir) {
Expand Down Expand Up @@ -590,7 +598,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
if (isExclusion(artifact)) {
continue;
}
File file = getClasspathElement(artifact, mavenProject);
File file = getClasspathElement(artifact, mavenProject, includeDependencyInjar && !outJarArchive);

if (inPath.contains(file.toString())) {
log.debug("--- ignore library since one in injar:" + artifact.getArtifactId());
Expand Down Expand Up @@ -766,7 +774,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
jarArchiver.addArchivedFileSet(baseFile);
for (Entry<Artifact, Inclusion> entry : libraryjars.entrySet()) {
File file;
file = getClasspathElement(entry.getKey(), mavenProject);
file = getClasspathElement(entry.getKey(), mavenProject, false);
if (file.isDirectory()) {
getLog().info("merge project: " + entry.getKey() + " " + file);
jarArchiver.addDirectory(file);
Expand Down Expand Up @@ -1062,6 +1070,25 @@ private boolean deleteFileOrDirectory(File path) throws MojoFailureException {
}
}

private boolean isArchive(File path) {
String name = path.getName();
int separator = name.lastIndexOf('.');
if (separator > 0) {
// https://www.guardsquare.com/en/products/proguard/manual/usage#classpath
String extension = name.substring(separator + 1).toLowerCase();
if (extension.equals("apk")
|| extension.equals("jar")
|| extension.equals("aar")
|| extension.equals("war")
|| extension.equals("ear")
|| extension.equals("jmod")
|| extension.equals("zip")) {
return true;
}
}
return false;
}

private Set<Artifact> getDependencies(final Inclusion inc, MavenProject mavenProject)
throws MojoExecutionException {
@SuppressWarnings("unchecked")
Expand Down Expand Up @@ -1090,8 +1117,8 @@ private boolean isExclusion(Artifact artifact) {
return false;
}

private File getClasspathElement(Artifact artifact, MavenProject mavenProject) throws MojoExecutionException {
if (artifact.getClassifier() != null) {
private File getClasspathElement(Artifact artifact, MavenProject mavenProject, boolean preferFile) throws MojoExecutionException {
if (artifact.getClassifier() != null || (preferFile && artifact.getFile().exists())) {
return artifact.getFile();
}
String refId = artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" + artifact.getVersion();
Expand Down