You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2021/04/06 16:24:36 UTC
[aries] 01/04: build examples so that we can use them for
integration testing
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
commit af64e9bc984532e03bfa23a70fee71b921a28a56
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Sun Apr 4 11:31:05 2021 -0400
build examples so that we can use them for integration testing
Signed-off-by: Raymond Augé <ro...@apache.org>
---
spi-fly/pom.xml | 13 +++++---
spi-fly/spi-fly-core/pom.xml | 1 -
spi-fly/spi-fly-dynamic-bundle/pom.xml | 1 -
.../spi-fly-dynamic-framework-extension/pom.xml | 1 -
spi-fly/spi-fly-examples/pom.xml | 36 +++++++++++++++++++---
.../spi-fly-example-client1-bundle/pom.xml | 16 +++-------
.../spi-fly-example-client2-bundle/pom.xml | 2 +-
.../spi-fly-example-client3-bundle/pom.xml | 6 ++--
.../pom.xml | 14 ++++-----
.../spi-fly-example-resource-client-bundle/pom.xml | 4 +--
spi-fly/spi-fly-static-bundle/pom.xml | 1 -
spi-fly/spi-fly-static-tool/pom.xml | 1 -
12 files changed, 59 insertions(+), 37 deletions(-)
diff --git a/spi-fly/pom.xml b/spi-fly/pom.xml
index f2e55fd..570d344 100644
--- a/spi-fly/pom.xml
+++ b/spi-fly/pom.xml
@@ -49,6 +49,8 @@
<asm.version>9.1</asm.version>
<bnd.version>5.3.0</bnd.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+ <osgi.core.version>5.0.0</osgi.core.version>
+
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
@@ -62,14 +64,17 @@
<module>spi-fly-dynamic-framework-extension</module>
<module>spi-fly-static-tool</module>
<module>spi-fly-static-bundle</module>
- <!--
<module>spi-fly-examples</module>
- -->
</modules>
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <version>${osgi.core.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
@@ -242,8 +247,8 @@
<exclude>**/Readme.md</exclude>
<exclude>**/NOTICE.vm</exclude>
<exclude>**/dependency-reduced-pom.xml</exclude>
- <exclude>spi-fly-examples/**/src/main/resources/META-INF/services/*</exclude>
- <exclude>spi-fly-examples/spi-fly-example-resource-provider-bundle/src/main/resources/org/apache/aries/spifly/test/blah.txt</exclude>
+ <exclude>**/src/main/resources/META-INF/services/*</exclude>
+ <exclude>**/src/main/resources/org/apache/aries/spifly/test/blah.txt</exclude>
<exclude>tck/apply-to-tck.sh</exclude>
</excludes>
</configuration>
diff --git a/spi-fly/spi-fly-core/pom.xml b/spi-fly/spi-fly-core/pom.xml
index 1938258..3390e25 100644
--- a/spi-fly/spi-fly-core/pom.xml
+++ b/spi-fly/spi-fly-core/pom.xml
@@ -50,7 +50,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>5.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/spi-fly/spi-fly-dynamic-bundle/pom.xml b/spi-fly/spi-fly-dynamic-bundle/pom.xml
index 272abc2..4574c55 100644
--- a/spi-fly/spi-fly-dynamic-bundle/pom.xml
+++ b/spi-fly/spi-fly-dynamic-bundle/pom.xml
@@ -76,7 +76,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>5.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/spi-fly/spi-fly-dynamic-framework-extension/pom.xml b/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
index 0d2f1fd..d11227f 100644
--- a/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
+++ b/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
@@ -73,7 +73,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>5.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/spi-fly/spi-fly-examples/pom.xml b/spi-fly/spi-fly-examples/pom.xml
index 40da6a1..489e5a4 100644
--- a/spi-fly/spi-fly-examples/pom.xml
+++ b/spi-fly/spi-fly-examples/pom.xml
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.1.0</version>
- <relativePath>../../parent/pom.xml</relativePath>
+ <groupId>org.apache.aries.spifly</groupId>
+ <artifactId>spifly</artifactId>
+ <version>1.3.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.spifly.examples</groupId>
@@ -37,6 +37,11 @@
SPI examples
</description>
+ <properties>
+ <maven.deploy.skip>true</maven.deploy.skip>
+ <maven.install.skip>true</maven.install.skip>
+ </properties>
+
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</developerConnection>
@@ -60,4 +65,27 @@
<module>spi-fly-example-resource-client-bundle</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <version>${osgi.core.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>5.1.2</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
</project>
diff --git a/spi-fly/spi-fly-examples/spi-fly-example-client1-bundle/pom.xml b/spi-fly/spi-fly-examples/spi-fly-example-client1-bundle/pom.xml
index f091482..bd87751 100644
--- a/spi-fly/spi-fly-examples/spi-fly-example-client1-bundle/pom.xml
+++ b/spi-fly/spi-fly-examples/spi-fly-example-client1-bundle/pom.xml
@@ -31,34 +31,28 @@
<packaging>bundle</packaging>
<name>Apache Aries Example SPI Client Bundle 1</name>
<description>
- A Bundle that uses the java.util.ServiceLoader() API through an embedded library.
+ A Bundle that uses the java.util.ServiceLoader() API through an embedded library.
</description>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.aries.spifly.examples</groupId>
<artifactId>org.apache.aries.spifly.examples.spi.bundle</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.aries.spifly.examples</groupId>
<artifactId>org.apache.aries.spifly.examples.client1.jar</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
</dependencies>
<properties>
diff --git a/spi-fly/spi-fly-examples/spi-fly-example-client2-bundle/pom.xml b/spi-fly/spi-fly-examples/spi-fly-example-client2-bundle/pom.xml
index b0de422..7a4468c 100644
--- a/spi-fly/spi-fly-examples/spi-fly-example-client2-bundle/pom.xml
+++ b/spi-fly/spi-fly-examples/spi-fly-example-client2-bundle/pom.xml
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/spi-fly/spi-fly-examples/spi-fly-example-client3-bundle/pom.xml b/spi-fly/spi-fly-examples/spi-fly-example-client3-bundle/pom.xml
index 7892aa5..447379a 100644
--- a/spi-fly/spi-fly-examples/spi-fly-example-client3-bundle/pom.xml
+++ b/spi-fly/spi-fly-examples/spi-fly-example-client3-bundle/pom.xml
@@ -38,16 +38,16 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.aries.spifly.examples</groupId>
<artifactId>org.apache.aries.spifly.examples.spi.bundle</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
</dependencies>
<properties>
diff --git a/spi-fly/spi-fly-examples/spi-fly-example-provider-consumer-bundle/pom.xml b/spi-fly/spi-fly-examples/spi-fly-example-provider-consumer-bundle/pom.xml
index eefbebb..4448519 100644
--- a/spi-fly/spi-fly-examples/spi-fly-example-provider-consumer-bundle/pom.xml
+++ b/spi-fly/spi-fly-examples/spi-fly-example-provider-consumer-bundle/pom.xml
@@ -40,31 +40,31 @@
<artifactId>org.apache.aries.spifly.examples.spi.bundle</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>org.apache.aries.spifly.examples</groupId>
<artifactId>org.apache.aries.spifly.examples.client1.jar</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.aries.spifly.examples</groupId>
<artifactId>org.apache.aries.spifly.examples.provider1.jar</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
</dependencies>
<properties>
<aries.osgi.export.pkg />
<aries.osgi.private.pkg />
-
+
<!-- this bundle has never been released, we should skip -->
<aries.skip.version.check>true</aries.skip.version.check>
<lastReleaseVersion>1.0.0</lastReleaseVersion>
diff --git a/spi-fly/spi-fly-examples/spi-fly-example-resource-client-bundle/pom.xml b/spi-fly/spi-fly-examples/spi-fly-example-resource-client-bundle/pom.xml
index a0d163e..d9c1702 100644
--- a/spi-fly/spi-fly-examples/spi-fly-example-resource-client-bundle/pom.xml
+++ b/spi-fly/spi-fly-examples/spi-fly-example-resource-client-bundle/pom.xml
@@ -37,9 +37,9 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
</dependencies>
<properties>
diff --git a/spi-fly/spi-fly-static-bundle/pom.xml b/spi-fly/spi-fly-static-bundle/pom.xml
index 59c76c9..b3b3db4 100644
--- a/spi-fly/spi-fly-static-bundle/pom.xml
+++ b/spi-fly/spi-fly-static-bundle/pom.xml
@@ -55,7 +55,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>5.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/spi-fly/spi-fly-static-tool/pom.xml b/spi-fly/spi-fly-static-tool/pom.xml
index 56ae19a..747fbab 100644
--- a/spi-fly/spi-fly-static-tool/pom.xml
+++ b/spi-fly/spi-fly-static-tool/pom.xml
@@ -58,7 +58,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>5.0.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>