FELIX-3177 Replace temp. inclusion of OSGi source by offical class inclusion
- Compile with source/target 1.5
- Check for Java 5 API signature
- Use BND annotations for exports
- Include modified Core 4.1 ServiceReference (generified with service class)
in source but not in final bundle. This helps compiling against Compendium 4.3
library while allowing to still use Core 4.1 dependency. Thus ensuring
minimal framework requirement (Core 4.1)
- update OSGi Alliance copyright year
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1344193 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/configadmin/pom.xml b/configadmin/pom.xml
index a6e05e0..8dd9426 100644
--- a/configadmin/pom.xml
+++ b/configadmin/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>2</version>
+ <version>2.1</version>
<relativePath>../pom/pom.xml</relativePath>
</parent>
@@ -74,8 +74,6 @@
<bundle.file.name>
${bundle.build.name}/${project.build.finalName}.jar
</bundle.file.name>
-
- <api-package-version>1.0</api-package-version>
</properties>
@@ -83,16 +81,24 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.0.0</version>
+ <version>4.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
+ <version>4.3.0</version>
<scope>provided</scope>
</dependency>
-
+
+ <!-- BND export annotations -->
+ <dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bndlib</artifactId>
+ <version>1.50.0</version>
+ <scope>provided</scope>
+ </dependency>
+
<!-- Integration Testing with Pax Exam -->
<dependency>
<groupId>junit</groupId>
@@ -147,19 +153,17 @@
org.apache.felix.cm.impl.ConfigurationManager
</Bundle-Activator>
<Export-Package>
+ <!-- just list, version from package-info classes -->
org.apache.felix.cm;
- org.apache.felix.cm.file;version=${api-package-version};provide:=true,
- org.osgi.service.cm;version=1.4;-split-package:=merge-first;provide:=true
+ org.apache.felix.cm.file,
+ org.osgi.service.cm;provide:=true
</Export-Package>
<Private-Package>
org.apache.felix.cm.impl,
org.osgi.util.tracker
</Private-Package>
- <Import-Package>
- org.osgi.service.cm;version="[1.4,1.5)",
- *
- </Import-Package>
<DynamicImport-Package>
+ <!-- overwrite version from compendium bundle -->
org.osgi.service.log;version="1.3"
</DynamicImport-Package>
<Export-Service>
@@ -178,7 +182,6 @@
</instructions>
</configuration>
</plugin>
- <!-- Make sure to not use non Java 1.3 API -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
@@ -186,7 +189,7 @@
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java13-sun</artifactId>
+ <artifactId>java15</artifactId>
<version>1.0</version>
</signature>
</configuration>
@@ -199,40 +202,13 @@
</execution>
</executions>
</plugin>
- <!--
- configure default compilation for Java 1.3 and integration
- test compilation for Java 5 (since integration tests use
- Java Annotations for Pax Exam)
- -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>test-compile-java5</id>
- <goals>
- <goal>testCompile</goal>
- </goals>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <testExcludes>
- <testExclude>**/cm/*</testExclude>
- <testExclude>**/cm/file/*</testExclude>
- <testExclude>**/cm/impl/**</testExclude>
- </testExcludes>
- <testIncludes>
- <testInclude>**/integration/**</testInclude>
- </testIncludes>
- </configuration>
- </execution>
- </executions>
<configuration>
- <testExcludes>
- <testExclude>**/integration/**</testExclude>
- </testExcludes>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
</plugin>
-
<!--
Exclude Integration tests in (default) unit tests and
conversely enable integration tests for integration testing