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 2016/06/21 11:37:00 UTC
tomee git commit: TOMEE-1842 a bit better heuristic for stripVersion
for wars
Repository: tomee
Updated Branches:
refs/heads/master 243cc841c -> 111989beb
TOMEE-1842 a bit better heuristic for stripVersion for wars
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/111989be
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/111989be
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/111989be
Branch: refs/heads/master
Commit: 111989bebb8f315c7d6ea61118d508767a0e34d8
Parents: 243cc84
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Tue Jun 21 13:36:46 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Tue Jun 21 13:36:46 2016 +0200
----------------------------------------------------------------------
.../apache/openejb/maven/plugin/AbstractTomEEMojo.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/111989be/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
----------------------------------------------------------------------
diff --git a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
index 4a16c2c..f103ddd 100644
--- a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
+++ b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
@@ -303,6 +303,12 @@ public abstract class AbstractTomEEMojo extends AbstractAddressMojo {
@Parameter(defaultValue = "${project.build.directory}/${project.build.finalName}", readonly = true)
protected File workWarFile;
+ @Parameter(defaultValue = "${project.build.finalName}", readonly = true)
+ protected String finalName;
+
+ @Parameter(defaultValue = "${project.artifactId}", readonly = true)
+ protected String artifactId;
+
@Parameter(property = "tomee-plugin.remove-default-webapps", defaultValue = "true")
protected boolean removeDefaultWebapps;
@@ -761,7 +767,8 @@ public abstract class AbstractTomEEMojo extends AbstractAddressMojo {
try {
final FileWithMavenMeta file = mvnToFile(lib, defaultType);
if (extractedName == null && (stripVersion || isWar && stripWarVersion)) {
- extractedName = file.stripVersion(!isExplodedWar);
+ extractedName = isCurrentArtifact(file) && file.version != null ? finalName.replace("-" + file.version, "") :
+ file.stripVersion(!isExplodedWar);
}
if (!unzip) {
@@ -796,6 +803,10 @@ public abstract class AbstractTomEEMojo extends AbstractAddressMojo {
}
}
+ private boolean isCurrentArtifact(final FileWithMavenMeta file) {
+ return file.artifact.equals(artifactId);
+ }
+
private FileWithMavenMeta mvnToFile(final String lib, final String defaultType) throws ArtifactResolutionException, ArtifactNotFoundException {
final String[] infos = lib.split(":");
final String classifier;