diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.core.feature/.project b/eclipse-plugins/edu.wpi.first.wpilib.plugins.core.feature/.project deleted file mode 100644 index ade1d91b15..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.core.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - edu.wpi.first.wpilib.plugins.core.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/.classpath b/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/.classpath deleted file mode 100644 index c0b4c7e112..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/.project b/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/.project deleted file mode 100644 index 10ca0d4f03..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - edu.wpi.first.wpilib.plugins.core - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.feature/.project b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.feature/.project deleted file mode 100644 index cb3157daa3..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - edu.wpi.first.wpilib.plugins.cpp.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.feature/.project b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.feature/.project deleted file mode 100644 index d7ffa026d4..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/.classpath b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/.classpath deleted file mode 100644 index 098194ca4b..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/.project b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/.project deleted file mode 100644 index 8317f12f59..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - edu.wpi.first.wpilib.plugins.cpp.toolchains.linux - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.feature/.project b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.feature/.project deleted file mode 100644 index eedadaa4a7..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/.classpath b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/.classpath deleted file mode 100644 index 098194ca4b..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/.project b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/.project deleted file mode 100644 index bb3deccb96..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - edu.wpi.first.wpilib.plugins.cpp.toolchains.mac - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/.project b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/.project deleted file mode 100644 index d7a1926954..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/.classpath b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/.classpath deleted file mode 100644 index 098194ca4b..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/.project b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/.project deleted file mode 100644 index 4b17efb32b..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - edu.wpi.first.wpilib.plugins.cpp.toolchains.windows - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/.classpath b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/.classpath deleted file mode 100644 index c0b4c7e112..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/.project b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/.project deleted file mode 100644 index 325460c3af..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - edu.wpi.first.wpilib.plugins.cpp - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/pom.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/pom.xml index c74a120789..4f00e6d358 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/pom.xml +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/pom.xml @@ -23,6 +23,7 @@ true + maven-resources-plugin @@ -133,6 +134,7 @@ + diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java.feature/.project b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java.feature/.project deleted file mode 100644 index bd4257bb4d..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - edu.wpi.first.wpilib.plugins.java.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/.classpath b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/.classpath deleted file mode 100644 index c0b4c7e112..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/.project b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/.project deleted file mode 100644 index 02b92fbf34..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - edu.wpi.first.wpilib.plugins.java - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/pom.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/pom.xml index 148b79fb98..5e668e56c5 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/pom.xml +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/pom.xml @@ -40,6 +40,7 @@ true + maven-resources-plugin @@ -206,6 +207,7 @@ + diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.updatesite/.project b/eclipse-plugins/edu.wpi.first.wpilib.plugins.updatesite/.project deleted file mode 100644 index 0bbfd83d3f..0000000000 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.updatesite/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - edu.wpi.first.wpilib.plugins.updatesite - - - - - - org.eclipse.pde.UpdateSiteBuilder - - - - - - org.eclipse.pde.UpdateSiteNature - - diff --git a/pom.xml b/pom.xml index bff1e22832..ce3bf52c0f 100644 --- a/pom.xml +++ b/pom.xml @@ -14,34 +14,36 @@ driver-station - - - org.apache.maven.plugins - maven-enforcer-plugin - 1.3.1 - - - enforce-maven - - enforce - - - - - - [3.0.0,3.1.0), (3.1.0,) - WPILib has been tested with Maven 3.0.0+. -Note: Maven 3.1.0 is not supported due to Maven bug MNG-5503 (http://jira.codehaus.org/browse/MNG-5503). Please upgrade -to Maven 3.1.1 or later. - - - - - - - - + + + + org.apache.maven.plugins + maven-enforcer-plugin + 1.3.1 + + + enforce-maven + + enforce + + + + + + [3.0.0,3.1.0), (3.1.0,) + WPILib has been tested with Maven 3.0.0+. + Note: Maven 3.1.0 is not supported due to Maven bug MNG-5503 (http://jira.codehaus.org/browse/MNG-5503). Please upgrade + to Maven 3.1.1 or later. + + + + + + + + + diff --git a/wpilibj/wpilibJavaFinal/pom.xml b/wpilibj/wpilibJavaFinal/pom.xml index a2bf252b9b..028de650e7 100644 --- a/wpilibj/wpilibJavaFinal/pom.xml +++ b/wpilibj/wpilibJavaFinal/pom.xml @@ -42,6 +42,7 @@ + org.apache.maven.plugins @@ -112,5 +113,6 @@ +