Author: aadamchik
Date: Mon Mar 19 06:27:03 2012
New Revision: 1302287
URL: http://svn.apache.org/viewvc?rev=1302287&view=rev
Log:
upgrading to the new M2E plugin
Added:
cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/.settings/org.eclipse.m2e.core.prefs
Modified:
cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/.classpath
cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/.project
cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/.settings/org.eclipse.jdt.core.prefs
Modified: cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/.classpath
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/.classpath?rev=1302287&r1=1302286&r2=1302287&view=diff
==============================================================================
--- cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/.classpath
(original)
+++ cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/.classpath Mon
Mar 19 06:27:03 2012
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes"
path="src/main/java"/>
- <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/build-tools/maven-cayenne-build-plugin/.project
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/.project?rev=1302287&r1=1302286&r2=1302287&view=diff
==============================================================================
--- cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/.project
(original)
+++ cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/.project Mon Mar
19 06:27:03 2012
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>maven-cayenne-build-plugin</name>
+ <comment></comment>
<projects>
</projects>
<buildSpec>
@@ -14,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>
Modified:
cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/.settings/org.eclipse.jdt.core.prefs?rev=1302287&r1=1302286&r2=1302287&view=diff
==============================================================================
---
cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/.settings/org.eclipse.jdt.core.prefs
(original)
+++
cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/.settings/org.eclipse.jdt.core.prefs
Mon Mar 19 06:27:03 2012
@@ -1,9 +1,9 @@
-#Sun May 17 23:03:03 EEST 2009
+#Fri Mar 16 17:54:05 EDT 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -19,7 +19,7 @@ org.eclipse.jdt.core.compiler.problem.en
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
@@ -54,7 +54,7 @@ org.eclipse.jdt.core.compiler.problem.un
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=48
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
Added:
cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/.settings/org.eclipse.m2e.core.prefs
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/.settings/org.eclipse.m2e.core.prefs?rev=1302287&view=auto
==============================================================================
---
cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/.settings/org.eclipse.m2e.core.prefs
(added)
+++
cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/.settings/org.eclipse.m2e.core.prefs
Mon Mar 19 06:27:03 2012
@@ -0,0 +1,5 @@
+#Fri Mar 16 17:54:01 EDT 2012
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
