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:14:56 UTC
svn commit: r1692818 - in /felix/trunk/scrplugin: bnd-scr-plugin/pom.xml
maven-scr-plugin/pom.xml
Author: cziegeler
Date: Mon Jul 27 06:14:56 2015
New Revision: 1692818
URL: http://svn.apache.org/r1692818
Log:
Use latest parent pom and specify java 6 as minimum
Modified:
felix/trunk/scrplugin/bnd-scr-plugin/pom.xml
felix/trunk/scrplugin/maven-scr-plugin/pom.xml
Modified: felix/trunk/scrplugin/bnd-scr-plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/bnd-scr-plugin/pom.xml?rev=1692818&r1=1692817&r2=1692818&view=diff
==============================================================================
--- felix/trunk/scrplugin/bnd-scr-plugin/pom.xml (original)
+++ felix/trunk/scrplugin/bnd-scr-plugin/pom.xml Mon Jul 27 06:14:56 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>
@@ -45,6 +45,10 @@
<url>http://svn.apache.org/repos/asf/felix/scrplugin/bnd-scr-plugin</url>
</scm>
+ <properties>
+ <felix.java.version>6</felix.java.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -134,15 +138,6 @@
</execution>
</executions>
</plugin>
- <!-- 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>
</project>
Modified: felix/trunk/scrplugin/maven-scr-plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/pom.xml?rev=1692818&r1=1692817&r2=1692818&view=diff
==============================================================================
--- felix/trunk/scrplugin/maven-scr-plugin/pom.xml (original)
+++ felix/trunk/scrplugin/maven-scr-plugin/pom.xml Mon Jul 27 06:14:56 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>
@@ -43,6 +43,10 @@
<url>http://svn.apache.org/repos/asf/felix/scrplugin/maven-scr-plugin</url>
</scm>
+ <properties>
+ <felix.java.version>6</felix.java.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -69,16 +73,7 @@
<build>
<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>
- <plugin>
+ <plugin>
<artifactId>maven-invoker-plugin</artifactId>
<version>1.7</version>
<configuration>