Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix features-bom issue #1847

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix features-bom issue #1847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cc0d0a
fix featuresbom issue
Nov 21, 2024
337e10f
fix featuresbom issue for prepareFeature
Nov 21, 2024
d6c2fa2
update tests to use features-bom artifactID
Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 10 additions & 35 deletions liberty-maven-plugin/src/it/kernel-install-feature-test/prepare-multiple-features-it/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this mean if they have more than one user feature, they will not be able to configure it because they would both need a features-bom artifact in Maven? If so, that seems like an unreasonable restriction.

<groupId>test.user.test.osgi</groupId>
<artifactId>features-bom</artifactId>
<version>1.0</version>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>
</project>
13 changes: 12 additions & 1 deletion ...est/resources/SimpleActivator-bom-1.0.pom → ...t/src/test/resources/features-bom-1.0.pom
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
26 changes: 0 additions & 26 deletions ...el-install-feature-test/prepare-multiple-features-it/src/test/resources/hello-bom-1.0.pom
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions liberty-maven-plugin/src/it/verify-user-feature-it/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...est/resources/SimpleActivator-bom-1.0.pom → ...t/src/test/resources/features-bom-1.0.pom
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
5 changes: 3 additions & 2 deletions liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/InstallFeatureSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
2 changes: 1 addition & 1 deletion liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/PrepareFeatureSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading