Skip to content

Commit 6307066

Browse files
cherylkingcherylking
authored
Merge pull request #1942 from arend-von-reinersdorff/patch-1
Fix check for ear dependency for dependencies of type ejb
2 parents 5378fc2 + b01195f commit 6307066

File tree

7 files changed

+67
-7
lines changed

7 files changed

+67
-7
lines changed

‎liberty-maven-plugin/src/it/dev-it/resources/multi-module-projects/multipleLibertyModules/ear-skinny-modules/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@
3131
<version>1.0-SNAPSHOT</version>
3232
<type>jar</type>
3333
</dependency>
34+
<dependency>
35+
<groupId>io.openliberty.guides</groupId>
36+
<artifactId>guide-maven-multimodules-ejb</artifactId>
37+
<version>1.0-SNAPSHOT</version>
38+
<type>ejb</type>
39+
</dependency>
3440
<dependency>
3541
<groupId>io.openliberty.guides</groupId>
3642
<artifactId>guide-maven-multimodules-war</artifactId>
@@ -70,6 +76,10 @@
7076
<!-- Set skinnyModules -->
7177
<skinnyModules>true</skinnyModules>
7278
<modules>
79+
<ejbModule>
80+
<groupId>io.openliberty.guides</groupId>
81+
<artifactId>guide-maven-multimodules-ejb</artifactId>
82+
</ejbModule>
7383
<webModule>
7484
<groupId>io.openliberty.guides</groupId>
7585
<artifactId>guide-maven-multimodules-war</artifactId>

‎liberty-maven-plugin/src/it/dev-it/resources/multi-module-projects/multipleLibertyModules/ear-skinny-modules/src/test/java/it/io/openliberty/guides/multimodules/ConverterAppIT.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,25 +73,27 @@ public void testLooseApplicationFileContent() throws Exception {
7373

7474
expression = "/archive/archive";
7575
nodes = (NodeList) xPath.compile(expression).evaluate(inputDoc, XPathConstants.NODESET);
76-
assertEquals( 4, nodes.getLength(),"Number of <archive/> elements expected 4 including jar, war, war2, rar");
76+
assertEquals(5, nodes.getLength(),"Number of <archive/> elements expected 5 including jar, ejb, war, war2, rar");
7777
assertEquals( "/lib/io.openliberty.guides-guide-maven-multimodules-jar-1.0-SNAPSHOT.jar",
7878
nodes.item(0).getAttributes().getNamedItem("targetInArchive").getNodeValue(),"archive targetInArchive attribute value expected with jar path");
79+
assertEquals( "/io.openliberty.guides-guide-maven-multimodules-ejb-1.0-SNAPSHOT.jar",
80+
nodes.item(1).getAttributes().getNamedItem("targetInArchive").getNodeValue(),"archive targetInArchive attribute value expected with ejb path");
7981
assertEquals("/guide-maven-multimodules-war-1.0-SNAPSHOT.war",
80-
nodes.item(1).getAttributes().getNamedItem("targetInArchive").getNodeValue(),"archive targetInArchive attribute value expected with war path");
82+
nodes.item(2).getAttributes().getNamedItem("targetInArchive").getNodeValue(),"archive targetInArchive attribute value expected with war path");
8183

8284
assertEquals("/guide-maven-multimodules-war2-1.0-SNAPSHOT.war",
83-
nodes.item(2).getAttributes().getNamedItem("targetInArchive").getNodeValue(),"archive targetInArchive attribute value expected with war2 path");
85+
nodes.item(3).getAttributes().getNamedItem("targetInArchive").getNodeValue(),"archive targetInArchive attribute value expected with war2 path");
8486

8587
assertEquals("/io.openliberty.guides-guide-maven-multimodules-rar-1.0-SNAPSHOT.rar",
86-
nodes.item(3).getAttributes().getNamedItem("targetInArchive").getNodeValue(),"archive targetInArchive attribute value expected with rar path");
88+
nodes.item(4).getAttributes().getNamedItem("targetInArchive").getNodeValue(),"archive targetInArchive attribute value expected with rar path");
8789

8890
expression = "/archive/archive/dir";
8991
nodes = (NodeList) xPath.compile(expression).evaluate(inputDoc, XPathConstants.NODESET);
90-
assertEquals( 4, nodes.getLength(),"Number of <dir/> element expected 4");
92+
assertEquals(5, nodes.getLength(),"Number of <dir/> element expected 5");
9193

9294
expression = "/archive/archive/file";
9395
nodes = (NodeList) xPath.compile(expression).evaluate(inputDoc, XPathConstants.NODESET);
94-
assertEquals(5, nodes.getLength(),"Number of <file/> element expected 5 including all manifest.mf and library jars");
96+
assertEquals(6, nodes.getLength(),"Number of <file/> element expected 6 including all manifest.mf and library jars");
9597
expression = "/archive/archive/archive";
9698
nodes = (NodeList) xPath.compile(expression).evaluate(inputDoc, XPathConstants.NODESET);
9799
assertEquals(0, nodes.getLength(),"Number of <archive/> element inside any other <archive/> is expected to be zero, since we are using skinnymodules");

‎liberty-maven-plugin/src/it/dev-it/resources/multi-module-projects/multipleLibertyModules/ejb/pom.xml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version='1.0' encoding='utf-8'?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
5+
http://maven.apache.org/xsd/maven-4.0.0.xsd">
6+
7+
<modelVersion>4.0.0</modelVersion>
8+
9+
<groupId>io.openliberty.guides</groupId>
10+
<artifactId>guide-maven-multimodules-ejb</artifactId>
11+
<packaging>ejb</packaging>
12+
<version>1.0-SNAPSHOT</version>
13+
14+
<properties>
15+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
17+
<maven.compiler.source>1.8</maven.compiler.source>
18+
<maven.compiler.target>1.8</maven.compiler.target>
19+
</properties>
20+
21+
<dependencies>
22+
<dependency>
23+
<groupId>javax.ejb</groupId>
24+
<artifactId>javax.ejb-api</artifactId>
25+
<version>3.2.2</version>
26+
<scope>provided</scope>
27+
</dependency>
28+
</dependencies>
29+
</project>

‎liberty-maven-plugin/src/it/dev-it/resources/multi-module-projects/multipleLibertyModules/ejb/src/main/java/io/openliberty/guides/multimodules/ejb/GreeterEjb.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package io.openliberty.guides.multimodules.ejb;
2+
3+
import javax.ejb.Stateless;
4+
5+
@Stateless
6+
public class GreeterEjb {
7+
8+
public String getGreeting() {
9+
return "Hello from EJB";
10+
}
11+
}

‎liberty-maven-plugin/src/it/dev-it/resources/multi-module-projects/multipleLibertyModules/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
<modules>
1515
<module>jar</module>
16+
<module>ejb</module>
1617
<module>war</module>
1718
<module>war2</module>
1819
<module>ear1</module>

‎liberty-maven-plugin/src/it/dev-it/resources/multi-module-projects/multipleLibertyModules/war/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@
5252
<artifactId>guide-maven-multimodules-jar</artifactId>
5353
<version>1.0-SNAPSHOT</version>
5454
</dependency>
55+
<dependency>
56+
<groupId>io.openliberty.guides</groupId>
57+
<artifactId>guide-maven-multimodules-ejb</artifactId>
58+
<version>1.0-SNAPSHOT</version>
59+
<type>ejb</type>
60+
</dependency>
5561
<!-- For tests -->
5662
<dependency>
5763
<groupId>org.junit.jupiter</groupId>

‎liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/applications/LooseEarApplication.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,8 @@ public boolean isEarDependency(Artifact artifact) {
334334
Set<Artifact> deps = project.getArtifacts();
335335
for (Artifact dep : deps) {
336336
if (("compile".equals(artifact.getScope()) || "runtime".equals(artifact.getScope()))
337-
&& "jar".equals(dep.getType()) && artifact.getGroupId().equals(dep.getGroupId())
337+
&& ("jar".equals(artifact.getType()) || "jar".equals(artifact.getArtifactHandler().getExtension()))
338+
&& artifact.getGroupId().equals(dep.getGroupId())
338339
&& artifact.getArtifactId().equals(dep.getArtifactId())
339340
&& artifact.getVersion().equals(dep.getVersion())) {
340341
return true;

0 commit comments

Comments
 (0)