Author: kwin Date: Mon Sep 18 10:23:03 2017 New Revision: 1808677 URL: http://svn.apache.org/viewvc?rev=1808677&view=rev Log: SLING-7129 no longer set Bundle-RequiredExecutionEnvironment
get rid of the javaversion-maven-plugin Modified: sling/trunk/parent/pom.xml Modified: sling/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/parent/pom.xml?rev=1808677&r1=1808676&r2=1808677&view=diff ============================================================================== --- sling/trunk/parent/pom.xml (original) +++ sling/trunk/parent/pom.xml Mon Sep 18 10:23:03 2017 @@ -111,18 +111,6 @@ <build> <plugins> - <plugin> - <groupId>org.apache.sling</groupId> - <artifactId>javaversion-maven-plugin</artifactId> - <version>1.0.0</version> - <executions> - <execution> - <goals> - <goal>set-java-version</goal> - </goals> - </execution> - </executions> - </plugin> <!-- Require Java 7 or higher for building (as bnd since version 3.0 is built with Java 7) --> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -351,7 +339,6 @@ </Bundle-DocURL> <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Bundle-RequiredExecutionEnvironment>${sling.bree}</Bundle-RequiredExecutionEnvironment> </instructions> </configuration> <executions> @@ -415,7 +402,7 @@ <configuration> <signature> <groupId>org.codehaus.mojo.signature</groupId> - <artifactId>java1${sling.animalSignatures.version}</artifactId> + <artifactId>java1${sling.java.version}</artifactId> <version>1.0</version> </signature> </configuration>