Author: justin
Date: Tue Aug 2 02:09:56 2011
New Revision: 1152997
URL: http://svn.apache.org/viewvc?rev=1152997&view=rev
Log:
SLING-2164 - suppressing m2eclipse errors
Modified:
sling/trunk/bundles/commons/log/pom.xml
sling/trunk/parent/pom.xml
sling/trunk/samples/accessmanager-ui/pom.xml
Modified: sling/trunk/bundles/commons/log/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/log/pom.xml?rev=1152997&r1=1152996&r2=1152997&view=diff
==============================================================================
--- sling/trunk/bundles/commons/log/pom.xml (original)
+++ sling/trunk/bundles/commons/log/pom.xml Tue Aug 2 02:09:56 2011
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>10</version>
+ <version>11-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: sling/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/parent/pom.xml?rev=1152997&r1=1152996&r2=1152997&view=diff
==============================================================================
--- sling/trunk/parent/pom.xml (original)
+++ sling/trunk/parent/pom.xml Tue Aug 2 02:09:56 2011
@@ -333,6 +333,177 @@ on 64bit platforms: MAVEN_OPTS="-Xmx512M
<artifactId>emma-maven-plugin</artifactId>
<version>1.0-alpha-3</version>
</plugin>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.felix
+ </groupId>
+ <artifactId>
+ maven-scr-plugin
+ </artifactId>
+ <versionRange>
+ [1.7.2,)
+ </versionRange>
+ <goals>
+ <goal>scr</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-antrun-plugin
+ </artifactId>
+ <versionRange>
+ [1.3,)
+ </versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-dependency-plugin
+ </artifactId>
+ <versionRange>
+ [2.2,)
+ </versionRange>
+ <goals>
+ <goal>copy-dependencies</goal>
+ <goal>unpack</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.codehaus.groovy.maven
+ </groupId>
+ <artifactId>
+ gmaven-plugin
+ </artifactId>
+ <versionRange>
+ [1.0,)
+ </versionRange>
+ <goals>
+ <goal>compile</goal>
+ <goal>testCompile</goal>
+ <goal>execute</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.codehaus.mojo
+ </groupId>
+ <artifactId>
+ build-helper-maven-plugin
+ </artifactId>
+ <versionRange>
+ [1.5,)
+ </versionRange>
+ <goals>
+ <goal>
+ reserve-network-port
+ </goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.sling
+ </groupId>
+ <artifactId>
+ maven-launchpad-plugin
+ </artifactId>
+ <versionRange>
+ [2.0.10,)
+ </versionRange>
+ <goals>
+ <goal>prepare-package</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.sling
+ </groupId>
+ <artifactId>
+ maven-jcrocm-plugin
+ </artifactId>
+ <versionRange>
+ [2.0.4-incubator,)
+ </versionRange>
+ <goals>
+ <goal>ocm</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-dependency-plugin
+ </artifactId>
+ <versionRange>
+ [2.2,)
+ </versionRange>
+ <goals>
+ <goal>
+ unpack-dependencies
+ </goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
Modified: sling/trunk/samples/accessmanager-ui/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/samples/accessmanager-ui/pom.xml?rev=1152997&r1=1152996&r2=1152997&view=diff
==============================================================================
--- sling/trunk/samples/accessmanager-ui/pom.xml (original)
+++ sling/trunk/samples/accessmanager-ui/pom.xml Tue Aug 2 02:09:56 2011
@@ -114,6 +114,39 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ net.alchim31.maven
+ </groupId>
+ <artifactId>
+ yuicompressor-maven-plugin
+ </artifactId>
+ <versionRange>[1.2,)</versionRange>
+ <goals>
+ <goal>compress</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<reporting>