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/07/27 08:11:17 UTC

svn commit: r1692815 - /felix/trunk/scrplugin/ds-annotations/pom.xml

Author: cziegeler
Date: Mon Jul 27 06:11:16 2015
New Revision: 1692815

URL: http://svn.apache.org/r1692815
Log:
Use latest parent pom and specify java 6 as minimum

Modified:
    felix/trunk/scrplugin/ds-annotations/pom.xml

Modified: felix/trunk/scrplugin/ds-annotations/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/ds-annotations/pom.xml?rev=1692815&r1=1692814&r2=1692815&view=diff
==============================================================================
--- felix/trunk/scrplugin/ds-annotations/pom.xml (original)
+++ felix/trunk/scrplugin/ds-annotations/pom.xml Mon Jul 27 06:11:16 2015
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>felix-parent</artifactId>
-        <version>2.1</version>
+        <version>3</version>
         <relativePath>../../pom/pom.xml</relativePath>
     </parent>
     
@@ -44,11 +44,15 @@
         <url>http://svn.apache.org/repos/asf/felix/scrplugin/ds-annotations</url>
     </scm>
 
+    <properties>
+        <felix.java.version>6</felix.java.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.generator</artifactId>
-            <version>1.12.1-SNAPSHOT</version>
+            <version>1.13.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -74,19 +78,6 @@
                 </includes>
             </resource>
         </resources>
-        <plugins>
-
-          <!-- JDK 1.5 needed for annotation support -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                  <source>1.5</source>
-                  <target>1.5</target>
-                </configuration>
-            </plugin>
-            
-        </plugins>
-  </build>
+    </build>
     
 </project>