Merge pull request OpenLiberty#1847 from jjiwooLim/featuresbom

fix features-bom issue
cherylking · Dec 2, 2024 · 3ca66be · 3ca66be
2 parents 6198492 + d6c2fa2
commit 3ca66be
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 69 deletions.
diff --git a/liberty-maven-plugin/src/it/kernel-install-feature-test/prepare-multiple-features-it/pom.xml b/liberty-maven-plugin/src/it/kernel-install-feature-test/prepare-multiple-features-it/pom.xml
@@ -29,25 +29,6 @@
 	                        <goal>copy-resources</goal>
 	                    </goals>
 
-	                    <configuration>
-			                <outputDirectory>${user.home}/.m2/repository/test/user/test/osgi/hello-bom/1.0</outputDirectory>
-			                <resources>
-			                    <resource>
-			                        <directory>src/test/resources</directory>
-			                        <includes>
-			                            <include>hello-bom-1.0.pom</include>
-			                        </includes>
-			                    </resource>
-			                </resources>
-			            </configuration>
-	                </execution>
-	                <execution>
-	                    <id>copy-resource-two</id>
-	                    <phase>process-test-resources</phase>
-	                    <goals>
-	                        <goal>copy-resources</goal>
-	                    </goals>
-
 	                    <configuration>
 			                <outputDirectory>${user.home}/.m2/repository/test/user/test/osgi/hello-esa-plugin/1.0</outputDirectory>
 			                <resources>
@@ -61,26 +42,26 @@
 			            </configuration>
 	                </execution>
 					<execution>
-	                    <id>copy-resource-three</id>
+	                    <id>copy-resource-two</id>
 	                    <phase>process-test-resources</phase>
 	                    <goals>
 	                        <goal>copy-resources</goal>
 	                    </goals>
 
 	                    <configuration>
-			                <outputDirectory>${user.home}/.m2/repository/test/user/test/osgi/SimpleActivator-bom/1.0</outputDirectory>
+			                <outputDirectory>${user.home}/.m2/repository/test/user/test/osgi/features-bom/1.0</outputDirectory>
 			                <resources>
 			                    <resource>
 			                        <directory>src/test/resources</directory>
 			                        <includes>
-			                            <include>SimpleActivator-bom-1.0.pom</include>
+			                            <include>features-bom-1.0.pom</include>
 			                        </includes>
 			                    </resource>
 			                </resources>
 			            </configuration>
 	                </execution>
 	                <execution>
-	                    <id>copy-resource-four</id>
+	                    <id>copy-resource-three</id>
 	                    <phase>process-test-resources</phase>
 	                    <goals>
 	                        <goal>copy-resources</goal>
@@ -156,18 +137,12 @@
 
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>${bom.group.id}</groupId>
-        <artifactId>hello-bom</artifactId>
-        <version>1.0</version>
-        <type>pom</type>
-      </dependency>
-	<dependency>
-        <groupId>test.user.test.osgi</groupId>
-        <artifactId>SimpleActivator-bom</artifactId>
-        <version>1.0</version>
-        <type>pom</type>
-      </dependency>
+		<dependency>
+			<groupId>test.user.test.osgi</groupId>
+			<artifactId>features-bom</artifactId>
+			<version>1.0</version>
+			<type>pom</type>
+		</dependency>
     </dependencies>
   </dependencyManagement>
 </project>
diff --git a/...est/resources/SimpleActivator-bom-1.0.pom → ...t/src/test/resources/features-bom-1.0.pom b/...est/resources/SimpleActivator-bom-1.0.pom → ...t/src/test/resources/features-bom-1.0.pom
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>test.user.test.osgi</groupId>
-  <artifactId>SimpleActivator-bom</artifactId>
+  <artifactId>features-bom</artifactId>
   <version>1.0</version>
   <packaging>pom</packaging>
 
@@ -15,5 +15,16 @@
         <type>esa</type>
       </dependency>
     </dependencies>
+
+    <dependencies>
+      <dependency>
+        <groupId>test.user.test.osgi</groupId>
+        <!--artifactId>hello-esa-plugin</artifactId-->
+        <artifactId>${esa.artifact.id}</artifactId>
+        <version>1.0</version>
+        <type>esa</type>
+		    <scope>runtime</scope>
+      </dependency>
+    </dependencies>
   </dependencyManagement>
 </project>
diff --git a/...el-install-feature-test/prepare-multiple-features-it/src/test/resources/hello-bom-1.0.pom b/...el-install-feature-test/prepare-multiple-features-it/src/test/resources/hello-bom-1.0.pom
diff --git a/liberty-maven-plugin/src/it/verify-user-feature-it/pom.xml b/liberty-maven-plugin/src/it/verify-user-feature-it/pom.xml
@@ -41,12 +41,12 @@
                         </goals>
 
                         <configuration>
-                            <outputDirectory>${user.home}/.m2/repository/test/user/test/osgi/SimpleActivator-bom/1.0</outputDirectory>
+                            <outputDirectory>${user.home}/.m2/repository/test/user/test/osgi/features-bom/1.0</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>src/test/resources</directory>
                                     <includes>
-                                        <include>SimpleActivator-bom-1.0.pom</include>
+                                        <include>features-bom-1.0.pom</include>
                                     </includes>
                                 </resource>
                             </resources>
@@ -159,7 +159,7 @@
     <dependencies>
         <dependency>
           <groupId>test.user.test.osgi</groupId>
-          <artifactId>SimpleActivator-bom</artifactId>
+          <artifactId>features-bom</artifactId>
           <version>1.0</version>
           <type>pom</type>
         </dependency>

diff --git a/...est/resources/SimpleActivator-bom-1.0.pom → ...t/src/test/resources/features-bom-1.0.pom b/...est/resources/SimpleActivator-bom-1.0.pom → ...t/src/test/resources/features-bom-1.0.pom
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>test.user.test.osgi</groupId>
-  <artifactId>SimpleActivator-bom</artifactId>
+  <artifactId>features-bom</artifactId>
   <version>1.0</version>
   <packaging>pom</packaging>
 

diff --git a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/InstallFeatureSupport.java b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/InstallFeatureSupport.java
@@ -156,15 +156,16 @@ protected List<String> getAdditionalJsonList() {
         List<String> result = new ArrayList<String>();
         org.apache.maven.model.DependencyManagement dependencyManagement = project.getDependencyManagement();
         if(dependencyManagement == null) {
-        	getLog().debug("Feature-bom is not provided by the user");
+        	getLog().debug("Features-bom is not provided by the user");
         	return null;
         }
         List<org.apache.maven.model.Dependency> dependencyManagementArtifacts = dependencyManagement.getDependencies();
         for (org.apache.maven.model.Dependency dependencyArtifact: dependencyManagementArtifacts){
-            if (("pom").equals(dependencyArtifact.getType())) {
+            if (("pom").equals(dependencyArtifact.getType()) && ("features-bom").equals(dependencyArtifact.getArtifactId())) {
                 String coordinate = String.format("%s:%s:%s",
                         dependencyArtifact.getGroupId(), FEATURES_JSON_ARTIFACT_ID, dependencyArtifact.getVersion());
                 result.add(coordinate);
+                getLog().debug("Features-bom is provided by the user");
                 getLog().info("Additional user feature json coordinate: " + coordinate);
             }
         }

diff --git a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/PrepareFeatureSupport.java b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/PrepareFeatureSupport.java
@@ -110,7 +110,7 @@ protected List<String> getDependencyBOMs() {
         if (dependencyManagement != null) {
         	List<org.apache.maven.model.Dependency> dependencyManagementArtifacts = dependencyManagement.getDependencies();
             for (org.apache.maven.model.Dependency dependencyArtifact: dependencyManagementArtifacts){
-                if (("pom").equals(dependencyArtifact.getType())) {
+                if (("pom").equals(dependencyArtifact.getType()) && ("features-bom").equals(dependencyArtifact.getArtifactId()) ) {
                 	String coordinate = String.format("%s:%s:%s",
                     		dependencyArtifact.getGroupId(), dependencyArtifact.getArtifactId(), dependencyArtifact.getVersion());
                     result.add(coordinate);