You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/05/19 08:57:11 UTC
svn commit: r1124562 - /karaf/branches/karaf-2.2.x/pom.xml
Author: jbonofre
Date: Thu May 19 06:57:11 2011
New Revision: 1124562
URL: http://svn.apache.org/viewvc?rev=1124562&view=rev
Log:
[KARAF-648] Force usage of maven-enforcer-plugin.
Modified:
karaf/branches/karaf-2.2.x/pom.xml
Modified: karaf/branches/karaf-2.2.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/pom.xml?rev=1124562&r1=1124561&r2=1124562&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/pom.xml Thu May 19 06:57:11 2011
@@ -1042,7 +1042,7 @@
<version>${felix.plugin.version}</version>
<extensions>true</extensions>
<configuration>
- <instructions>
+ <instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<_versionpolicy>${bnd.version.policy}</_versionpolicy>
@@ -1113,6 +1113,29 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>enforce-versions</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[2.2.1,3)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <version>[1.5,1.6)</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
@@ -1147,9 +1170,9 @@
<id>copy-notice</id>
<phase>generate-resources</phase>
<configuration>
- <tasks>
+ <target>
<copy file="NOTICE" todir="target/maven-shared-archive-resources/META-INF" failonerror="false" overwrite="true" />
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -1270,29 +1293,6 @@
</modules>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>enforce-versions</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>[2.2.1,3)</version>
- </requireMavenVersion>
- <requireJavaVersion>
- <version>1.6</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
<!-- We want to deploy the artifact to a staging location for perusal -->
<plugin>
<inherited>true</inherited>