[MEAR-267] - Fixed detection if JAR module is included into classpath of particular EAR module manifest #19

mabrarov · 2020-10-03T19:59:56Z

Fixed detection if JAR module is included into classpath of particular EAR module manifest (like WAR or EJB module manifest). This is required for correct modification of Class-Path entry of manifest of EAR modules when skinnyWars option is turned on.
Note that this PR has no tests (yet) but I tested it manually with feature/MEAR-267_test branch of https://github.com/mabrarov/dockerfile-test:

$ git clone --branch feature/MEAR-267_test https://github.com/mabrarov/dockerfile-test.git && \
mvn -f dockerfile-test/pom.xml clean package -Ddocker.skip -Dmaven-ear-plugin.version=3.1.1-SNAPSHOT

where expected manifest of WAR inside built EAR, i.e. dockerfile-test/ear/target/ear-1.1.7-SNAPSHOT.ear/org.mabrarov.dockerfile-test-war-1.1.7-SNAPSHOT.war/META-INF/MANIFEST.MF looks like:

Manifest-Version: 1.0
Class-Path: lib/org.apache.commons-commons-text-1.7.jar lib/org.apache
 .commons-commons-lang3-3.9.jar
Build-Jdk-Spec: 1.8
Created-By: Maven WAR Plugin 3.3.1
git-commit: e0458e2c48333f2847abfe58b7d1d0b3e23e8941

while original manifest of WAR, i.e. dockerfile-test/war/target/war-1.1.7-SNAPSHOT.war/META-INF/MANIFEST.MF looks like:

Manifest-Version: 1.0
Class-Path: commons-text-1.7.jar commons-lang3-3.9.jar
Build-Jdk-Spec: 1.8
Created-By: Maven WAR Plugin 3.3.1
git-commit: e0458e2c48333f2847abfe58b7d1d0b3e23e8941

…path of particular EAR module manifest

mabrarov · 2020-10-03T20:46:01Z

Taking into account enhancements in EarMojoIT made in pull request #17 I would create tests for this pull request after that pull request is merged, because it looks like we need those enhancements here too.

mabrarov · 2020-10-03T21:38:34Z

Hmm... I made one more test:

$ git clone --branch MEAR-267_Manifest_classpath_modification https://github.com/mabrarov/MEAR-267-issue-demo.git && \
mvn -q -B -f MEAR-267-issue-demo/pom.xml verify -Dmaven-ear-plugin.version=3.1.1-SNAPSHOT 2>&1 | grep WFLYSRV0059

and it demonstrates:

00:35:52,808 WARN  [org.jboss.as.server.deployment] (MSC service thread 1-2) WFLYSRV0059: Class Path entry guava-19.0.jar in /content/MEAR-267.ear/com.leokom-MEAR-267-ejb-1.0-SNAPSHOT.jar  does not point to a valid jar for a Class-Path reference.

that MEAR-267 has multiple root causes and I fixed in this pull request just one of them.

In MEAR-267-issue-demo we have skinnyWars option turned off and it looks like this makes Maven EAR Plugin skipping modification of manifest of EJB JAR.

…try of EAR module manifest

mabrarov · 2020-10-03T22:15:13Z

I fixed 2nd root cause of MEAR-267 in 89816ae:

$ git clone --branch MEAR-267_Manifest_classpath_modification https://github.com/mabrarov/MEAR-267-issue-demo.git && \
mvn -q -B -f MEAR-267-issue-demo/pom.xml verify -Dmaven-ear-plugin.version=3.1.1-SNAPSHOT 2>&1 | grep -c WFLYSRV0059
...
0

…nifest has no Class-Path entry

mabrarov · 2020-10-04T03:22:08Z

I added some integration tests but they do not cover all permutations (i.e. all changed branches) of options like:

skinnyWars
skipClassPathModification
"dirty" build without clean goal execution

src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java

…ifest entry as used for removal of JAR modules from EAR modules

src/main/java/org/apache/maven/plugins/ear/EarMojo.java

src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java

…matting of JavaDoc, inlined simple single-line code.

src/main/java/org/apache/maven/plugins/ear/EarMojo.java

# Conflicts: # pom.xml

mabrarov · 2020-10-11T23:55:08Z

What's pending / required for merging this pull request?

elharo

Let me push this through Jenkins

src/main/java/org/apache/maven/plugins/ear/EarMojo.java

elharo

jenkins failed: https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-ear-plugin/job/mear-267/

mabrarov · 2020-10-12T12:45:05Z

jenkins failed: https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-ear-plugin/job/mear-267/

Looks like issue of Jenkins with checkout of pull request (https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-ear-plugin/job/mear-267/1/console):

Fetching without tags
Fetching upstream changes from https://gitbox.apache.org/repos/asf/maven-jenkins-lib.git
 > git fetch --no-tags --force --progress -- https://gitbox.apache.org/repos/asf/maven-jenkins-lib.git +refs/heads/*:refs/remotes/origin/* # timeout=10
Checking out Revision c10869c6952fe48d6d66f394802101bdc6d1a537 (master)
 > git config core.sparsecheckout # timeout=10
 > git checkout -f c10869c6952fe48d6d66f394802101bdc6d1a537 # timeout=10
Commit message: "Restored the full maven version matrix default"
First time build. Skipping changelog.
 > git --version # timeout=10
fatal: bad object 4a8c35fa6acb6a409ac027ebf16ae7f3073bbbba

elharo · 2020-10-12T12:58:02Z

https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-ear-plugin/job/19/

elharo

https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-ear-plugin/job/19/1/testReport/

merging to master might help

mabrarov · 2020-10-12T14:01:32Z

Merge conflicts were fixed

mabrarov · 2020-10-12T14:23:31Z

I just found an error during "dirty" build. Let me try to fix it before proceeding with this PR.

…R modules when doing "dirty" build, i.e. when element with desired path already exists in target manifest Class-Path entry

mabrarov · 2020-10-12T14:51:25Z

I just found an error during "dirty" build. Let me try to fix it before proceeding with this PR.

That was fixed in f070e47. This PR is ready for testing and review now.

mabrarov · 2020-10-12T16:38:38Z

@elharo, could you please trigger one more Jenkins build?

mabrarov · 2020-10-12T18:59:26Z

Test failure when building with JDK 11 - refer to https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-ear-plugin/job/19/2/testReport/ - was fixed in e5ea347

elharo · 2020-10-13T13:34:38Z

https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-ear-plugin/job/19/

mabrarov · 2020-10-15T01:59:49Z

src/main/java/org/apache/maven/plugins/ear/EarMojo.java

@@ -461,7 +461,7 @@ private void copyModules( final JavaEEVersion javaEEVersion,
                        getLog().info( "Copying artifact [" + module + "] to [" + module.getUri() + "]" );
                        FileUtils.copyFile( sourceFile, destinationFile );

-                        if ( skinnyWars && module.changeManifestClasspath() )
+                        if ( module.changeManifestClasspath() && ( skinnyWars || module.getLibDir() == null ) )


It looks that this change introduces non backward compatible behavior - modification of Class-Path entry of manifest - for SAR and HAR modules. Refer to pull request #24 which is going to fix that (with false default value of skinnyModules option).

mabrarov changed the title ~~[MEAR-267] - Fixed detection if EAR JAR module is included into classpath of particular EAR module manifest~~ [MEAR-267] - Fixed detection if JAR module is included into classpath of particular EAR module manifest Oct 3, 2020

mabrarov force-pushed the MEAR-267_Manifest_classpath_modification branch 5 times, most recently from 717110f to bb67e63 Compare October 3, 2020 20:41

[MEAR-267] - Fixed detection if EAR JAR module is included into class…

968d1f2

…path of particular EAR module manifest

mabrarov force-pushed the MEAR-267_Manifest_classpath_modification branch from bb67e63 to 968d1f2 Compare October 3, 2020 20:42

[MEAR-267] - Fixed detection of need of modification of Class-Path en…

89816ae

…try of EAR module manifest

[MEAR-267] - Performance optimization for the case when EAR module ma…

c926ab0

…nifest has no Class-Path entry

mabrarov commented Oct 4, 2020

View reviewed changes

src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java Outdated Show resolved Hide resolved

mabrarov force-pushed the MEAR-267_Manifest_classpath_modification branch 7 times, most recently from 7c253b8 to c926ab0 Compare October 4, 2020 04:15

[MEAR-267] - Integration tests

a05d1f8

mabrarov force-pushed the MEAR-267_Manifest_classpath_modification branch 2 times, most recently from 446206e to 81d28e2 Compare October 4, 2020 05:14

[MEAR-267] - The same rules applied to modification of Class-Path man…

3c34038

…ifest entry as used for removal of JAR modules from EAR modules

mabrarov force-pushed the MEAR-267_Manifest_classpath_modification branch from 81d28e2 to 3c34038 Compare October 4, 2020 05:16

[MEAR-267] - Fixed formatting of JavaDoc in tests

d7ec060

mabrarov force-pushed the MEAR-267_Manifest_classpath_modification branch from 418447d to b5a54dc Compare October 5, 2020 13:34

[MEAR-267] - Test for the case when unpacking of EJB JARs is turned on

a8e5826

mabrarov force-pushed the MEAR-267_Manifest_classpath_modification branch from b5a54dc to a8e5826 Compare October 5, 2020 13:37

elharo reviewed Oct 7, 2020

View reviewed changes

mabrarov added 2 commits October 7, 2020 18:52

[MEAR-267] - Renamed test method parameters and rephrased / fixed for…

97bd177

…matting of JavaDoc, inlined simple single-line code.

[MEAR-267] - Minor code style fix.

2fba398

elharo reviewed Oct 7, 2020

View reviewed changes

src/main/java/org/apache/maven/plugins/ear/EarMojo.java Show resolved Hide resolved

Merge branch 'master' into MEAR-267_Manifest_classpath_modification

2ba1761

# Conflicts: # pom.xml

elharo approved these changes Oct 7, 2020

View reviewed changes

elharo reviewed Oct 12, 2020

View reviewed changes

src/main/java/org/apache/maven/plugins/ear/EarMojo.java Outdated Show resolved Hide resolved

elharo reviewed Oct 12, 2020

View reviewed changes

[MEAR-267] - JavaDoc simplified.

c6d6d0a

elharo reviewed Oct 12, 2020

View reviewed changes

Merge branch 'master' into MEAR-267_Manifest_classpath_modification

78d1a9f

[MEAR-267] - Test for "dirty" build.

9c41a3f

[MEAR-267] - Fixed modification of Class-Path entry of manifest of EA…

f070e47

…R modules when doing "dirty" build, i.e. when element with desired path already exists in target manifest Class-Path entry

[MEAR-267] - Support of JDK 11+ in integration tests

e5ea347

elharo merged commit 74d28d8 into apache:master Oct 13, 2020

mabrarov commented Oct 15, 2020

View reviewed changes

mabrarov mentioned this pull request Oct 15, 2020

[MEAR-153] skinnyModules option #24

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[MEAR-267] - Fixed detection if JAR module is included into classpath of particular EAR module manifest #19

[MEAR-267] - Fixed detection if JAR module is included into classpath of particular EAR module manifest #19

mabrarov commented Oct 3, 2020

mabrarov commented Oct 3, 2020

mabrarov commented Oct 3, 2020 •

edited

Loading

mabrarov commented Oct 3, 2020 •

edited

Loading

mabrarov commented Oct 4, 2020 •

edited

Loading

mabrarov commented Oct 11, 2020

elharo left a comment

elharo left a comment

mabrarov commented Oct 12, 2020

elharo commented Oct 12, 2020

elharo left a comment

mabrarov commented Oct 12, 2020

mabrarov commented Oct 12, 2020

mabrarov commented Oct 12, 2020

mabrarov commented Oct 12, 2020

mabrarov commented Oct 12, 2020

elharo commented Oct 13, 2020

mabrarov Oct 15, 2020

[MEAR-267] - Fixed detection if JAR module is included into classpath of particular EAR module manifest #19

[MEAR-267] - Fixed detection if JAR module is included into classpath of particular EAR module manifest #19

Conversation

mabrarov commented Oct 3, 2020

mabrarov commented Oct 3, 2020

mabrarov commented Oct 3, 2020 • edited Loading

mabrarov commented Oct 3, 2020 • edited Loading

mabrarov commented Oct 4, 2020 • edited Loading

mabrarov commented Oct 11, 2020

elharo left a comment

Choose a reason for hiding this comment

elharo left a comment

Choose a reason for hiding this comment

mabrarov commented Oct 12, 2020

elharo commented Oct 12, 2020

elharo left a comment

Choose a reason for hiding this comment

mabrarov commented Oct 12, 2020

mabrarov commented Oct 12, 2020

mabrarov commented Oct 12, 2020

mabrarov commented Oct 12, 2020

mabrarov commented Oct 12, 2020

elharo commented Oct 13, 2020

mabrarov Oct 15, 2020

Choose a reason for hiding this comment

mabrarov commented Oct 3, 2020 •

edited

Loading

mabrarov commented Oct 3, 2020 •

edited

Loading

mabrarov commented Oct 4, 2020 •

edited

Loading