--- old/application/org.openjdk.jmc.feature.rcp/feature.xml	2019-04-28 01:26:30.038025500 +0200
+++ new/application/org.openjdk.jmc.feature.rcp/feature.xml	2019-04-28 01:26:29.918367500 +0200
@@ -171,7 +171,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.equinox.ds"
+         id="org.apache.felix.scr"
          download-size="0"
          install-size="0"
          version="0.0.0"
--- old/application/org.openjdk.jmc.osgi.extension/.project	2019-04-28 01:26:30.751396600 +0200
+++ new/application/org.openjdk.jmc.osgi.extension/.project	2019-04-28 01:26:30.630396000 +0200
@@ -20,8 +20,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
--- old/application/org.openjdk.jmc.rcp.application/META-INF/MANIFEST.MF	2019-04-28 01:26:31.466579800 +0200
+++ new/application/org.openjdk.jmc.rcp.application/META-INF/MANIFEST.MF	2019-04-28 01:26:31.347580500 +0200
@@ -20,6 +20,7 @@
  org.eclipse.equinox.p2.updatechecker,
  org.eclipse.swt,
  org.eclipse.ui.themes;resolution:=optional
+Require-Capability: osgi.extender; filter:="(&(osgi.extender=osgi.component)(version>=1.2)(!(version>=2.0)))"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.openjdk.jmc.rcp.application.actions
 Service-Component: OSGI-INF/policy_component.xml
--- old/application/org.openjdk.jmc.rcp.product/jmc.product	2019-04-28 01:26:32.141589900 +0200
+++ new/application/org.openjdk.jmc.rcp.product/jmc.product	2019-04-28 01:26:32.030577400 +0200
@@ -96,7 +96,7 @@
       <plugin id="org.openjdk.jmc.rcp.application" autoStart="false" startLevel="5" />
       <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
       <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
       <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.equinox.util" autoStart="true" startLevel="2" />
--- old/./pom.xml	2019-04-28 01:26:32.861640100 +0200
+++ new/./pom.xml	2019-04-28 01:26:32.742624000 +0200
@@ -101,7 +101,7 @@
 	</distributionManagement>
 	<profiles>
 		<profile>
-			<id>photon</id>
+			<id>2019-03</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
@@ -115,7 +115,7 @@
 							<target>
 								<artifact>
 									<groupId>org.openjdk.jmc</groupId>
-									<artifactId>platform-definition-photon</artifactId>
+									<artifactId>platform-definition-2019-03</artifactId>
 									<version>7.1.0-SNAPSHOT</version>
 								</artifact>
 							</target>
@@ -125,7 +125,7 @@
 			</build>
 		</profile>
 		<profile>
-			<id>oxygen</id>
+			<id>2018-12</id>
 			<build>
 				<plugins>
 					<plugin>
@@ -136,7 +136,7 @@
 							<target>
 								<artifact>
 									<groupId>org.openjdk.jmc</groupId>
-									<artifactId>platform-definition-oxygen</artifactId>
+									<artifactId>platform-definition-2018-12</artifactId>
 									<version>7.1.0-SNAPSHOT</version>
 								</artifact>
 							</target>
@@ -161,6 +161,27 @@
 									<version>7.1.0-SNAPSHOT</version>
 								</artifact>
 							</target>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>photon</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>target-platform-configuration</artifactId>
+						<version>${tycho.version}</version>
+						<configuration>
+							<target>
+								<artifact>
+									<groupId>org.openjdk.jmc</groupId>
+									<artifactId>platform-definition-photon</artifactId>
+									<version>7.1.0-SNAPSHOT</version>
+								</artifact>
+							</target>
 						</configuration>
 					</plugin>
 				</plugins>
--- old/releng/platform-definitions/platform-definition-photon/.project	2019-04-28 01:26:33.619272000 +0200
+++ new/releng/platform-definitions/platform-definition-photon/.project	2019-04-28 01:26:33.503277600 +0200
@@ -5,7 +5,13 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
--- old/releng/platform-definitions/pom.xml	2019-04-28 01:26:34.309406100 +0200
+++ new/releng/platform-definitions/pom.xml	2019-04-28 01:26:34.184404300 +0200
@@ -41,8 +41,10 @@
 	<artifactId>platform-definitions</artifactId>
 	<packaging>pom</packaging>
 	<modules>
-		<module>platform-definition-oxygen</module>
+		<!-- Photon will be deprecated eventually - don't use it! -->
 		<module>platform-definition-photon</module>
 		<module>platform-definition-2018-09</module>
+		<module>platform-definition-2018-12</module>
+		<module>platform-definition-2019-03</module>
 	</modules>
 </project>
--- /dev/null	2019-04-28 00:07:58.419366000 +0200
+++ new/releng/platform-definitions/platform-definition-2018-12/.project	2019-04-28 01:26:34.902824800 +0200
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.openjdk.jmc.platform-definition-2018-12</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
--- /dev/null	2019-04-28 00:07:58.419366000 +0200
+++ new/releng/platform-definitions/platform-definition-2018-12/platform-definition-2018-12.target	2019-04-28 01:26:35.439049200 +0200
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--   
+   Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
+   
+   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+   
+   The contents of this file are subject to the terms of either the Universal Permissive License 
+   v 1.0 as shown at http://oss.oracle.com/licenses/upl
+   
+   or the following license:
+   
+   Redistribution and use in source and binary forms, with or without modification, are permitted
+   provided that the following conditions are met:
+   
+   1. Redistributions of source code must retain the above copyright notice, this list of conditions
+   and the following disclaimer.
+   
+   2. Redistributions in binary form must reproduce the above copyright notice, this list of
+   conditions and the following disclaimer in the documentation and/or other materials provided with
+   the distribution.
+   
+   3. Neither the name of the copyright holder nor the names of its contributors may be used to
+   endorse or promote products derived from this software without specific prior written permission.
+   
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+   FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+   WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<?pde version="3.8"?><target name="jmc-target-2018-12" sequenceNumber="47">
+    <locations>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="com.sun.mail.jakarta.mail" version="1.6.3"/>
+            <unit id="com.sun.activation.jakarta.activation" version="1.2.1"/>
+            <unit id="javax.mail.dsn" version="1.4.0"/>
+            <unit id="org.owasp.encoder" version="1.2.1"/>
+            <unit id="org.twitter4j.core" version="4.0.6"/>
+            <unit id="org.openjfx.javafx-base.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-base.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-base.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-fxml.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-fxml.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-fxml.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-media.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-media.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-media.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-controls.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-controls.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-controls.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-graphics.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-graphics.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-graphics.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-swing.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-swing.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-swing.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-web.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-web.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-web.linux" version="11.0.1"/>
+            <repository location="http://localhost:8080/site"/>
+        </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="org.eclipse.equinox.executable.feature.group"/>
+            <unit id="org.eclipse.pde.feature.group" version="3.13.300.v20181206-0815"/>
+            <unit id="org.eclipse.platform.sdk" version="4.10.0.I20181206-0815"/>
+            <repository location="http://download.eclipse.org/releases/2018-12/"/>
+        </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="org.eclipse.babel.nls_eclipse_ja.feature.group" version="4.10.0.v20190126060001"/>
+            <unit id="org.eclipse.babel.nls_eclipse_zh.feature.group" version="4.10.0.v20190126060001"/>
+            <repository location="http://download.eclipse.org/technology/babel/update-site/R0.16.1/2018-12/"/>
+        </location>
+    </locations>
+    <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+</target>
\ No newline at end of file
--- /dev/null	2019-04-28 00:07:58.419366000 +0200
+++ new/releng/platform-definitions/platform-definition-2018-12/pom.xml	2019-04-28 01:26:35.971617200 +0200
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   
+   Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+   
+   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+   
+   The contents of this file are subject to the terms of either the Universal Permissive License 
+   v 1.0 as shown at http://oss.oracle.com/licenses/upl
+   
+   or the following license:
+   
+   Redistribution and use in source and binary forms, with or without modification, are permitted
+   provided that the following conditions are met:
+   
+   1. Redistributions of source code must retain the above copyright notice, this list of conditions
+   and the following disclaimer.
+   
+   2. Redistributions in binary form must reproduce the above copyright notice, this list of
+   conditions and the following disclaimer in the documentation and/or other materials provided with
+   the distribution.
+   
+   3. Neither the name of the copyright holder nor the names of its contributors may be used to
+   endorse or promote products derived from this software without specific prior written permission.
+   
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+   FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+   WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.openjdk.jmc</groupId>
+		<artifactId>platform-definitions</artifactId>
+		<version>7.1.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>platform-definition-2018-12</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+</project>
--- /dev/null	2019-04-28 00:07:58.419366000 +0200
+++ new/releng/platform-definitions/platform-definition-2019-03/.project	2019-04-28 01:26:36.481457600 +0200
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.openjdk.jmc.platform-definition-2019-03</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
--- /dev/null	2019-04-28 00:07:58.419366000 +0200
+++ new/releng/platform-definitions/platform-definition-2019-03/platform-definition-2019-03.target	2019-04-28 01:26:36.990503800 +0200
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--   
+   Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
+   
+   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+   
+   The contents of this file are subject to the terms of either the Universal Permissive License 
+   v 1.0 as shown at http://oss.oracle.com/licenses/upl
+   
+   or the following license:
+   
+   Redistribution and use in source and binary forms, with or without modification, are permitted
+   provided that the following conditions are met:
+   
+   1. Redistributions of source code must retain the above copyright notice, this list of conditions
+   and the following disclaimer.
+   
+   2. Redistributions in binary form must reproduce the above copyright notice, this list of
+   conditions and the following disclaimer in the documentation and/or other materials provided with
+   the distribution.
+   
+   3. Neither the name of the copyright holder nor the names of its contributors may be used to
+   endorse or promote products derived from this software without specific prior written permission.
+   
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+   FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+   WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<?pde version="3.8"?>
+<target name="jmc-target-2019-03" sequenceNumber="47">
+    <locations>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="com.sun.mail.jakarta.mail" version="1.6.3"/>
+            <unit id="com.sun.activation.jakarta.activation" version="1.2.1"/>
+            <unit id="javax.mail.dsn" version="1.4.0"/>
+            <unit id="org.owasp.encoder" version="1.2.1"/>
+            <unit id="org.twitter4j.core" version="4.0.6"/>
+            <unit id="org.openjfx.javafx-base.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-base.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-base.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-fxml.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-fxml.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-fxml.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-media.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-media.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-media.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-controls.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-controls.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-controls.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-graphics.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-graphics.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-graphics.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-swing.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-swing.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-swing.linux" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-web.mac" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-web.win" version="11.0.1"/>
+            <unit id="org.openjfx.javafx-web.linux" version="11.0.1"/>
+            <repository location="http://localhost:8080/site"/>
+        </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="org.eclipse.equinox.executable.feature.group"/>
+            <unit id="org.eclipse.pde.feature.group" version="3.13.400.v20190307-0943"/>
+            <unit id="org.eclipse.platform.sdk" version="4.11.0.I20190307-0500"/>
+            <repository location="http://download.eclipse.org/releases/2019-03/"/>
+        </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+						<unit id="org.eclipse.babel.nls_eclipse_ja.feature.group" version="4.10.0.v20190126060001"/>
+						<unit id="org.eclipse.babel.nls_eclipse_zh.feature.group" version="4.10.0.v20190126060001"/>
+						<repository location="http://download.eclipse.org/technology/babel/update-site/R0.16.1/2018-12/"/>
+        </location>
+    </locations>
+    <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+</target>
\ No newline at end of file
--- /dev/null	2019-04-28 00:07:58.419366000 +0200
+++ new/releng/platform-definitions/platform-definition-2019-03/pom.xml	2019-04-28 01:26:37.486546600 +0200
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--   
+   Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+   
+   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+   
+   The contents of this file are subject to the terms of either the Universal Permissive License 
+   v 1.0 as shown at http://oss.oracle.com/licenses/upl
+   
+   or the following license:
+   
+   Redistribution and use in source and binary forms, with or without modification, are permitted
+   provided that the following conditions are met:
+   
+   1. Redistributions of source code must retain the above copyright notice, this list of conditions
+   and the following disclaimer.
+   
+   2. Redistributions in binary form must reproduce the above copyright notice, this list of
+   conditions and the following disclaimer in the documentation and/or other materials provided with
+   the distribution.
+   
+   3. Neither the name of the copyright holder nor the names of its contributors may be used to
+   endorse or promote products derived from this software without specific prior written permission.
+   
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+   FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+   WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.openjdk.jmc</groupId>
+		<artifactId>platform-definitions</artifactId>
+		<version>7.1.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>platform-definition-2019-03</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+</project>
--- old/releng/platform-definitions/platform-definition-oxygen/.project	2019-04-28 01:26:38.107571800 +0200
+++ /dev/null	2019-04-28 00:07:58.419366000 +0200
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.openjdk.jmc.platform-definition-oxygen</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
--- old/releng/platform-definitions/platform-definition-oxygen/platform-definition-oxygen.target	2019-04-28 01:26:38.519564800 +0200
+++ /dev/null	2019-04-28 00:07:58.419366000 +0200
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--   
-   Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
-   
-   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-   
-   The contents of this file are subject to the terms of either the Universal Permissive License 
-   v 1.0 as shown at http://oss.oracle.com/licenses/upl
-   
-   or the following license:
-   
-   Redistribution and use in source and binary forms, with or without modification, are permitted
-   provided that the following conditions are met:
-   
-   1. Redistributions of source code must retain the above copyright notice, this list of conditions
-   and the following disclaimer.
-   
-   2. Redistributions in binary form must reproduce the above copyright notice, this list of
-   conditions and the following disclaimer in the documentation and/or other materials provided with
-   the distribution.
-   
-   3. Neither the name of the copyright holder nor the names of its contributors may be used to
-   endorse or promote products derived from this software without specific prior written permission.
-   
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
-   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-   FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-   WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<?pde version="3.8"?><target name="jmc-target-oxygen" sequenceNumber="49">
-    <locations>
-        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="com.sun.mail.jakarta.mail" version="1.6.3"/>
-            <unit id="com.sun.activation.jakarta.activation" version="1.2.1"/>
-            <unit id="javax.mail.dsn" version="1.4.0"/>
-            <unit id="org.owasp.encoder" version="1.2.1"/>
-            <unit id="org.twitter4j.core" version="4.0.6"/>
-            <unit id="org.openjfx.javafx-base.mac" version="11.0.1"/>
-            <unit id="org.openjfx.javafx-base.win" version="11.0.1"/>
-            <unit id="org.openjfx.javafx-base.linux" version="11.0.1"/>
-            <unit id="org.openjfx.javafx-fxml.mac" version="11.0.1"/>
-            <unit id="org.openjfx.javafx-fxml.win" version="11.0.1"/>
-            <unit id="org.openjfx.javafx-fxml.linux" version="11.0.1"/>
-            <unit id="org.openjfx.javafx-media.mac" version="11.0.1"/>
-            <unit id="org.openjfx.javafx-media.win" version="11.0.1"/>
-            <unit id="org.openjfx.javafx-media.linux" version="11.0.1"/>
-            <unit id="org.openjfx.javafx-controls.mac" version="11.0.1"/>
-            <unit id="org.openjfx.javafx-controls.win" version="11.0.1"/>
-            <unit id="org.openjfx.javafx-controls.linux" version="11.0.1"/>
-            <unit id="org.openjfx.javafx-graphics.mac" version="11.0.1"/>
-            <unit id="org.openjfx.javafx-graphics.win" version="11.0.1"/>
-            <unit id="org.openjfx.javafx-graphics.linux" version="11.0.1"/>
-            <unit id="org.openjfx.javafx-swing.mac" version="11.0.1"/>
-            <unit id="org.openjfx.javafx-swing.win" version="11.0.1"/>
-            <unit id="org.openjfx.javafx-swing.linux" version="11.0.1"/>
-            <unit id="org.openjfx.javafx-web.mac" version="11.0.1"/>
-            <unit id="org.openjfx.javafx-web.win" version="11.0.1"/>
-            <unit id="org.openjfx.javafx-web.linux" version="11.0.1"/>
-            <repository location="http://localhost:8080/site"/>
-        </location>
-        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.2.v20171108-1834"/>
-            <unit id="org.eclipse.pde.feature.group" version="3.13.2.v20171130-0510"/>
-            <unit id="org.eclipse.platform.sdk" version="4.7.2.M20171130-0510"/>
-            <repository location="http://download.eclipse.org/releases/oxygen"/>
-        </location>
-        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="org.eclipse.babel.nls_eclipse_ja.feature.group" version="4.7.0.v20171231020002"/>
-            <unit id="org.eclipse.babel.nls_eclipse_zh.feature.group" version="4.7.0.v20171231020002"/>
-            <repository location="http://download.eclipse.org/technology/babel/update-site/R0.15.1/oxygen"/>
-        </location>
-    </locations>
-    <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-</target>
--- old/releng/platform-definitions/platform-definition-oxygen/pom.xml	2019-04-28 01:26:38.897139700 +0200
+++ /dev/null	2019-04-28 00:07:58.419366000 +0200
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--   
-   Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
-   
-   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-   
-   The contents of this file are subject to the terms of either the Universal Permissive License 
-   v 1.0 as shown at http://oss.oracle.com/licenses/upl
-   
-   or the following license:
-   
-   Redistribution and use in source and binary forms, with or without modification, are permitted
-   provided that the following conditions are met:
-   
-   1. Redistributions of source code must retain the above copyright notice, this list of conditions
-   and the following disclaimer.
-   
-   2. Redistributions in binary form must reproduce the above copyright notice, this list of
-   conditions and the following disclaimer in the documentation and/or other materials provided with
-   the distribution.
-   
-   3. Neither the name of the copyright holder nor the names of its contributors may be used to
-   endorse or promote products derived from this software without specific prior written permission.
-   
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
-   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-   FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-   WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.openjdk.jmc</groupId>
-		<artifactId>platform-definitions</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>platform-definition-oxygen</artifactId>
-	<packaging>eclipse-target-definition</packaging>
-</project>