Bug 534862 - [releng] stop using jsr14 as a targetR3_10_0R3_10_maintenance

Class files built using the transitional jsr14 target are no longer
treated specially by modern Javas (7 and newer, which Eclipse
Platform now requires.) Support for jsr14 was never a documented and
supported option in the JDK and the target was finally removed from
javac in Java 8.

Change-Id: Ic6b3a7e4d69905e42b9e87dd42dc6fa8b95fbc05
Signed-off-by: Mat Booth <mat.booth@redhat.com>

3 files changed, 3 insertions, 18 deletions

diff --git a/xpath/bundles/org.eclipse.wst.xml.xpath2.processor/.settings/org.eclipse.jdt.core.prefs b/xpath/bundles/org.eclipse.wst.xml.xpath2.processor/.settings/org.eclipse.jdt.core.prefs
index bd21bd64f3..eb1cb4cf94 100644
--- a/xpath/bundles/org.eclipse.wst.xml.xpath2.processor/.settings/org.eclipse.jdt.core.prefs
+++ b/xpath/bundles/org.eclipse.wst.xml.xpath2.processor/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
-#Sat Mar 12 09:20:38 CET 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=jsr14
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+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
diff --git a/xpath/bundles/org.eclipse.wst.xml.xpath2.processor/build.properties b/xpath/bundles/org.eclipse.wst.xml.xpath2.processor/build.properties
index 328c30f318..4dc4023317 100644
--- a/xpath/bundles/org.eclipse.wst.xml.xpath2.processor/build.properties
+++ b/xpath/bundles/org.eclipse.wst.xml.xpath2.processor/build.properties
@@ -7,6 +7,3 @@ source.. = src/
 output.. = bin/
 src.includes = about.html,\
                grammars/
-javacSource = 1.5
-javacTarget = jsr14
-javacErrors.. = -enumIdentifier
diff --git a/xpath/bundles/org.eclipse.wst.xml.xpath2.processor/pom.xml b/xpath/bundles/org.eclipse.wst.xml.xpath2.processor/pom.xml
index fbf4463e87..b11fe3c5d9 100644
--- a/xpath/bundles/org.eclipse.wst.xml.xpath2.processor/pom.xml
+++ b/xpath/bundles/org.eclipse.wst.xml.xpath2.processor/pom.xml
@@ -40,18 +40,6 @@
     </pluginManagement>
     <plugins>
       <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-compiler-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <configuration>
-          <compilerId>jdt</compilerId>
-          <usePdeSourceRoots>true</usePdeSourceRoots>
-          <source>1.5</source>
-          <target>jsr14</target>
-        </configuration>
-      </plugin>
-
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>2.7</version>