From 88355ecc48cff62d936f3497ca0fd343b42ba0a8 Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Fri, 19 Apr 2024 18:21:37 +0300 Subject: [PATCH] [#657] CDT cannot be built on Java 21 due to security manager changes * Switch CI to Java 21 * Remove config generation for debug application * Remove `org.eclipse.osgi.services` from `proxy.server` product * Remove `org.eclipse.osgi.services` from `org.eclipse.cdt.debug.application.product` product * Move `org.eclipse.cdt.debug.application.product` from profile to general part Signed-off-by: Alexander Fedorov --- .github/workflows/build-test.yml | 4 +- .github/workflows/code-cleanliness.yml | 4 +- .../about.html | 38 ---- .../build.properties | 20 -- .../debug.product | 1 - .../epl-v20.html | 189 ------------------ .../license.html | 189 ------------------ .../plugin_customization.ini | 1 - .../configGenerator.xml | 15 -- .../org.eclipse.cdt.debug.application/pom.xml | 51 ----- pom.xml | 9 +- releng/org.eclipse.cdt.target/cdt.target | 4 +- .../proxy.server.product | 1 - 13 files changed, 11 insertions(+), 515 deletions(-) delete mode 100644 debug/org.eclipse.cdt.debug.application.product/about.html delete mode 100644 debug/org.eclipse.cdt.debug.application.product/build.properties delete mode 100644 debug/org.eclipse.cdt.debug.application.product/epl-v20.html delete mode 100644 debug/org.eclipse.cdt.debug.application.product/license.html delete mode 100644 debug/org.eclipse.cdt.debug.application.product/plugin_customization.ini delete mode 100644 debug/org.eclipse.cdt.debug.application/configGenerator.xml delete mode 100644 debug/org.eclipse.cdt.debug.application/pom.xml diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 7dcdcc0185a..98dd09712da 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -21,10 +21,10 @@ jobs: - 'dsf/**' - 'debug/**' - 'jtag/**' - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: maven - name: Set up Maven diff --git a/.github/workflows/code-cleanliness.yml b/.github/workflows/code-cleanliness.yml index d12756bb871..65ce28e47fa 100644 --- a/.github/workflows/code-cleanliness.yml +++ b/.github/workflows/code-cleanliness.yml @@ -11,10 +11,10 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: maven - name: Set up Maven diff --git a/debug/org.eclipse.cdt.debug.application.product/about.html b/debug/org.eclipse.cdt.debug.application.product/about.html deleted file mode 100644 index b3134865230..00000000000 --- a/debug/org.eclipse.cdt.debug.application.product/about.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - About - - - -

About This Content

- -

November 30, 2017

-

License

- -

- The Eclipse Foundation makes available all content in this plug-in - ("Content"). Unless otherwise indicated below, the Content - is provided to you under the terms and conditions of the Eclipse - Public License Version 2.0 ("EPL"). A copy of the EPL is - available at https://www.eclipse.org/legal/epl-2.0. - For purposes of the EPL, "Program" will mean the Content. -

- -

- If you did not receive this Content directly from the Eclipse - Foundation, the Content is being redistributed by another party - ("Redistributor") and different terms and conditions may - apply to your use of any object code in the Content. Check the - Redistributor's license that was provided with the Content. If no such - license exists, contact the Redistributor. Unless otherwise indicated - below, the terms and conditions of the EPL still apply to any source - code in the Content and such source code may be obtained at https://www.eclipse.org. -

- - - - \ No newline at end of file diff --git a/debug/org.eclipse.cdt.debug.application.product/build.properties b/debug/org.eclipse.cdt.debug.application.product/build.properties deleted file mode 100644 index d0e8f92d632..00000000000 --- a/debug/org.eclipse.cdt.debug.application.product/build.properties +++ /dev/null @@ -1,20 +0,0 @@ -############################################################################### -# Copyright (c) 2015 Ericsson -# -# -# This program and the accompanying materials -# are made available under the terms of the Eclipse Public License 2.0 -# which accompanies this distribution, and is available at -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Ericsson - Initial API and implementation -############################################################################### - -source.. = src/ -output.. = bin/ -bin.includes = .,\ - about.html -src.includes = about.html diff --git a/debug/org.eclipse.cdt.debug.application.product/debug.product b/debug/org.eclipse.cdt.debug.application.product/debug.product index 7d5ee839b96..ba8cdd69975 100644 --- a/debug/org.eclipse.cdt.debug.application.product/debug.product +++ b/debug/org.eclipse.cdt.debug.application.product/debug.product @@ -379,7 +379,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U - diff --git a/debug/org.eclipse.cdt.debug.application.product/epl-v20.html b/debug/org.eclipse.cdt.debug.application.product/epl-v20.html deleted file mode 100644 index 008b8018db8..00000000000 --- a/debug/org.eclipse.cdt.debug.application.product/epl-v20.html +++ /dev/null @@ -1,189 +0,0 @@ - - - - - -Eclipse Foundation Software User Agreement - - - -

Eclipse Foundation Software User Agreement

-

November 22, 2017

- -

Usage Of Content

- -

THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, - INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY - THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND - CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED - BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS - GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY - APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED - BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS - AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE - AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT - USE THE CONTENT.

- -

Applicable Licenses

- -

- Unless otherwise indicated, all Content made available by the Eclipse - Foundation is provided to you under the terms and conditions of the - Eclipse Public License Version 2.0 ("EPL"). A copy of the - EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-2.0. - For purposes of the EPL, "Program" will mean the Content. -

- -

Content includes, but is not limited to, source code, object - code, documentation and other files maintained in the Eclipse - Foundation source code repository ("Repository") in software - modules ("Modules") and made available as downloadable - archives ("Downloads").

- -
    -
  • Content may be structured and packaged into modules to - facilitate delivering, extending, and upgrading the Content. Typical - modules may include plug-ins ("Plug-ins"), plug-in - fragments ("Fragments"), and features - ("Features").
    • -
  • Each Plug-in or Fragment may be packaged as a sub-directory - or JAR (Java™ ARchive) in a directory named - "plugins".
    • -
  • A Feature is a bundle of one or more Plug-ins and/or - Fragments and associated material. Each Feature may be packaged as a - sub-directory in a directory named "features". Within a - Feature, files named "feature.xml" may contain a list of - the names and version numbers of the Plug-ins and/or Fragments - associated with that Feature.
    • -
  • Features may also include other Features ("Included - Features"). Within a Feature, files named - "feature.xml" may contain a list of the names and version - numbers of Included Features.
    • -
- -

The terms and conditions governing Plug-ins and Fragments should - be contained in files named "about.html" - ("Abouts"). The terms and conditions governing Features and - Included Features should be contained in files named - "license.html" ("Feature Licenses"). Abouts and - Feature Licenses may be located in any directory of a Download or - Module including, but not limited to the following locations:

- -
    -
  • The top-level (root) directory
    • -
  • Plug-in and Fragment directories
    • -
  • Inside Plug-ins and Fragments packaged as JARs
    • -
  • Sub-directories of the directory named "src" of - certain Plug-ins
    • -
  • Feature directories
    • -
- -

Note: if a Feature made available by the Eclipse Foundation is - installed using the Provisioning Technology (as defined below), you - must agree to a license ("Feature Update License") during - the installation process. If the Feature contains Included Features, - the Feature Update License should either provide you with the terms - and conditions governing the Included Features or inform you where you - can locate them. Feature Update Licenses may be found in the - "license" property of files named - "feature.properties" found within a Feature. Such Abouts, - Feature Licenses, and Feature Update Licenses contain the terms and - conditions (or references to such terms and conditions) that govern - your use of the associated Content in that directory.

- -

THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY - REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND - CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT - ARE NOT LIMITED TO):

- - - -

IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND - CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, - or Feature Update License is provided, please contact the Eclipse - Foundation to determine what terms and conditions govern that - particular Content.

- - -

Use of Provisioning Technology

- -

- The Eclipse Foundation makes available provisioning software, examples - of which include, but are not limited to, p2 and the Eclipse Update - Manager ("Provisioning Technology") for the purpose of - allowing users to install software, documentation, information and/or - other materials (collectively "Installable Software"). This - capability is provided with the intent of allowing such users to - install, extend and update Eclipse-based products. Information about - packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html - ("Specification"). -

- -

You may use Provisioning Technology to allow other parties to - install Installable Software. You shall be responsible for enabling - the applicable license agreements relating to the Installable Software - to be presented to, and accepted by, the users of the Provisioning - Technology in accordance with the Specification. By using Provisioning - Technology in such a manner and making it available in accordance with - the Specification, you further acknowledge your agreement to, and the - acquisition of all necessary rights to permit the following:

- -
    -
  1. A series of actions may occur ("Provisioning - Process") in which a user may execute the Provisioning - Technology on a machine ("Target Machine") with the intent - of installing, extending or updating the functionality of an - Eclipse-based product.
    2. -
  2. During the Provisioning Process, the Provisioning Technology - may cause third party Installable Software or a portion thereof to be - accessed and copied to the Target Machine.
    3. -
  3. Pursuant to the Specification, you will provide to the user - the terms and conditions that govern the use of the Installable - Software ("Installable Software Agreement") and such - Installable Software Agreement shall be accessed from the Target - Machine in accordance with the Specification. Such Installable - Software Agreement must inform the user of the terms and conditions - that govern the Installable Software and must solicit acceptance by - the end user in the manner prescribed in such Installable Software - Agreement. Upon such indication of agreement by the user, the - provisioning Technology will complete installation of the Installable - Software.
    4. -
- -

Cryptography

- -

Content may contain encryption software. The country in which - you are currently may have restrictions on the import, possession, and - use, and/or re-export to another country, of encryption software. - BEFORE using any encryption software, please check the country's laws, - regulations and policies concerning the import, possession, or use, - and re-export of encryption software, to see if this is permitted.

- -

- Java and all Java-based trademarks are trademarks of - Oracle Corporation in the United States, other countries, or both. -

- - diff --git a/debug/org.eclipse.cdt.debug.application.product/license.html b/debug/org.eclipse.cdt.debug.application.product/license.html deleted file mode 100644 index 008b8018db8..00000000000 --- a/debug/org.eclipse.cdt.debug.application.product/license.html +++ /dev/null @@ -1,189 +0,0 @@ - - - - - -Eclipse Foundation Software User Agreement - - - -

Eclipse Foundation Software User Agreement

-

November 22, 2017

- -

Usage Of Content

- -

THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, - INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY - THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND - CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED - BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS - GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY - APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED - BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS - AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE - AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT - USE THE CONTENT.

- -

Applicable Licenses

- -

- Unless otherwise indicated, all Content made available by the Eclipse - Foundation is provided to you under the terms and conditions of the - Eclipse Public License Version 2.0 ("EPL"). A copy of the - EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-2.0. - For purposes of the EPL, "Program" will mean the Content. -

- -

Content includes, but is not limited to, source code, object - code, documentation and other files maintained in the Eclipse - Foundation source code repository ("Repository") in software - modules ("Modules") and made available as downloadable - archives ("Downloads").

- -
    -
  • Content may be structured and packaged into modules to - facilitate delivering, extending, and upgrading the Content. Typical - modules may include plug-ins ("Plug-ins"), plug-in - fragments ("Fragments"), and features - ("Features").
    • -
  • Each Plug-in or Fragment may be packaged as a sub-directory - or JAR (Java™ ARchive) in a directory named - "plugins".
    • -
  • A Feature is a bundle of one or more Plug-ins and/or - Fragments and associated material. Each Feature may be packaged as a - sub-directory in a directory named "features". Within a - Feature, files named "feature.xml" may contain a list of - the names and version numbers of the Plug-ins and/or Fragments - associated with that Feature.
    • -
  • Features may also include other Features ("Included - Features"). Within a Feature, files named - "feature.xml" may contain a list of the names and version - numbers of Included Features.
    • -
- -

The terms and conditions governing Plug-ins and Fragments should - be contained in files named "about.html" - ("Abouts"). The terms and conditions governing Features and - Included Features should be contained in files named - "license.html" ("Feature Licenses"). Abouts and - Feature Licenses may be located in any directory of a Download or - Module including, but not limited to the following locations:

- -
    -
  • The top-level (root) directory
    • -
  • Plug-in and Fragment directories
    • -
  • Inside Plug-ins and Fragments packaged as JARs
    • -
  • Sub-directories of the directory named "src" of - certain Plug-ins
    • -
  • Feature directories
    • -
- -

Note: if a Feature made available by the Eclipse Foundation is - installed using the Provisioning Technology (as defined below), you - must agree to a license ("Feature Update License") during - the installation process. If the Feature contains Included Features, - the Feature Update License should either provide you with the terms - and conditions governing the Included Features or inform you where you - can locate them. Feature Update Licenses may be found in the - "license" property of files named - "feature.properties" found within a Feature. Such Abouts, - Feature Licenses, and Feature Update Licenses contain the terms and - conditions (or references to such terms and conditions) that govern - your use of the associated Content in that directory.

- -

THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY - REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND - CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT - ARE NOT LIMITED TO):

- - - -

IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND - CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, - or Feature Update License is provided, please contact the Eclipse - Foundation to determine what terms and conditions govern that - particular Content.

- - -

Use of Provisioning Technology

- -

- The Eclipse Foundation makes available provisioning software, examples - of which include, but are not limited to, p2 and the Eclipse Update - Manager ("Provisioning Technology") for the purpose of - allowing users to install software, documentation, information and/or - other materials (collectively "Installable Software"). This - capability is provided with the intent of allowing such users to - install, extend and update Eclipse-based products. Information about - packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html - ("Specification"). -

- -

You may use Provisioning Technology to allow other parties to - install Installable Software. You shall be responsible for enabling - the applicable license agreements relating to the Installable Software - to be presented to, and accepted by, the users of the Provisioning - Technology in accordance with the Specification. By using Provisioning - Technology in such a manner and making it available in accordance with - the Specification, you further acknowledge your agreement to, and the - acquisition of all necessary rights to permit the following:

- -
    -
  1. A series of actions may occur ("Provisioning - Process") in which a user may execute the Provisioning - Technology on a machine ("Target Machine") with the intent - of installing, extending or updating the functionality of an - Eclipse-based product.
    2. -
  2. During the Provisioning Process, the Provisioning Technology - may cause third party Installable Software or a portion thereof to be - accessed and copied to the Target Machine.
    3. -
  3. Pursuant to the Specification, you will provide to the user - the terms and conditions that govern the use of the Installable - Software ("Installable Software Agreement") and such - Installable Software Agreement shall be accessed from the Target - Machine in accordance with the Specification. Such Installable - Software Agreement must inform the user of the terms and conditions - that govern the Installable Software and must solicit acceptance by - the end user in the manner prescribed in such Installable Software - Agreement. Upon such indication of agreement by the user, the - provisioning Technology will complete installation of the Installable - Software.
    4. -
- -

Cryptography

- -

Content may contain encryption software. The country in which - you are currently may have restrictions on the import, possession, and - use, and/or re-export to another country, of encryption software. - BEFORE using any encryption software, please check the country's laws, - regulations and policies concerning the import, possession, or use, - and re-export of encryption software, to see if this is permitted.

- -

- Java and all Java-based trademarks are trademarks of - Oracle Corporation in the United States, other countries, or both. -

- - diff --git a/debug/org.eclipse.cdt.debug.application.product/plugin_customization.ini b/debug/org.eclipse.cdt.debug.application.product/plugin_customization.ini deleted file mode 100644 index fe9d173d4af..00000000000 --- a/debug/org.eclipse.cdt.debug.application.product/plugin_customization.ini +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = false diff --git a/debug/org.eclipse.cdt.debug.application/configGenerator.xml b/debug/org.eclipse.cdt.debug.application/configGenerator.xml deleted file mode 100644 index 5a9f107ead5..00000000000 --- a/debug/org.eclipse.cdt.debug.application/configGenerator.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/debug/org.eclipse.cdt.debug.application/pom.xml b/debug/org.eclipse.cdt.debug.application/pom.xml deleted file mode 100644 index 5bbb4e055c9..00000000000 --- a/debug/org.eclipse.cdt.debug.application/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - 4.0.0 - - - org.eclipse.cdt - org.eclipse.cdt.debug-parent - 11.6.0-SNAPSHOT - - - 11.6.0-SNAPSHOT - org.eclipse.cdt.debug.application - eclipse-plugin - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - generate-configuration - prepare-package - - - - - - - - - run - - - - - - - diff --git a/pom.xml b/pom.xml index 39f2db950ab..fbb5471a06d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ build-standalone-debugger-rcp - debug/org.eclipse.cdt.debug.application.product @@ -644,7 +645,7 @@ ${required-maven-version} - 17 + 21 true @@ -1019,7 +1020,7 @@ compile - JavaSE-17 + JavaSE-21 diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target index 1d53d0b0c79..55adad07b57 100644 --- a/releng/org.eclipse.cdt.target/cdt.target +++ b/releng/org.eclipse.cdt.target/cdt.target @@ -1,6 +1,6 @@ - + @@ -205,7 +205,7 @@ - + -Xms40m -Xmx512M diff --git a/remote/org.eclipse.remote.proxy.server.product/proxy.server.product b/remote/org.eclipse.remote.proxy.server.product/proxy.server.product index 3376d126d2c..1adbe82e19f 100644 --- a/remote/org.eclipse.remote.proxy.server.product/proxy.server.product +++ b/remote/org.eclipse.remote.proxy.server.product/proxy.server.product @@ -49,7 +49,6 @@ -