Skip to content

Commit

Permalink
update tests to use features-bom artifactID
Browse files Browse the repository at this point in the history
  • Loading branch information
Jiwoo Lim authored and Jiwoo Lim committed Nov 22, 2024
1 parent 337e10f commit f9dead0
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 67 deletions.
47 changes: 11 additions & 36 deletions liberty-maven-plugin/src/it/kernel-install-feature-test/prepare-multiple-features-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<packaging>jar</packaging>

<properties>
<bom.group.id>test.user.test.osgi</bom.group.id>
<bom.group.id>test.user.test.hello</bom.group.id>
<esa.artifact.id>hello-esa-plugin</esa.artifact.id>
</properties>
<build>
Expand All @@ -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>
<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
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

This file was deleted.

6 changes: 3 additions & 3 deletions liberty-maven-plugin/src/it/verify-user-feature-it/pom.xml
View file
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
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

0 comments on commit f9dead0

Please sign in to comment.