Author: aadamchik
Date: Mon Mar 19 06:27:21 2012
New Revision: 1302288
URL: http://svn.apache.org/viewvc?rev=1302288&view=rev
Log:
upgrading to the new M2E plugin
Added:
cayenne/main/trunk/framework/cayenne-di-unpublished/.settings/org.eclipse.core.resources.prefs
cayenne/main/trunk/framework/cayenne-di-unpublished/.settings/org.eclipse.m2e.core.prefs
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.settings/org.eclipse.core.resources.prefs
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.settings/org.eclipse.m2e.core.prefs
Modified:
cayenne/main/trunk/framework/cayenne-di-unpublished/.classpath
cayenne/main/trunk/framework/cayenne-di-unpublished/.project
cayenne/main/trunk/framework/cayenne-di-unpublished/.settings/org.eclipse.jdt.core.prefs
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.classpath
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.project
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.settings/org.eclipse.jdt.core.prefs
cayenne/main/trunk/pom.xml
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/.classpath
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/.classpath?rev=1302288&r1=1302287&r2=1302288&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/.classpath (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/.classpath Mon Mar 19
06:27:21 2012
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes"
path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes"
path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes"
path="src/test/java"/>
- <classpathentry kind="src" path="src/main/resources"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con"
path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/.project
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/.project?rev=1302288&r1=1302287&r2=1302288&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/.project (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/.project Mon Mar 19
06:27:21 2012
@@ -15,8 +15,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
Added:
cayenne/main/trunk/framework/cayenne-di-unpublished/.settings/org.eclipse.core.resources.prefs
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/.settings/org.eclipse.core.resources.prefs?rev=1302288&view=auto
==============================================================================
---
cayenne/main/trunk/framework/cayenne-di-unpublished/.settings/org.eclipse.core.resources.prefs
(added)
+++
cayenne/main/trunk/framework/cayenne-di-unpublished/.settings/org.eclipse.core.resources.prefs
Mon Mar 19 06:27:21 2012
@@ -0,0 +1,3 @@
+#Fri Mar 16 17:56:30 EDT 2012
+eclipse.preferences.version=1
+encoding//src/main/resources=UTF-8
Modified:
cayenne/main/trunk/framework/cayenne-di-unpublished/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/.settings/org.eclipse.jdt.core.prefs?rev=1302288&r1=1302287&r2=1302288&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-di-unpublished/.settings/org.eclipse.jdt.core.prefs
(original)
+++
cayenne/main/trunk/framework/cayenne-di-unpublished/.settings/org.eclipse.jdt.core.prefs
Mon Mar 19 06:27:21 2012
@@ -1,4 +1,4 @@
-#Sun Apr 19 22:20:37 EST 2009
+#Fri Mar 16 17:56:31 EDT 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
@@ -23,7 +23,7 @@ org.eclipse.jdt.core.compiler.problem.fa
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
Added:
cayenne/main/trunk/framework/cayenne-di-unpublished/.settings/org.eclipse.m2e.core.prefs
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/.settings/org.eclipse.m2e.core.prefs?rev=1302288&view=auto
==============================================================================
---
cayenne/main/trunk/framework/cayenne-di-unpublished/.settings/org.eclipse.m2e.core.prefs
(added)
+++
cayenne/main/trunk/framework/cayenne-di-unpublished/.settings/org.eclipse.m2e.core.prefs
Mon Mar 19 06:27:21 2012
@@ -0,0 +1,5 @@
+#Fri Mar 16 17:56:28 EDT 2012
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.classpath
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.classpath?rev=1302288&r1=1302287&r2=1302288&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.classpath
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.classpath Mon Mar
19 06:27:21 2012
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry output="target/test-classes" kind="src"
path="src/test/java"/>
- <classpathentry kind="src" path="src/main/resources"/>
- <classpathentry excluding="**/*.java" output="target/test-classes"
kind="src" path="src/test/resources"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" output="target/classes"
path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes"
path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes"
path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes"
path="src/test/resources"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con"
path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
-
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.project
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.project?rev=1302288&r1=1302287&r2=1302288&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.project (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.project Mon Mar 19
06:27:21 2012
@@ -15,8 +15,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
Added:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.settings/org.eclipse.core.resources.prefs
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.settings/org.eclipse.core.resources.prefs?rev=1302288&view=auto
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.settings/org.eclipse.core.resources.prefs
(added)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.settings/org.eclipse.core.resources.prefs
Mon Mar 19 06:27:21 2012
@@ -0,0 +1,4 @@
+#Fri Mar 16 17:56:30 EDT 2012
+eclipse.preferences.version=1
+encoding//src/main/resources=UTF-8
+encoding//src/test/resources=UTF-8
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.settings/org.eclipse.jdt.core.prefs?rev=1302288&r1=1302287&r2=1302288&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.settings/org.eclipse.jdt.core.prefs
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.settings/org.eclipse.jdt.core.prefs
Mon Mar 19 06:27:21 2012
@@ -1,4 +1,4 @@
-#Sun Apr 19 22:20:37 EST 2009
+#Fri Mar 16 17:56:30 EDT 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
@@ -23,7 +23,7 @@ org.eclipse.jdt.core.compiler.problem.fa
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
Added:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.settings/org.eclipse.m2e.core.prefs
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.settings/org.eclipse.m2e.core.prefs?rev=1302288&view=auto
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.settings/org.eclipse.m2e.core.prefs
(added)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/.settings/org.eclipse.m2e.core.prefs
Mon Mar 19 06:27:21 2012
@@ -0,0 +1,5 @@
+#Fri Mar 16 17:56:28 EDT 2012
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
Modified: cayenne/main/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/pom.xml?rev=1302288&r1=1302287&r2=1302288&view=diff
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Mon Mar 19 06:27:21 2012
@@ -504,6 +504,57 @@
<pluginManagement>
<plugins>
+ <!-- M2Eclipse configuration. Has no effect for
command line builds -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+
<artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+
<pluginExecution>
+
<pluginExecutionFilter>
+
<groupId>org.apache.cayenne.build-tools</groupId>
+
<artifactId>maven-cayenne-build-plugin</artifactId>
+
<versionRange>[1.0,)</versionRange>
+
<goals>
+
<goal>date</goal>
+
</goals>
+
</pluginExecutionFilter>
+ <action>
+
<ignore />
+
</action>
+
</pluginExecution>
+
<pluginExecution>
+
<pluginExecutionFilter>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-antrun-plugin</artifactId>
+
<versionRange>[1.0,)</versionRange>
+
<goals>
+
<goal>run</goal>
+
</goals>
+
</pluginExecutionFilter>
+ <action>
+
<ignore />
+
</action>
+
</pluginExecution>
+
<pluginExecution>
+
<pluginExecutionFilter>
+
<groupId>org.codehaus.mojo</groupId>
+
<artifactId>javacc-maven-plugin</artifactId>
+
<versionRange>[1.0,)</versionRange>
+
<goals>
+
<goal>jjtree-javacc</goal>
+
</goals>
+
</pluginExecutionFilter>
+ <action>
+
<ignore />
+
</action>
+
</pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.cayenne.build-tools</groupId>
<artifactId>maven-cayenne-build-plugin</artifactId>
