You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2018/04/23 06:41:48 UTC
svn commit: r1829816 - in /felix/trunk/osgi-r7/configurator: pom.xml
src/main/java/org/osgi/
Author: cziegeler
Date: Mon Apr 23 06:41:47 2018
New Revision: 1829816
URL: http://svn.apache.org/viewvc?rev=1829816&view=rev
Log:
Use released R7 apis
Removed:
felix/trunk/osgi-r7/configurator/src/main/java/org/osgi/
Modified:
felix/trunk/osgi-r7/configurator/pom.xml
Modified: felix/trunk/osgi-r7/configurator/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configurator/pom.xml?rev=1829816&r1=1829815&r2=1829816&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configurator/pom.xml (original)
+++ felix/trunk/osgi-r7/configurator/pom.xml Mon Apr 23 06:41:47 2018
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>4</version>
+ <version>5</version>
<relativePath/>
</parent>
@@ -41,16 +41,12 @@
<url>http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configurator</url>
</scm>
- <properties>
- <felix.java.version>7</felix.java.version>
- </properties>
-
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.5.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -64,6 +60,9 @@
org.osgi.service.log;resolution:=optional,
*
</Import-Package>
+ <Export-Package>
+ org.osgi.service.configurator
+ </Export-Package>
<DynamicImport-Package>
org.osgi.service.coordinator;version="[1.0,2)",
org.osgi.service.log;version="[1.3,2)"
@@ -119,9 +118,15 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <version>1.6.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.configurator</artifactId>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -136,5 +141,17 @@
<version>1.0.2</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>2.17.0</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>