Skip to content

Commit

Permalink
7046: Update to the 2021-03 platform
Browse files Browse the repository at this point in the history
Reviewed-by: ghb
  • Loading branch information
thegreystone committed Apr 3, 2021
1 parent f1a63ec commit a2f6b15
Show file tree
Hide file tree
Showing 6 changed files with 148 additions and 14 deletions.
27 changes: 24 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,30 @@
</snapshotRepository>
</distributionManagement>
<profiles>
<profile>
<id>2021-03</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<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-2021-03</artifactId>
<version>${revision}${changelist}</version>
</artifact>
</target>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>2020-12</id>
<build>
Expand All @@ -135,9 +159,6 @@
</profile>
<profile>
<id>2020-09</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2020, Datadog, Inc. All rights reserved.
Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2020, 2021, Datadog, Inc. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
Expand Down Expand Up @@ -55,9 +55,9 @@
<repository location="http://download.eclipse.org/releases/2020-09/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.babel.nls_eclipse_ja.feature.group" version="4.17.0.v20201010020001"/>
<unit id="org.eclipse.babel.nls_eclipse_zh.feature.group" version="4.17.0.v20201010020001"/>
<repository location="https://archive.eclipse.org/technology/babel/update-site/R0.18.1/2020-09/"/>
<unit id="org.eclipse.babel.nls_eclipse_ja.feature.group" version="4.17.0.v20210327014210"/>
<unit id="org.eclipse.babel.nls_eclipse_zh.feature.group" version="4.17.0.v20210327014210"/>
<repository location="https://archive.eclipse.org/technology/babel/update-site/R0.18.3/2020-09/"/>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2020, Datadog, Inc. All rights reserved.
Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2020, 2021, Datadog, Inc. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
Expand Down Expand Up @@ -55,9 +55,9 @@
<repository location="http://download.eclipse.org/releases/2020-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.17.0.v20201010020001"/>
<unit id="org.eclipse.babel.nls_eclipse_zh.feature.group" version="4.17.0.v20201010020001"/>
<repository location="https://archive.eclipse.org/technology/babel/update-site/R0.18.1/2020-09/"/>
<unit id="org.eclipse.babel.nls_eclipse_ja.feature.group" version="4.18.0.v20210327075149"/>
<unit id="org.eclipse.babel.nls_eclipse_zh.feature.group" version="4.18.0.v20210327075149"/>
<repository location="https://archive.eclipse.org/technology/babel/update-site/R0.18.3/2020-12/"/>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2021, Datadog, Inc. 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-2021-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.5"/>
<unit id="com.sun.activation.jakarta.activation" version="1.2.1"/>
<unit id="org.owasp.encoder" version="1.2.2"/>
<unit id="org.lz4.lz4-java" version="1.7.1"/>
<unit id="org.twitter4j.core" version="4.0.7"/>
<unit id="org.hdrhistogram.HdrHistogram" version="2.1.12"/>
<unit id="org.adoptopenjdk.jemmy-awt-input" version="2.0.0"/>
<unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
<unit id="org.adoptopenjdk.jemmy-core" version="2.0.0"/>
<unit id="org.adoptopenjdk.jemmy-swt" version="2.0.0"/>
<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.8.1100.v20210209-1541"/>
<unit id="org.eclipse.pde.feature.group" version="3.14.700.v20210303-1800"/>
<unit id="org.eclipse.platform.sdk" version="4.19.0.I20210303-1800"/>
<repository location="http://download.eclipse.org/releases/2021-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.19.0.v20210327020002"/>
<unit id="org.eclipse.babel.nls_eclipse_zh.feature.group" version="4.19.0.v20210327020002"/>
<repository location="https://archive.eclipse.org/technology/babel/update-site/R0.18.3/2021-03/"/>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
</target>
48 changes: 48 additions & 0 deletions releng/platform-definitions/platform-definition-2021-03/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2021, Datadog, Inc. 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>${revision}${changelist}</version>
</parent>
<artifactId>platform-definition-2021-03</artifactId>
<packaging>eclipse-target-definition</packaging>

<properties>
<spotless.config.path>${basedir}/../../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
</properties>
</project>
3 changes: 2 additions & 1 deletion releng/platform-definitions/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
Expand Down Expand Up @@ -46,6 +46,7 @@
</properties>

<modules>
<module>platform-definition-2021-03</module>
<module>platform-definition-2020-12</module>
<module>platform-definition-2020-09</module>
<module>platform-definition-2020-06</module>
Expand Down

0 comments on commit a2f6b15

Please sign in to comment.