diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.core.feature/.project b/eclipse-plugins/edu.wpi.first.wpilib.plugins.core.feature/.project new file mode 100644 index 0000000000..ade1d91b15 --- /dev/null +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.core.feature/.project @@ -0,0 +1,17 @@ + + + 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 new file mode 100644 index 0000000000..c0b4c7e112 --- /dev/null +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/.project b/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/.project new file mode 100644 index 0000000000..10ca0d4f03 --- /dev/null +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/.project @@ -0,0 +1,28 @@ + + + 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 new file mode 100644 index 0000000000..cb3157daa3 --- /dev/null +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.feature/.project @@ -0,0 +1,17 @@ + + + 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 new file mode 100644 index 0000000000..d7ffa026d4 --- /dev/null +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.feature/.project @@ -0,0 +1,17 @@ + + + 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 new file mode 100644 index 0000000000..098194ca4b --- /dev/null +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/.classpath @@ -0,0 +1,7 @@ + + + + + + + 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 new file mode 100644 index 0000000000..8317f12f59 --- /dev/null +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/.project @@ -0,0 +1,28 @@ + + + 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 new file mode 100644 index 0000000000..eedadaa4a7 --- /dev/null +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.feature/.project @@ -0,0 +1,17 @@ + + + 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 new file mode 100644 index 0000000000..098194ca4b --- /dev/null +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/.classpath @@ -0,0 +1,7 @@ + + + + + + + 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 new file mode 100644 index 0000000000..bb3deccb96 --- /dev/null +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/.project @@ -0,0 +1,28 @@ + + + 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 new file mode 100644 index 0000000000..d7a1926954 --- /dev/null +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/.project @@ -0,0 +1,17 @@ + + + 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 new file mode 100644 index 0000000000..098194ca4b --- /dev/null +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/.classpath @@ -0,0 +1,7 @@ + + + + + + + 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 new file mode 100644 index 0000000000..4b17efb32b --- /dev/null +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/.project @@ -0,0 +1,28 @@ + + + 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 new file mode 100644 index 0000000000..c0b4c7e112 --- /dev/null +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/.project b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/.project new file mode 100644 index 0000000000..325460c3af --- /dev/null +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/.project @@ -0,0 +1,28 @@ + + + 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 4f00e6d358..c74a120789 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/pom.xml +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/pom.xml @@ -23,7 +23,6 @@ true - maven-resources-plugin @@ -134,7 +133,6 @@ - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java.feature/.project b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java.feature/.project new file mode 100644 index 0000000000..bd4257bb4d --- /dev/null +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java.feature/.project @@ -0,0 +1,17 @@ + + + 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 new file mode 100644 index 0000000000..c0b4c7e112 --- /dev/null +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/.project b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/.project new file mode 100644 index 0000000000..02b92fbf34 --- /dev/null +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/.project @@ -0,0 +1,34 @@ + + + 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 5e668e56c5..148b79fb98 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/pom.xml +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/pom.xml @@ -40,7 +40,6 @@ true - maven-resources-plugin @@ -207,7 +206,6 @@ - diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.updatesite/.project b/eclipse-plugins/edu.wpi.first.wpilib.plugins.updatesite/.project new file mode 100644 index 0000000000..0bbfd83d3f --- /dev/null +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.updatesite/.project @@ -0,0 +1,17 @@ + + + edu.wpi.first.wpilib.plugins.updatesite + + + + + + org.eclipse.pde.UpdateSiteBuilder + + + + + + org.eclipse.pde.UpdateSiteNature + + diff --git a/pom.xml b/pom.xml index ce3bf52c0f..bff1e22832 100644 --- a/pom.xml +++ b/pom.xml @@ -14,36 +14,34 @@ 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 028de650e7..a2bf252b9b 100644 --- a/wpilibj/wpilibJavaFinal/pom.xml +++ b/wpilibj/wpilibJavaFinal/pom.xml @@ -42,7 +42,6 @@ - org.apache.maven.plugins @@ -113,6 +112,5 @@ -