Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvladt2010-12-21 17:09:01 -0500
committervladt2010-12-21 17:09:01 -0500
commitfa171eb24b99f7d69b14f11a023c23e925167a68 (patch)
tree1d9bc4baf30bfe91cdbdaba1f192f4a94563460b
parenteffbce286ca860f2c0e588df1933d42f2d6d17bd (diff)
downloadm2e-core-fa171eb24b99f7d69b14f11a023c23e925167a68.tar.gz
m2e-core-fa171eb24b99f7d69b14f11a023c23e925167a68.tar.xz
m2e-core-fa171eb24b99f7d69b14f11a023c23e925167a68.zip
Cleanup
-rw-r--r--org.eclipse.m2e.cliresolver/.settings/org.maven.ide.eclipse.prefs8
-rw-r--r--org.eclipse.m2e.cliresolver30/.settings/org.maven.ide.eclipse.prefs8
-rw-r--r--org.eclipse.m2e.logging/.classpath6
-rw-r--r--org.eclipse.m2e.logging/.project6
-rw-r--r--org.eclipse.m2e.logging/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--org.eclipse.m2e.logging/.settings/org.maven.ide.eclipse.prefs8
-rw-r--r--org.eclipse.m2e.logging/META-INF/MANIFEST.MF5
-rw-r--r--org.eclipse.m2e.logging/build.properties2
-rw-r--r--org.eclipse.m2e.slf4j.bridge/.classpath6
-rw-r--r--org.eclipse.m2e.slf4j.bridge/.gitignore2
-rw-r--r--org.eclipse.m2e.slf4j.bridge/.project6
-rw-r--r--org.eclipse.m2e.slf4j.bridge/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--org.eclipse.m2e.slf4j.bridge/.settings/org.maven.ide.eclipse.prefs8
-rw-r--r--org.eclipse.m2e.slf4j.bridge/META-INF/MANIFEST.MF5
-rw-r--r--org.eclipse.m2e.slf4j.bridge/build.properties2
15 files changed, 67 insertions, 21 deletions
diff --git a/org.eclipse.m2e.cliresolver/.settings/org.maven.ide.eclipse.prefs b/org.eclipse.m2e.cliresolver/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 00000000..1a193f68
--- /dev/null
+++ b/org.eclipse.m2e.cliresolver/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,8 @@
+#Tue Dec 21 16:49:56 EST 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/org.eclipse.m2e.cliresolver30/.settings/org.maven.ide.eclipse.prefs b/org.eclipse.m2e.cliresolver30/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 00000000..1a193f68
--- /dev/null
+++ b/org.eclipse.m2e.cliresolver30/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,8 @@
+#Tue Dec 21 16:49:56 EST 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/org.eclipse.m2e.logging/.classpath b/org.eclipse.m2e.logging/.classpath
index ad32c83a..798048dd 100644
--- a/org.eclipse.m2e.logging/.classpath
+++ b/org.eclipse.m2e.logging/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <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.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.m2e.logging/.project b/org.eclipse.m2e.logging/.project
index 79dadda6..48408bc8 100644
--- a/org.eclipse.m2e.logging/.project
+++ b/org.eclipse.m2e.logging/.project
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/org.eclipse.m2e.logging/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.logging/.settings/org.eclipse.jdt.core.prefs
index d79b6443..1199a4ec 100644
--- a/org.eclipse.m2e.logging/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.m2e.logging/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
-#Fri Dec 17 15:19:34 EST 2010
+#Tue Dec 21 16:08:48 EST 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.eclipse.m2e.logging/.settings/org.maven.ide.eclipse.prefs b/org.eclipse.m2e.logging/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 00000000..e2ca46f9
--- /dev/null
+++ b/org.eclipse.m2e.logging/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,8 @@
+#Tue Dec 21 16:08:47 EST 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/org.eclipse.m2e.logging/META-INF/MANIFEST.MF b/org.eclipse.m2e.logging/META-INF/MANIFEST.MF
index 54681e6a..98be5a1f 100644
--- a/org.eclipse.m2e.logging/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.logging/META-INF/MANIFEST.MF
@@ -3,11 +3,12 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-SymbolicName: org.eclipse.m2e.logging
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.13.0.qualifier
Bundle-Activator: org.eclipse.m2e.internal.logging.LogPlugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
ch.qos.logback.classic;bundle-version="0.9.19",
ch.qos.logback.core;bundle-version="0.9.19",
org.slf4j.api;bundle-version="1.5.11"
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,
+ JavaSE-1.6
diff --git a/org.eclipse.m2e.logging/build.properties b/org.eclipse.m2e.logging/build.properties
index c3472c8b..e5f876ad 100644
--- a/org.eclipse.m2e.logging/build.properties
+++ b/org.eclipse.m2e.logging/build.properties
@@ -1,5 +1,5 @@
source.. = src/
-output.. = bin/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
defaultLogbackConfiguration/,\
diff --git a/org.eclipse.m2e.slf4j.bridge/.classpath b/org.eclipse.m2e.slf4j.bridge/.classpath
index ad32c83a..798048dd 100644
--- a/org.eclipse.m2e.slf4j.bridge/.classpath
+++ b/org.eclipse.m2e.slf4j.bridge/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <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.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.m2e.slf4j.bridge/.gitignore b/org.eclipse.m2e.slf4j.bridge/.gitignore
index 5e56e040..ea8c4bf7 100644
--- a/org.eclipse.m2e.slf4j.bridge/.gitignore
+++ b/org.eclipse.m2e.slf4j.bridge/.gitignore
@@ -1 +1 @@
-/bin
+/target
diff --git a/org.eclipse.m2e.slf4j.bridge/.project b/org.eclipse.m2e.slf4j.bridge/.project
index a3870293..d29d417e 100644
--- a/org.eclipse.m2e.slf4j.bridge/.project
+++ b/org.eclipse.m2e.slf4j.bridge/.project
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/org.eclipse.m2e.slf4j.bridge/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.slf4j.bridge/.settings/org.eclipse.jdt.core.prefs
index 580dc4af..1ab31ba3 100644
--- a/org.eclipse.m2e.slf4j.bridge/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.m2e.slf4j.bridge/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
-#Fri Dec 17 16:46:19 EST 2010
+#Tue Dec 21 17:05:48 EST 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.eclipse.m2e.slf4j.bridge/.settings/org.maven.ide.eclipse.prefs b/org.eclipse.m2e.slf4j.bridge/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 00000000..e2ca46f9
--- /dev/null
+++ b/org.eclipse.m2e.slf4j.bridge/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,8 @@
+#Tue Dec 21 16:08:47 EST 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/org.eclipse.m2e.slf4j.bridge/META-INF/MANIFEST.MF b/org.eclipse.m2e.slf4j.bridge/META-INF/MANIFEST.MF
index 786cfc3f..445e75ba 100644
--- a/org.eclipse.m2e.slf4j.bridge/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.slf4j.bridge/META-INF/MANIFEST.MF
@@ -2,10 +2,11 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.m2e.slf4j.bridge
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.13.0.qualifier
Bundle-Activator: org.eclipse.m2e.internal.slf4j.bridge.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
org.slf4j.api;bundle-version="1.5.11"
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,
+ JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.m2e.slf4j.bridge/build.properties b/org.eclipse.m2e.slf4j.bridge/build.properties
index ef93fc51..d3835e37 100644
--- a/org.eclipse.m2e.slf4j.bridge/build.properties
+++ b/org.eclipse.m2e.slf4j.bridge/build.properties
@@ -1,5 +1,5 @@
source.. = src/
-output.. = bin/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
OSGI-INF/l10n/bundle.properties

Back to the top