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 2019/07/03 18:34:27 UTC
[aries] 02/02: ARIES-1918 Move felix framework dependency from
runtime to test
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 85ba548171ce1e02f3aa3cc6dc94b5a7e485089b
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Wed Jul 3 14:33:26 2019 -0400
ARIES-1918 Move felix framework dependency from runtime to test
Signed-off-by: Raymond Augé <ro...@apache.org>
---
spi-fly/spi-fly-dynamic-bundle/pom.xml | 9 +++++++--
spi-fly/spi-fly-dynamic-bundle/resolve.bndrun | 2 +-
spi-fly/spi-fly-dynamic-framework-extension/pom.xml | 9 +++++++--
spi-fly/spi-fly-static-bundle/pom.xml | 9 +++++++--
spi-fly/spi-fly-static-bundle/resolve.bndrun | 2 +-
5 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/spi-fly/spi-fly-dynamic-bundle/pom.xml b/spi-fly/spi-fly-dynamic-bundle/pom.xml
index 95f19ac..f06634d 100644
--- a/spi-fly/spi-fly-dynamic-bundle/pom.xml
+++ b/spi-fly/spi-fly-dynamic-bundle/pom.xml
@@ -48,7 +48,7 @@
<properties>
<asm.version>7.1</asm.version>
- <bnd.version>4.1.0</bnd.version>
+ <bnd.version>4.2.0</bnd.version>
</properties>
<dependencies>
@@ -99,7 +99,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>6.0.1</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -180,6 +180,11 @@
<version>${bnd.version}</version>
<configuration>
<failOnChanges>false</failOnChanges>
+ <scopes>
+ <scope>compile</scope>
+ <scope>runtime</scope>
+ <scope>test</scope>
+ </scopes>
<bndruns>
<bndrun>resolve.bndrun</bndrun>
</bndruns>
diff --git a/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun b/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun
index 7090b38..82339bb 100644
--- a/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun
+++ b/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun
@@ -15,4 +15,4 @@
-runee: JavaSE-1.8
-runfw: org.apache.felix.framework
-runrequires: osgi.identity;filter:='(osgi.identity=${project.artifactId})'
--runbundles: org.apache.aries.spifly.dynamic.bundle;version='[1.2.2,1.2.3)'
+-runbundles: org.apache.aries.spifly.dynamic.bundle;version='[1.2.3,1.2.4)'
diff --git a/spi-fly/spi-fly-dynamic-framework-extension/pom.xml b/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
index d3abbb9..d1ac08d 100644
--- a/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
+++ b/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
@@ -48,7 +48,7 @@
<properties>
<asm.version>7.1</asm.version>
- <bnd.version>4.1.0</bnd.version>
+ <bnd.version>4.2.0</bnd.version>
</properties>
<dependencies>
@@ -87,7 +87,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>6.0.1</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -168,6 +168,11 @@
<version>${bnd.version}</version>
<configuration>
<failOnChanges>false</failOnChanges>
+ <scopes>
+ <scope>compile</scope>
+ <scope>runtime</scope>
+ <scope>test</scope>
+ </scopes>
<bndruns>
<bndrun>resolve.bndrun</bndrun>
</bndruns>
diff --git a/spi-fly/spi-fly-static-bundle/pom.xml b/spi-fly/spi-fly-static-bundle/pom.xml
index b56f97c..15d1c2a 100644
--- a/spi-fly/spi-fly-static-bundle/pom.xml
+++ b/spi-fly/spi-fly-static-bundle/pom.xml
@@ -47,7 +47,7 @@
</scm>
<properties>
- <bnd.version>4.1.0</bnd.version>
+ <bnd.version>4.2.0</bnd.version>
</properties>
<dependencies>
@@ -74,7 +74,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>6.0.1</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
</dependencies>
@@ -136,6 +136,11 @@
<version>${bnd.version}</version>
<configuration>
<failOnChanges>false</failOnChanges>
+ <scopes>
+ <scope>compile</scope>
+ <scope>runtime</scope>
+ <scope>test</scope>
+ </scopes>
<bndruns>
<bndrun>resolve.bndrun</bndrun>
</bndruns>
diff --git a/spi-fly/spi-fly-static-bundle/resolve.bndrun b/spi-fly/spi-fly-static-bundle/resolve.bndrun
index 3e51594..7b42744 100644
--- a/spi-fly/spi-fly-static-bundle/resolve.bndrun
+++ b/spi-fly/spi-fly-static-bundle/resolve.bndrun
@@ -15,4 +15,4 @@
-runee: JavaSE-1.8
-runfw: org.apache.felix.framework
-runrequires: osgi.identity;filter:='(osgi.identity=${project.artifactId})'
--runbundles: org.apache.aries.spifly.static.bundle;version='[1.2.2,1.2.3)'
+-runbundles: org.apache.aries.spifly.static.bundle;version='[1.2.3,1.2.4)'