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 2015/08/06 05:37:20 UTC
svn commit: r1694396 - /felix/trunk/scr-compat/pom.xml
Author: cziegeler
Date: Thu Aug 6 03:37:20 2015
New Revision: 1694396
URL: http://svn.apache.org/r1694396
Log:
Use offical R6 compendium jar
Modified:
felix/trunk/scr-compat/pom.xml
Modified: felix/trunk/scr-compat/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scr-compat/pom.xml?rev=1694396&r1=1694395&r2=1694396&view=diff
==============================================================================
--- felix/trunk/scr-compat/pom.xml (original)
+++ felix/trunk/scr-compat/pom.xml Thu Aug 6 03:37:20 2015
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>2.1</version>
+ <version>3</version>
<relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,20 +40,20 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>6.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.annotation</artifactId>
- <version>6.0.0</version>
+ <artifactId>osgi.annotation</artifactId>
+ <version>6.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.enterprise</artifactId>
- <version>5.0.0</version>
+ <artifactId>osgi.cmpn</artifactId>
+ <version>6.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -79,43 +79,6 @@
</instructions>
</configuration>
</plugin>
-
- <!--
- Ensure not using too recent Java API
- - Ensure Java 5 API
- -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.7</version>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java15</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!--
- Configure default compilation for Java 5
- -->
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>