Bug 386646 - build against declared and/or observed bundle runtime execution environment
diff --git a/bundles/org.eclipse.core.expressions/pom.xml b/bundles/org.eclipse.core.expressions/pom.xml
index f71e27e..0d071e3 100644
--- a/bundles/org.eclipse.core.expressions/pom.xml
+++ b/bundles/org.eclipse.core.expressions/pom.xml
@@ -24,23 +24,13 @@
   <artifactId>org.eclipse.core.expressions</artifactId>
   <version>3.4.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-
   <build>
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>target-platform-configuration</artifactId>
         <configuration>
-          <!--
-            build.properties  jre.compilation.profile=J2SE-1.3. This is expected to force Tycho ignore 
-            org.w3c.dom package provided by java standard libraries
-
-            META-INF/MANIFEST.MF Import-Package:org.w3c.dom. This is expected to force Tycho resolve org.w3c.dom
-            package from dependencies, i.e. from javax.xml bundle.
-
-            Due to an apparent bug in Tycho the above does not happen and compilation fails with "Access restriction"
-            errors for org.w3c.dom.* classes. As a workaround, we force J2SE-1.4 compilation profile.
-           -->
+          <!-- observed BREE as of Juno -->
           <executionEnvironment>J2SE-1.4</executionEnvironment>
         </configuration>
       </plugin>
diff --git a/bundles/org.eclipse.core.runtime/pom.xml b/bundles/org.eclipse.core.runtime/pom.xml
index 34d1667..c64d484 100644
--- a/bundles/org.eclipse.core.runtime/pom.xml
+++ b/bundles/org.eclipse.core.runtime/pom.xml
@@ -23,16 +23,4 @@
   <artifactId>org.eclipse.core.runtime</artifactId>
   <version>3.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <configuration>
-          <executionEnvironment>CDC-1.0/Foundation-1.0</executionEnvironment>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/tests/org.eclipse.core.tests.harness/pom.xml b/tests/org.eclipse.core.tests.harness/pom.xml
index e592cbe..b190be0 100644
--- a/tests/org.eclipse.core.tests.harness/pom.xml
+++ b/tests/org.eclipse.core.tests.harness/pom.xml
@@ -23,4 +23,19 @@
   <artifactId>org.eclipse.core.tests.harness</artifactId>
   <version>3.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <!-- 
+          /src/org/eclipse/core/tests/session/SetupManager.java uses String.replaceAll(String, String)
+          which was introduced in JDK 1.4
+          -->
+          <executionEnvironment>J2SE-1.4</executionEnvironment>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>