You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2018/03/04 19:08:39 UTC
[maven-ear-plugin] branch MEAR-209 updated (f621af6 -> 3638d07)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MEAR-209
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git.
discard f621af6 [MEAR-209] - Change and use a internal unique id instead of artifactId only o Based on implementation of MEAR-171 this is not necessary anymore.
new 3638d07 [MEAR-209] - Change and use a internal unique id instead of artifactId only o Based on implementation of MEAR-171 this is not necessary anymore.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (f621af6)
\
N -- N -- N refs/heads/MEAR-209 (3638d07)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/java/org/apache/maven/plugins/ear/EarMojo.java | 3 ---
1 file changed, 3 deletions(-)
--
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.
[maven-ear-plugin] 01/01: [MEAR-209] - Change and use a internal
unique id instead of artifactId only o Based on implementation of MEAR-171
this is not necessary anymore.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MEAR-209
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git
commit 3638d07a0a0132c3f798769e493ba19c776de68c
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Mar 4 19:59:29 2018 +0100
[MEAR-209] - Change and use a internal unique id instead of artifactId only
o Based on implementation of MEAR-171 this is not necessary anymore.
---
.../java/org/apache/maven/plugins/ear/EarMojo.java | 39 ----------------------
1 file changed, 39 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/ear/EarMojo.java b/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
index 9e2f0c7..1cc7b18 100644
--- a/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
@@ -26,8 +26,6 @@ import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
import java.util.zip.ZipException;
import org.apache.maven.archiver.MavenArchiveConfiguration;
@@ -42,7 +40,6 @@ import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.ear.util.EarMavenArchiver;
import org.apache.maven.plugins.ear.util.JavaEEVersion;
-import org.apache.maven.plugins.ear.util.ModuleIdentifierValidator;
import org.apache.maven.project.MavenProjectHelper;
import org.apache.maven.shared.filtering.MavenFileFilter;
import org.apache.maven.shared.filtering.MavenFilteringException;
@@ -272,35 +269,6 @@ public class EarMojo
@Parameter( defaultValue = "false", property = "maven.ear.duplicateArtifactsBreakTheBuild" )
private boolean duplicateArtifactsBreakTheBuild;
- private void checkModuleUniqueness()
- throws MojoExecutionException
- {
- ModuleIdentifierValidator miv = new ModuleIdentifierValidator( getModules() );
- miv.checkForDuplicateArtifacts();
- if ( miv.existDuplicateArtifacts() )
- {
- Map<String, List<EarModule>> duplicateArtifacts = miv.getDuplicateArtifacts();
- for ( Entry<String, List<EarModule>> entry : duplicateArtifacts.entrySet() )
- {
- getLog().warn( "The artifactId " + entry.getKey() + " exists more than once in the modules list." );
- for ( EarModule earModule : entry.getValue() )
- {
- getLog().warn( " --> " + earModule.getArtifact().getId() + " (" + earModule.getType() + ")" );
- }
- }
-
- getLog().warn( "HINT: This can be simply solved by using the <fileNameMapping>full</fileNameMapping>" );
-
- if ( duplicateArtifactsBreakTheBuild )
- {
- // CHECKSTYLE_OFF: LineLength
- throw new MojoExecutionException( "The build contains duplicate artifacts which result in unpredictable ear content." );
- // CHECKSTYLE_ON: LineLength
- }
- }
-
- }
-
/** {@inheritDoc} */
public void execute()
throws MojoExecutionException, MojoFailureException
@@ -396,13 +364,6 @@ public class EarMojo
{
try
{
- // TODO: With the next major release the modules
- // should be identified by a unique id instead of the
- // the artifactId's only which means this
- // check can be removed.
- // https://issues.apache.org/jira/browse/MEAR-209
- checkModuleUniqueness();
-
for ( EarModule module : getModules() )
{
final File sourceFile = module.getArtifact().getFile();
--
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.