You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2013/05/12 22:49:41 UTC
svn commit: r1481645 -
/tomee/tomee/trunk/maven/jarstxt-maven-plugin/src/main/java/org/apache/openejb/maven/jarstxt/JarsTxtMojo.java
Author: rmannibucau
Date: Sun May 12 20:49:41 2013
New Revision: 1481645
URL: http://svn.apache.org/r1481645
Log:
TOMEE-928 classifier support in jarstxt mvn plugin
Modified:
tomee/tomee/trunk/maven/jarstxt-maven-plugin/src/main/java/org/apache/openejb/maven/jarstxt/JarsTxtMojo.java
Modified: tomee/tomee/trunk/maven/jarstxt-maven-plugin/src/main/java/org/apache/openejb/maven/jarstxt/JarsTxtMojo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/jarstxt-maven-plugin/src/main/java/org/apache/openejb/maven/jarstxt/JarsTxtMojo.java?rev=1481645&r1=1481644&r2=1481645&view=diff
==============================================================================
--- tomee/tomee/trunk/maven/jarstxt-maven-plugin/src/main/java/org/apache/openejb/maven/jarstxt/JarsTxtMojo.java (original)
+++ tomee/tomee/trunk/maven/jarstxt-maven-plugin/src/main/java/org/apache/openejb/maven/jarstxt/JarsTxtMojo.java Sun May 12 20:49:41 2013
@@ -47,6 +47,7 @@ import java.util.TreeSet;
@Mojo(name = "generate", threadSafe = true,
requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME, defaultPhase = LifecyclePhase.COMPILE)
public class JarsTxtMojo extends AbstractMojo {
+ public static final String JAR = "jar";
@Component
protected MavenProject project;
@@ -94,6 +95,19 @@ public class JarsTxtMojo extends Abstrac
.append(a.getGroupId()).append("/")
.append(a.getArtifactId()).append("/")
.append(version(a));
+
+ final boolean isJar = JAR.equals(a.getType());
+ if (!isJar) {
+ line.append("/").append(a.getType());
+ }
+
+ if (a.getClassifier() != null) {
+ if (isJar) {
+ line.append("/").append(JAR);
+ }
+ line.append("/").append(a.getClassifier());
+ }
+
if (hashAlgo != null) {
final Artifact artifact = factory.createDependencyArtifact(a.getGroupId(), a.getArtifactId(), VersionRange.createFromVersion(a.getVersion()), a.getType(), a.getClassifier(), a.getScope());
try {