diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8e26f129aaf..93e2eb4af41 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,22 +1,11 @@ # https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates version: 2 updates: - - package-ecosystem: maven - directory: eclipse-platform-parent - schedule: - interval: daily - commit-message: - prefix: fix - prefix-development: chore - include: scope - labels: - - dependencies - package-ecosystem: github-actions directory: "/" schedule: interval: daily - - package-ecosystem: docker directory: /cje-production/dockerfiles/centos-gtk3-metacity/8-gtk3 schedule: diff --git a/.github/workflows/codeQLworkflow.yml b/.github/workflows/codeQLworkflow.yml index 308ba7db005..6920bba6cdd 100644 --- a/.github/workflows/codeQLworkflow.yml +++ b/.github/workflows/codeQLworkflow.yml @@ -19,7 +19,7 @@ on: description: 'The version of Maven set up' type: string required: false - default: '3.9.2' + default: '3.9.6' jobs: analyze: @@ -54,12 +54,12 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} - name: Set up Java - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 + uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0 with: java-version: | 8 @@ -88,6 +88,6 @@ jobs: ${{ inputs.maven-goals }} - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 with: category: "/language:${{matrix.language}}" diff --git a/.github/workflows/mavenBuild.yml b/.github/workflows/mavenBuild.yml index ebb63c58a97..ee4f5b9d6f4 100644 --- a/.github/workflows/mavenBuild.yml +++ b/.github/workflows/mavenBuild.yml @@ -19,7 +19,7 @@ on: description: 'The version of Maven set up' type: string required: false - default: '3.9.2' + default: '3.9.6' permissions: {} @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Upload - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 with: name: Event File path: ${{ github.event_path }} @@ -50,7 +50,7 @@ jobs: fetch-depth: 0 # required for jgit timestamp provider to work submodules: ${{ inputs.submodules }} - name: Set up Java - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 + uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0 with: java-version: | 8 @@ -67,7 +67,7 @@ jobs: with: maven-version: ${{ inputs.mavenVersion }} - name: Download the API Tools matcher - uses: suisei-cn/actions-download-file@15306412d2c75df56b46844362b86b65235b7db1 # v1.4.0 + uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9 # v1.6.0 id: api-tools-matcher with: url: "https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.releng.aggregator/master/.github/matcher/api-tools.json" @@ -86,7 +86,7 @@ jobs: ${{ inputs.maven-goals }} - name: Upload Test Results for ${{ matrix.config.name }} if: always() - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 with: name: test-results-${{ matrix.config.os }} if-no-files-found: warn diff --git a/.github/workflows/prepareRelease.yml b/.github/workflows/prepareRelease.yml index 31196c8593c..042695c19b7 100644 --- a/.github/workflows/prepareRelease.yml +++ b/.github/workflows/prepareRelease.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Maven uses: stCarolas/setup-maven@07fbbe97d97ef44336b7382563d66743297e442f # v4.5 with: - maven-version: 3.9.2 + maven-version: 3.9.6 - id: get-release-name run: | name=$(echo ${{ github.event.milestone.due_on }} | cut -d- -f-2) @@ -26,17 +26,17 @@ jobs: with: ref: master - name: Set up JDK - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 + uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0 with: java-version: '17' distribution: 'temurin' cache: maven - name: Update Main Versions - run: mvn -U -ntp -f eclipse-platform-parent org.eclipse.tycho:tycho-versions-plugin:4.0.2:set-version -DnewVersion=${{ github.event.milestone.title }}.0-SNAPSHOT -Dmodules=../eclipse.platform.releng.prereqs.sdk + run: mvn -U -ntp -f eclipse-platform-parent org.eclipse.tycho:tycho-versions-plugin:4.0.6:set-version -DnewVersion=${{ github.event.milestone.title }}.0-SNAPSHOT -Dmodules=../eclipse.platform.releng.prereqs.sdk - name: Update Release Versions - run: mvn -ntp -f eclipse-platform-parent/pom.xml --non-recursive org.eclipse.tycho:tycho-versions-plugin:4.0.2:set-property -Dproperties=releaseNumberSDK,releaseNumberPlatform,releaseName -DnewReleaseName=${{ steps.get-release-name.outputs.name }} -DnewReleaseNumberSDK=${{ github.event.milestone.title }} -DnewReleaseNumberPlatform=${{ github.event.milestone.title }} + run: mvn -ntp -f eclipse-platform-parent/pom.xml --non-recursive org.eclipse.tycho:tycho-versions-plugin:4.0.6:set-property -Dproperties=releaseNumberSDK,releaseNumberPlatform,releaseName -DnewReleaseName=${{ steps.get-release-name.outputs.name }} -DnewReleaseNumberSDK=${{ github.event.milestone.title }} -DnewReleaseNumberPlatform=${{ github.event.milestone.title }} - name: Create Pull Request for Release ${{ github.event.milestone.title }} - uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5.0.2 + uses: peter-evans/create-pull-request@a4f52f8033a6168103c2538976c07b467e8163bc # v6.0.1 with: commit-message: Prepare Release ${{ github.event.milestone.title }} branch: prepare_R${{ github.event.milestone.title }} diff --git a/.github/workflows/publishTestResults.yml b/.github/workflows/publishTestResults.yml index a83444ecd0b..445e13195e3 100644 --- a/.github/workflows/publishTestResults.yml +++ b/.github/workflows/publishTestResults.yml @@ -47,7 +47,7 @@ jobs: done - name: Publish Test Results - uses: EnricoMi/publish-unit-test-result-action@ca89ad036b5fcd524c1017287fb01b5139908408 # v2.11.0 + uses: EnricoMi/publish-unit-test-result-action@f355d34d53ad4e7f506f699478db2dd71da9de5f # v2.15.1 id: test-results with: commit: ${{ github.event.workflow_run.head_sha }} @@ -72,7 +72,7 @@ jobs: - name: Create badge if: github.ref == 'refs/heads/master' && inputs.gist-url != '' - uses: emibcn/badge-action@4209421db54c8764d8932070ffd0f81715a629bf + uses: emibcn/badge-action@808173dd03e2f30c980d03ee49e181626088eee8 with: label: Tests status: '${{ fromJSON( steps.test-results.outputs.json ).formatted.stats.tests_succ }} passed, ${{ fromJSON( steps.test-results.outputs.json ).formatted.stats.tests_fail }} failed' diff --git a/.github/workflows/updateRelease.yml b/.github/workflows/updateRelease.yml index 2590ca36caa..45486eeb1db 100644 --- a/.github/workflows/updateRelease.yml +++ b/.github/workflows/updateRelease.yml @@ -14,9 +14,9 @@ jobs: - name: Set up Maven uses: stCarolas/setup-maven@07fbbe97d97ef44336b7382563d66743297e442f # v4.5 with: - maven-version: 3.9.1 + maven-version: 3.9.6 - name: Set up JDK - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 + uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0 with: java-version: '17' distribution: 'temurin' @@ -24,10 +24,10 @@ jobs: - name: Update Versions run: >- mvn -U -Pbuild-individual-bundles -ntp - org.eclipse.tycho:tycho-versions-plugin:4.0.4:set-version -DnewVersion=${{ github.event.milestone.title }}.0-SNAPSHOT - org.eclipse.tycho:tycho-versions-plugin:4.0.4:set-parent-version -DnewParentVersion=${{ github.event.milestone.title }}.0-SNAPSHOT + org.eclipse.tycho:tycho-versions-plugin:4.0.6:set-version -DnewVersion=${{ github.event.milestone.title }}.0-SNAPSHOT + org.eclipse.tycho:tycho-versions-plugin:4.0.6:set-parent-version -DnewParentVersion=${{ github.event.milestone.title }}.0-SNAPSHOT - name: Build and Bump Versions - uses: Wandalen/wretry.action@a163f62ae554a8f3cbe27b23db15b60c0ae2e93c # master + uses: Wandalen/wretry.action@62e10cbe5cd3012bc08b3b1b451bc2dd612e341a # master with: attempt_delay: 120000 attempt_limit: 10 @@ -36,9 +36,9 @@ jobs: clean verify -DskipTests -Dcompare-version-with-baselines.skip=false - org.eclipse.tycho:tycho-versions-plugin:4.0.4:bump-versions -Dtycho.bump-versions.increment=100 + org.eclipse.tycho:tycho-versions-plugin:4.0.6:bump-versions -Dtycho.bump-versions.increment=100 - name: Create Pull Request for Release ${{ github.event.milestone.title }} - uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5.0.2 + uses: peter-evans/create-pull-request@a4f52f8033a6168103c2538976c07b467e8163bc # v6.0.1 with: commit-message: Update for release ${{ github.event.milestone.title }} branch: update_R${{ github.event.milestone.title }} diff --git a/.gitmodules b/.gitmodules index e6d7a47bb6e..ce6633bb6cd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -15,17 +15,14 @@ path = eclipse.jdt.ui url = https://github.com/eclipse-jdt/eclipse.jdt.ui.git [submodule "eclipse.pde"] - path = eclipse.pde - url = https://github.com/eclipse-pde/eclipse.pde.git + path = eclipse.pde + url = https://github.com/eclipse-pde/eclipse.pde.git [submodule "eclipse.platform"] path = eclipse.platform url = https://github.com/eclipse-platform/eclipse.platform.git [submodule "eclipse.platform.swt"] path = eclipse.platform.swt url = https://github.com/eclipse-platform/eclipse.platform.swt.git -[submodule "eclipse.platform.swt.binaries"] - path = eclipse.platform.swt.binaries - url = https://github.com/eclipse-platform/eclipse.platform.swt.binaries.git [submodule "eclipse.platform.ui"] path = eclipse.platform.ui url = https://github.com/eclipse-platform/eclipse.platform.ui.git diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 2cf738be41a..c9814b3b333 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -4,6 +4,6 @@ org.eclipse.tycho tycho-build - 4.0.4 + 4.0.6 \ No newline at end of file diff --git a/.mvn/jvm.config b/.mvn/jvm.config new file mode 100644 index 00000000000..3682bdb860a --- /dev/null +++ b/.mvn/jvm.config @@ -0,0 +1,2 @@ +-XX:+PrintFlagsFinal +-XX:MaxRAMPercentage=35 diff --git a/JenkinsJobs/Builds/I_build.groovy b/JenkinsJobs/Builds/I_build.groovy index 0b88dcd762b..7515172112a 100644 --- a/JenkinsJobs/Builds/I_build.groovy +++ b/JenkinsJobs/Builds/I_build.groovy @@ -147,21 +147,20 @@ spec: """ } } + tools { + jdk 'openjdk-jdk17-latest' + } environment { MAVEN_OPTS = "-Xmx6G" CJE_ROOT = "${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production" PATH = "$PATH:/opt/tools/apache-maven/latest/bin" logDir = "$CJE_ROOT/buildlogs" } - stages { stage('Clean Workspace'){ steps { container('jnlp') { - sh \'\'\' - cd $WORKSPACE - rm -rf * - \'\'\' + cleanWs() } } } @@ -183,7 +182,7 @@ spec: } } } - stage('Genrerate environment variables'){ + stage('Generate environment variables'){ steps { container('jnlp') { sh \'\'\' @@ -234,8 +233,7 @@ spec: steps { container('jnlp') { sshagent(['projects-storage.eclipse.org-bot-ssh']) { - withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) { - withAnt(installation: 'apache-ant-latest', jdk: 'openjdk-jdk17-latest') { + withAnt(installation: 'apache-ant-latest') { sh \'\'\' cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts ./mb020_createBaseBuilder.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb020_createBaseBuilder.sh.log @@ -246,7 +244,6 @@ spec: fi \'\'\' } - } } } } @@ -274,7 +271,7 @@ spec: container('jnlp') { sshagent(['git.eclipse.org-bot-ssh', 'github-bot-ssh']) { sh \'\'\' - git config --global user.email "releng-bot@eclipse.org" + git config --global user.email "eclipse-releng-bot@eclipse.org" git config --global user.name "Eclipse Releng Bot" cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts ./mb100_cloneRepos.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb100_cloneRepos.sh.log @@ -293,8 +290,6 @@ spec: container('jnlp') { sshagent (['git.eclipse.org-bot-ssh', 'github-bot-ssh', 'projects-storage.eclipse.org-bot-ssh']) { sh \'\'\' - git config --global user.email "eclipse-releng-bot@eclipse.org" - git config --global user.name "Eclipse Releng Bot" cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts bash -x ./mb110_tagBuildInputs.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb110_tagBuildInputs.sh.log if [[ ${PIPESTATUS[0]} -ne 0 ]] @@ -310,7 +305,6 @@ spec: stage('Create Source Bundles'){ steps { container('jnlp') { - withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) { sh \'\'\' cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts unset JAVA_TOOL_OPTIONS @@ -322,7 +316,6 @@ spec: exit 1 fi \'\'\' - } } } } @@ -333,7 +326,6 @@ spec: } steps { container('jnlp') { - withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) { sh \'\'\' cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts unset JAVA_TOOL_OPTIONS @@ -345,7 +337,6 @@ spec: exit 1 fi \'\'\' - } } } } @@ -356,8 +347,7 @@ spec: } steps { container('jnlp') { - withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) { - withAnt(installation: 'apache-ant-latest', jdk: 'openjdk-jdk17-latest') { + withAnt(installation: 'apache-ant-latest') { sh \'\'\' cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts bash -x ./mb300_gatherEclipseParts.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb300_gatherEclipseParts.sh.log @@ -368,7 +358,6 @@ spec: fi \'\'\' } - } } } } @@ -379,8 +368,7 @@ spec: } steps { container('jnlp') { - withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) { - withAnt(installation: 'apache-ant-latest', jdk: 'openjdk-jdk17-latest') { + withAnt(installation: 'apache-ant-latest') { sh \'\'\' cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts ./mb310_gatherEquinoxParts.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb310_gatherEquinoxParts.sh.log @@ -391,14 +379,12 @@ spec: fi \'\'\' } - } } } } stage('Generate Repo reports'){ steps { container('jnlp') { - withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) { sh \'\'\' cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts unset JAVA_TOOL_OPTIONS @@ -410,14 +396,12 @@ spec: exit 1 fi \'\'\' - } } } } stage('Generate API tools reports'){ steps { container('jnlp') { - withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) { sh \'\'\' cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts unset JAVA_TOOL_OPTIONS @@ -429,7 +413,6 @@ spec: exit 1 fi \'\'\' - } } } } diff --git a/JenkinsJobs/Cleanup/Clean_ppcle_build.groovy b/JenkinsJobs/Cleanup/Clean_ppcle_build.groovy deleted file mode 100644 index b69f72af9aa..00000000000 --- a/JenkinsJobs/Cleanup/Clean_ppcle_build.groovy +++ /dev/null @@ -1,36 +0,0 @@ -job('Cleanup/Clean-ppcle-build'){ - triggers { - cron('@weekly') - } - - label('ppc64le-build') - - logRotator { - numToKeep(5) - } - - wrappers { //adds pre/post actions - preBuildCleanup() - timestamps() - } - - steps { - shell(''' -#!/bin/bash -x - -cd ${WORKSPACE} - -pwd - -ls -al -du -hs * -df -h - ''') - } - - publishers { - extendedEmail { - recipientList("sravankumarl@in.ibm.com") - } - } -} diff --git a/JenkinsJobs/Cleanup/dailyCleanOldBuilds.groovy b/JenkinsJobs/Cleanup/dailyCleanOldBuilds.groovy index 701471b2a03..11122643002 100644 --- a/JenkinsJobs/Cleanup/dailyCleanOldBuilds.groovy +++ b/JenkinsJobs/Cleanup/dailyCleanOldBuilds.groovy @@ -12,8 +12,6 @@ and other such scripts. numToKeep(5) } - jdk('oracle-jdk8-latest') - label('centos-latest') triggers { @@ -55,10 +53,8 @@ epRelDir=$(ssh genie.releng@projects-storage.eclipse.org ls -d --format=single-c ssh genie.releng@projects-storage.eclipse.org tar -C ${workspace} -xzf ${epRelDir}/eclipse-platform-*-linux-gtk-x86_64.tar.gz ssh genie.releng@projects-storage.eclipse.org wget -O ${workspace}/dailyCleanDownloads.sh https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.releng.aggregator/master/cje-production/cleaners/dailyCleanDownloads.sh -ssh genie.releng@projects-storage.eclipse.org wget -O ${workspace}/cleanupNightlyRepo.sh https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.releng.aggregator/master/cje-production/cleaners/cleanupNightlyRepo.sh ssh genie.releng@projects-storage.eclipse.org bash -x ${workspace}/dailyCleanDownloads.sh -ssh genie.releng@projects-storage.eclipse.org bash -x ${workspace}/cleanupNightlyRepo.sh ${workspace} ssh genie.releng@projects-storage.eclipse.org rm -rf ${workingDir}/${JOB_NAME}* ''') @@ -66,7 +62,7 @@ ssh genie.releng@projects-storage.eclipse.org rm -rf ${workingDir}/${JOB_NAME}* publishers { extendedEmail { - recipientList("sravankumarl@in.ibm.com") + recipientList("rahul.mohanan@ibm.com") } } } diff --git a/JenkinsJobs/Cleanup/pruneDailyRepos.groovy b/JenkinsJobs/Cleanup/pruneDailyRepos.groovy new file mode 100644 index 00000000000..e54f4c4fd76 --- /dev/null +++ b/JenkinsJobs/Cleanup/pruneDailyRepos.groovy @@ -0,0 +1,69 @@ +job('Cleanup/pruneDailyRepos'){ + displayName('Daily Repo Pruner') + description(''' +This job runs several types of "cleanup" on the build machine and downloads server to remove old builds and other left overs from old build. +It acts as a simple cron job, currently running at 16:00 every day, to execute +.../sdk/cleaners/dailyCleanBuildMachine.sh +and other such scripts. + ''') + + logRotator { + daysToKeep(10) + numToKeep(5) + } + + + label('centos-latest') + + triggers { + cron(''' +0 5 * * * +0 17 * * * + ''') + } + + wrappers { //adds pre/post actions + timestamps() + preBuildCleanup() + sshAgent('projects-storage.eclipse.org-bot-ssh') + timeout { + absolute(30) + } + } + + steps { + shell(''' +#!/bin/bash -x + +epDownloadDir=/home/data/httpd/download.eclipse.org/eclipse +dropsPath=${epDownloadDir}/downloads/drops4 +p2RepoPath=${epDownloadDir}/updates +buildDir=${dropsPath}/${buildId} + +workingDir=${epDownloadDir}/workingDir + +workspace=${workingDir}/${JOB_NAME}-${BUILD_NUMBER} + +ssh genie.releng@projects-storage.eclipse.org rm -rf ${workingDir}/${JOB_NAME}* + +ssh genie.releng@projects-storage.eclipse.org mkdir -p ${workspace} +ssh genie.releng@projects-storage.eclipse.org cd ${workspace} + +#get latest Eclipse platform product +epRelDir=$(ssh genie.releng@projects-storage.eclipse.org ls -d --format=single-column ${dropsPath}/R-*|sort|tail -1) +ssh genie.releng@projects-storage.eclipse.org tar -C ${workspace} -xzf ${epRelDir}/eclipse-platform-*-linux-gtk-x86_64.tar.gz + +ssh genie.releng@projects-storage.eclipse.org wget -O ${workspace}/cleanupNightlyRepo.sh https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.releng.aggregator/master/cje-production/cleaners/cleanupNightlyRepo.sh + +ssh genie.releng@projects-storage.eclipse.org bash -x ${workspace}/cleanupNightlyRepo.sh ${workspace} + +ssh genie.releng@projects-storage.eclipse.org rm -rf ${workingDir}/${JOB_NAME}* + ''') + } + + publishers { + extendedEmail { + recipientList("rahul.mohanan@ibm.com") + } + } +} diff --git a/JenkinsJobs/JobDSL.json b/JenkinsJobs/JobDSL.json index 92c4697cad4..49bf45daa20 100644 --- a/JenkinsJobs/JobDSL.json +++ b/JenkinsJobs/JobDSL.json @@ -1,8 +1,8 @@ { "Streams": [ - "4.31" + "4.32" ], "Branches": { - "4.31": "master" + "4.32": "master" } } diff --git a/JenkinsJobs/Releng/deployPlatformParentPom.groovy b/JenkinsJobs/Releng/deployPlatformParentPom.groovy index 6c13ff65b97..8d4539f049d 100644 --- a/JenkinsJobs/Releng/deployPlatformParentPom.groovy +++ b/JenkinsJobs/Releng/deployPlatformParentPom.groovy @@ -22,16 +22,8 @@ For this to be used by consuming projects, they must have their local maven repo remote{ url('https://github.com/eclipse-platform/eclipse.platform.releng.aggregator.git') } - branch('master') - branch('R4_7_maintenance') - branch('R4_8_maintenance') - branch('R4_19_maintenance') - branch('R4_23_maintenance') - branch('R4_26_maintenance') - branch('R4_27_maintenance') - branch('R4_28_maintenance') - branch('R4_29_maintenance') - branch('R4_30_maintenance') + branch('master') + branch('R4_31_maintenance') } } diff --git a/JenkinsJobs/Releng/deploySdkPom.groovy b/JenkinsJobs/Releng/deploySdkPom.groovy index cc405a117f8..ff8e3f22fbc 100644 --- a/JenkinsJobs/Releng/deploySdkPom.groovy +++ b/JenkinsJobs/Releng/deploySdkPom.groovy @@ -23,15 +23,7 @@ For this to be used by consuming projects, they must have their local maven repo url('https://github.com/eclipse-platform/eclipse.platform.releng.aggregator.git') } branch('master') - branch('R4_7_maintenance') - branch('R4_8_maintenance') - branch('R4_19_maintenance') - branch('R4_23_maintenance') - branch('R4_26_maintenance') - branch('R4_27_maintenance') - branch('R4_28_maintenance') - branch('R4_29_maintenance') - branch('R4_30_maintenance') + branch('R4_31_maintenance') } } diff --git a/JenkinsJobs/YBuilds/P_build.groovy b/JenkinsJobs/YBuilds/P_build.groovy index ab208074c31..cc8530fe8e1 100644 --- a/JenkinsJobs/YBuilds/P_build.groovy +++ b/JenkinsJobs/YBuilds/P_build.groovy @@ -121,6 +121,9 @@ spec: """ } } + tools { + jdk 'openjdk-jdk17-latest' + } environment { MAVEN_OPTS = "-Xmx6G" CJE_ROOT = "${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production" @@ -132,17 +135,14 @@ spec: stage('Clean Workspace'){ steps { container('jnlp') { - sh \'\'\' - cd $WORKSPACE - rm -rf * - \'\'\' + cleanWs() } } } stage('Setup intial configuration'){ steps { container('jnlp') { - sshagent(['github-bot-ssh']) { + sshagent(['github-bot-ssh']) { dir ('eclipse.platform.releng.aggregator') { sh \'\'\' git clone -b master git@github.com:eclipse-platform/eclipse.platform.releng.aggregator.git @@ -157,7 +157,7 @@ spec: } } } - stage('Genrerate environment variables'){ + stage('Generate environment variables'){ steps { container('jnlp') { sh \'\'\' @@ -166,14 +166,14 @@ spec: ./mb010_createEnvfiles.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb010_createEnvfiles.sh.log if [[ ${PIPESTATUS[0]} -ne 0 ]] then - echo "Failed in Genrerate environment variables stage" + echo "Failed in Generate environment variables stage" exit 1 fi \'\'\' } } } - stage('Load PGP keys'){ + stage('Load PGP keys'){ environment { KEYRING = credentials('secret-subkeys-releng.asc') KEYRING_PASSPHRASE = credentials('secret-subkeys-releng.acs-passphrase') @@ -207,7 +207,7 @@ spec: container('jnlp') { sshagent(['git.eclipse.org-bot-ssh', 'github-bot-ssh']) { sh \'\'\' - git config --global user.email "releng-bot@eclipse.org" + git config --global user.email "eclipse-releng-bot@eclipse.org" git config --global user.name "Eclipse Releng Bot" cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts ./mb100_cloneRepos.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb100_cloneRepos.sh.log @@ -226,8 +226,6 @@ spec: container('jnlp') { sshagent (['git.eclipse.org-bot-ssh', 'github-bot-ssh', 'projects-storage.eclipse.org-bot-ssh']) { sh \'\'\' - git config --global user.email "releng-bot@eclipse.org" - git config --global user.name "Eclipse Releng Bot" cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts bash -x ./mb110_tagBuildInputs.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb110_tagBuildInputs.sh.log if [[ ${PIPESTATUS[0]} -ne 0 ]] @@ -258,7 +256,6 @@ spec: stage('Aggregator maven build'){ steps { container('jnlp') { - withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) { sh \'\'\' cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts unset JAVA_TOOL_OPTIONS @@ -270,15 +267,13 @@ spec: exit 1 fi \'\'\' - } } } } stage('Gather Eclipse Parts'){ steps { container('jnlp') { - withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) { - withAnt(installation: 'apache-ant-latest', jdk: 'openjdk-jdk17-latest') { + withAnt(installation: 'apache-ant-latest') { sh \'\'\' cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts bash -x ./mb300_gatherEclipseParts.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb300_gatherEclipseParts.sh.log @@ -289,7 +284,6 @@ spec: fi \'\'\' } - } } } } diff --git a/JenkinsJobs/YBuilds/Y_build.groovy b/JenkinsJobs/YBuilds/Y_build.groovy index 528c12b44d2..20ef9b49fc3 100644 --- a/JenkinsJobs/YBuilds/Y_build.groovy +++ b/JenkinsJobs/YBuilds/Y_build.groovy @@ -141,6 +141,9 @@ spec: """ } } + tools { + jdk 'openjdk-jdk17-latest' + } environment { MAVEN_OPTS = "-Xmx6G" CJE_ROOT = "${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production" @@ -152,10 +155,7 @@ spec: stage('Clean Workspace'){ steps { container('jnlp') { - sh \'\'\' - cd $WORKSPACE - rm -rf * - \'\'\' + cleanWs() } } } @@ -177,7 +177,7 @@ spec: } } } - stage('Genrerate environment variables'){ + stage('Generate environment variables'){ steps { container('jnlp') { sh \'\'\' @@ -229,8 +229,7 @@ spec: steps { container('jnlp') { sshagent(['projects-storage.eclipse.org-bot-ssh']) { - withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) { - withAnt(installation: 'apache-ant-latest', jdk: 'openjdk-jdk17-latest') { + withAnt(installation: 'apache-ant-latest') { sh \'\'\' cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts ./mb020_createBaseBuilder.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb020_createBaseBuilder.sh.log @@ -241,7 +240,6 @@ spec: fi \'\'\' } - } } } } @@ -287,8 +285,6 @@ spec: container('jnlp') { sshagent (['git.eclipse.org-bot-ssh', 'github-bot-ssh', 'projects-storage.eclipse.org-bot-ssh']) { sh \'\'\' - git config --global user.email "releng-bot@eclipse.org" - git config --global user.name "Eclipse Releng Bot" cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts bash -x ./mb110_tagBuildInputs.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb110_tagBuildInputs.sh.log if [[ ${PIPESTATUS[0]} -ne 0 ]] @@ -317,7 +313,6 @@ spec: stage('Create Source Bundles'){ steps { container('jnlp') { - withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) { sh \'\'\' cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts unset JAVA_TOOL_OPTIONS @@ -329,7 +324,6 @@ spec: exit 1 fi \'\'\' - } } } } @@ -339,7 +333,6 @@ spec: } steps { container('jnlp') { - withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) { sh \'\'\' cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts unset JAVA_TOOL_OPTIONS @@ -351,7 +344,6 @@ spec: exit 1 fi \'\'\' - } } } } @@ -362,8 +354,7 @@ spec: } steps { container('jnlp') { - withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) { - withAnt(installation: 'apache-ant-latest', jdk: 'openjdk-jdk17-latest') { + withAnt(installation: 'apache-ant-latest') { sh \'\'\' cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts bash -x ./mb300_gatherEclipseParts.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb300_gatherEclipseParts.sh.log @@ -374,7 +365,6 @@ spec: fi \'\'\' } - } } } } @@ -385,8 +375,7 @@ spec: } steps { container('jnlp') { - withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) { - withAnt(installation: 'apache-ant-latest', jdk: 'openjdk-jdk17-latest') { + withAnt(installation: 'apache-ant-latest') { sh \'\'\' cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts ./mb310_gatherEquinoxParts.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb310_gatherEquinoxParts.sh.log @@ -397,14 +386,12 @@ spec: fi \'\'\' } - } } } } stage('Generate Repo reports'){ steps { container('jnlp') { - withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) { sh \'\'\' cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts unset JAVA_TOOL_OPTIONS @@ -416,14 +403,12 @@ spec: exit 1 fi \'\'\' - } } } } stage('Generate API tools reports'){ steps { container('jnlp') { - withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) { sh \'\'\' cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts unset JAVA_TOOL_OPTIONS @@ -435,7 +420,6 @@ spec: exit 1 fi \'\'\' - } } } } @@ -517,6 +501,7 @@ spec: container('jnlp') { build job: 'YPBuilds/ep''' + MAJOR + MINOR + '''Y-unit-cen64-gtk3-java17', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false build job: 'YPBuilds/ep''' + MAJOR + MINOR + '''Y-unit-cen64-gtk3-java21', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false + build job: 'YPBuilds/ep''' + MAJOR + MINOR + '''Y-unit-cen64-gtk3-java22', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false build job: 'YPBuilds/ep''' + MAJOR + MINOR + '''Y-unit-macM1-java17', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false build job: 'YPBuilds/ep''' + MAJOR + MINOR + '''Y-unit-mac64-java17', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false build job: 'Start-smoke-tests', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false @@ -528,13 +513,13 @@ spec: failure { emailext body: "Please go to ${BUILD_URL}console and check the build failure.

", subject: "${env.BUILD_VERSION} Y-Build: ${env.BUILD_IID.trim()} - BUILD FAILED", - to: "rahul.mohanan@ibm.com jarthana@in.ibm.com Sheena.Sheena@ibm.com alshama.m.s@ibm.com elsa.zacharia@ibm.com suby.surendran@ibm.com gpunathi@in.ibm.com sravankumarl@in.ibm.com kalyan_prasad@in.ibm.com lshanmug@in.ibm.com manoj.palat@in.ibm.com niraj.modi@in.ibm.com noopur_gupta@in.ibm.com sarika.sinha@in.ibm.com vikas.chandra@in.ibm.com akurtakov@gmail.com", + to: "rahul.mohanan@ibm.com jarthana@in.ibm.com alshama.m.s@ibm.com elsa.zacharia@ibm.com suby.surendran@ibm.com gpunathi@in.ibm.com sravankumarl@in.ibm.com manoj.palat@in.ibm.com noopur_gupta@in.ibm.com akurtakov@gmail.com", from:"genie.releng@eclipse.org" } success { emailext body: "Eclipse downloads:
https://download.eclipse.org/eclipse/downloads/drops4/${env.BUILD_IID.trim()}

Build logs and/or test results (eventually):
https://download.eclipse.org/eclipse/downloads/drops4/${env.BUILD_IID.trim()}/testResults.php

${env.POM_UPDATES_BODY.trim()}${env.COMPARATOR_ERRORS_BODY.trim()}Software site repository:
https://download.eclipse.org/eclipse/updates/${env.RELEASE_VER.trim()}-Y-builds

Specific (simple) site repository:
https://download.eclipse.org/eclipse/updates/${env.RELEASE_VER.trim()}-Y-builds/${env.BUILD_IID.trim()}

Equinox downloads:
https://download.eclipse.org/equinox/drops/${env.BUILD_IID.trim()}

", subject: "${env.BUILD_VERSION} Y-Build: ${env.BUILD_IID.trim()} ${env.POM_UPDATES_SUBJECT.trim()} ${env.COMPARATOR_ERRORS_SUBJECT.trim()}", - to: "rahul.mohanan@ibm.com jarthana@in.ibm.com Sheena.Sheena@ibm.com alshama.m.s@ibm.com elsa.zacharia@ibm.com suby.surendran@ibm.com gpunathi@in.ibm.com sravankumarl@in.ibm.com kalyan_prasad@in.ibm.com lshanmug@in.ibm.com manoj.palat@in.ibm.com niraj.modi@in.ibm.com noopur_gupta@in.ibm.com sarika.sinha@in.ibm.com vikas.chandra@in.ibm.com akurtakov@gmail.com", + to: "rahul.mohanan@ibm.com jarthana@in.ibm.com alshama.m.s@ibm.com elsa.zacharia@ibm.com suby.surendran@ibm.com gpunathi@in.ibm.com sravankumarl@in.ibm.com manoj.palat@in.ibm.com noopur_gupta@in.ibm.com akurtakov@gmail.com", from:"genie.releng@eclipse.org" } } diff --git a/JenkinsJobs/YBuilds/Y_unit_cen64_gtk3_java22.groovy b/JenkinsJobs/YBuilds/Y_unit_cen64_gtk3_java22.groovy new file mode 100644 index 00000000000..a708a36c53c --- /dev/null +++ b/JenkinsJobs/YBuilds/Y_unit_cen64_gtk3_java22.groovy @@ -0,0 +1,168 @@ +def config = new groovy.json.JsonSlurper().parseText(readFileFromWorkspace('JenkinsJobs/JobDSL.json')) +def STREAMS = config.Streams + +for (STREAM in STREAMS){ + def MAJOR = STREAM.split('\\.')[0] + def MINOR = STREAM.split('\\.')[1] + + pipelineJob('YPBuilds/ep' + MAJOR + MINOR + 'Y-unit-cen64-gtk3-java22'){ + + logRotator { + numToKeep(5) + } + + parameters { + stringParam('buildId', null, null) + stringParam('javaDownload', 'https://download.java.net/java/early_access/jdk22/26/GPL/openjdk-22-ea+26_linux-x64_bin.tar.gz', null) + } + + definition { + cps { + sandbox() + script(''' +pipeline { + options { + timeout(time: 600, unit: 'MINUTES') + timestamps() + buildDiscarder(logRotator(numToKeepStr:'5')) + } + agent { + kubernetes { + label 'centos-unitpod22' + defaultContainer 'custom' + yaml """ +apiVersion: v1 +kind: Pod +spec: + containers: + - name: "jnlp" + resources: + limits: + memory: "2048Mi" + cpu: "2000m" + requests: + memory: "512Mi" + cpu: "1000m" + - name: "custom" + image: "eclipse/platformreleng-centos-gtk3-metacity:8" + imagePullPolicy: "Always" + resources: + limits: + memory: "4096Mi" + cpu: "1000m" + requests: + # memory needs to be at least 1024Mi, see https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/2478 + memory: "1024Mi" + cpu: "1000m" + securityContext: + privileged: false + tty: true + command: + - cat + volumeMounts: + - mountPath: "/opt/tools" + name: "volume-0" + readOnly: false + workingDir: "/home/jenkins/agent" + nodeSelector: {} + restartPolicy: "Never" + volumes: + - name: "volume-0" + persistentVolumeClaim: + claimName: "tools-claim-jiro-releng" + readOnly: true + - configMap: + name: "known-hosts" + name: "volume-1" + - emptyDir: + medium: "" + name: "workspace-volume" + - emptyDir: + medium: "" + name: "volume-3" +""" + } + } + + stages { + stage('Run tests'){ + steps { + container ('custom'){ + wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) { + withEnv(["JAVA_HOME_NEW=${ tool 'openjdk-jdk18-latest' }"]) { + withAnt(installation: 'apache-ant-latest') { + sh \'\'\'#!/bin/bash -x + + buildId=$(echo $buildId|tr -d ' ') + RAW_DATE_START="$(date +%s )" + + export LANG=en_US.UTF-8 + cat /etc/*release + echo -e "\\n\\tRAW Date Start: ${RAW_DATE_START} \\n" + echo -e "\\n\\t whoami: $( whoami )\\n" + echo -e "\\n\\t uname -a: $(uname -a)\\n" + + # 0002 is often the default for shell users, but it is not when ran from + # a cron job, so we set it explicitly, to be sure of value, so releng group has write access to anything + # we create on shared area. + oldumask=$(umask) + umask 0002 + + echo "umask explicitly set to 0002, old value was $oldumask" + + # we want java.io.tmpdir to be in $WORKSPACE, but must already exist, for Java to use it. + mkdir -p ${WORKSPACE}/tmp + + wget -O ${WORKSPACE}/getEBuilder.xml --no-verbose --no-check-certificate https://download.eclipse.org/eclipse/relengScripts/production/testScripts/hudsonBootstrap/getEBuilder.xml 2>&1 + wget -O ${WORKSPACE}/buildproperties.shsource --no-check-certificate https://download.eclipse.org/eclipse/downloads/drops4/${buildId}/buildproperties.shsource + cat ${WORKSPACE}/buildproperties.shsource + source ${WORKSPACE}/buildproperties.shsource + + set -x + mkdir -p ${WORKSPACE}/java + pushd ${WORKSPACE}/java + wget -O jdk.tar.gz --no-verbose ${javaDownload} + tar xzf jdk.tar.gz + rm jdk.tar.gz + export JAVA_HOME_NEW=$(pwd)/$(ls) + popd + set +x + + export PATH=${JAVA_HOME_NEW}/bin:${ANT_HOME}/bin:${PATH} + + echo JAVA_HOME: $JAVA_HOME + export JAVA_HOME=$JAVA_HOME_NEW + echo ANT_HOME: $ANT_HOME + echo PATH: $PATH + export ANT_OPTS="${ANT_OPTS} -Djava.io.tmpdir=${WORKSPACE}/tmp -Djava.security.manager=allow" + + env 1>envVars.txt 2>&1 + ant -diagnostics 1>antDiagnostics.txt 2>&1 + java -XshowSettings -version 1>javaSettings.txt 2>&1 + + ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId -DeclipseStream=$STREAM -DEBUILDER_HASH=${EBUILDER_HASH} -DdownloadURL=https://download.eclipse.org/eclipse/downloads/drops4/${buildId} -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 -DtestSuite=all -Djvm=${JAVA_HOME}/bin/java + + RAW_DATE_END="$(date +%s )" + + echo -e "\\n\\tRAW Date End: ${RAW_DATE_END} \\n" + + TOTAL_TIME=$((${RAW_DATE_END} - ${RAW_DATE_START})) + + echo -e "\\n\\tTotal elapsed time: ${TOTAL_TIME} \\n" + \'\'\' + } + } + } + } + archiveArtifacts '**/eclipse-testing/results/**, **/eclipse-testing/directorLogs/**, *.properties, *.txt' + junit keepLongStdio: true, testResults: '**/eclipse-testing/results/xml/*.xml' + build job: 'YPBuilds/ep-collectYbuildResults', parameters: [string(name: 'triggeringJob', value: "${JOB_BASE_NAME}"), string(name: 'buildURL', value: "${BUILD_URL}"), string(name: 'buildID', value: "${params.buildId}")], wait: false + } + } + } +} + ''') + } + } + } +} diff --git a/NOTICE b/NOTICE index 54938209b80..6d93bcc788f 100644 --- a/NOTICE +++ b/NOTICE @@ -34,7 +34,6 @@ The project maintains the following source code repositories: * https:/github.com/eclipse-platform/eclipse.platform.releng * https:/github.com/eclipse-platform/eclipse.platform.resources * https:/github.com/eclipse-platform/eclipse.platform.swt -* https:/github.com/eclipse-platform/eclipse.platform.swt.binaries * https:/github.com/eclipse-platform/eclipse.platform.team * https:/github.com/eclipse-platform/eclipse.platform.text * https:/github.com/eclipse-platform/eclipse.platform.ua diff --git a/cje-production/P-build/buildproperties.txt b/cje-production/P-build/buildproperties.txt index 6137aff17b6..cf1b77f7f36 100644 --- a/cje-production/P-build/buildproperties.txt +++ b/cje-production/P-build/buildproperties.txt @@ -17,15 +17,15 @@ # CJE build variables BRANCH="master" -PATCH_OR_BRANCH_LABEL="java21patch" -PATCH_BUILD="java21patch" -BUILD_TYPE_NAME="Beta Java 21" +PATCH_OR_BRANCH_LABEL="java22patch" +PATCH_BUILD="java22patch" +BUILD_TYPE_NAME="Beta Java 22" BUILD_TYPE="P" TESTED_BUILD_TYPE="P" -RELEASE_VER="4.30" -STREAM="4.30.0" +RELEASE_VER="4.32" +STREAM="4.32.0" STREAMMajor="4" -STREAMMinor="29" +STREAMMinor="31" STREAMService="0" GIT_ROOT="git@github.com:" AGG_REPO="eclipse-platform/eclipse.platform.releng.aggregator.git" @@ -39,8 +39,8 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates" LOCAL_REPO="localMavenRepo" # Base builder parameters -BASEBUILDER_TAG="4.28" -API_PREV_REF_LABEL="4.28" +BASEBUILDER_TAG="4.30" +API_PREV_REF_LABEL="4.30" #API_FREEZE_REF_LABEL="4.28RC1" API_FREEZE_REF_LABEL="" # Change to appropriate versions and uncomment when entering API freeze @@ -48,17 +48,17 @@ API_FREEZE_REF_LABEL="" # Otherwise set to a blank space FREEZE_PARAMS=" " -PREVIOUS_RELEASE_VER="4.28" -PREVIOUS_RELEASE_REPO_ID="4.28" +PREVIOUS_RELEASE_VER="4.30" +PREVIOUS_RELEASE_REPO_ID="4.30" #build id for getting repo -BASEBUILD_ID="R-4.28-202306050440" +BASEBUILD_ID="R-4.30-202312010110" #release id for downloading eclipse -PREVIOUS_RELEASE_ID="R-4.28-202306050440" +PREVIOUS_RELEASE_ID="R-4.30-202312010110" BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/" -WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.27.0/R-3.27.0-20220829002010/repositoryunittests/" +WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.31.0/R-3.31.0-20230903090456/repositoryunittests/" BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder" -ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.29-I-builds/" +ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.31-I-builds/" #Maven parameters MAVEN_OPTS="-Xmx6G" diff --git a/cje-production/P-build/mb300_gatherEclipseParts.sh b/cje-production/P-build/mb300_gatherEclipseParts.sh index eb11c99f127..c60090b60ed 100755 --- a/cje-production/P-build/mb300_gatherEclipseParts.sh +++ b/cje-production/P-build/mb300_gatherEclipseParts.sh @@ -32,7 +32,7 @@ cp $CJE_ROOT/$AGG_DIR/eclipse-platform-parent/target/mavenproperties.properties # gather repo echo $PATCH_BUILD -PATCH_BUILD_GENERIC=java21patch +PATCH_BUILD_GENERIC=java22patch REPO_DIR=$ECLIPSE_BUILDER_DIR/$PATCH_BUILD/eclipse.releng.repository.$PATCH_BUILD_GENERIC/target/repository if [ -d $REPO_DIR ]; then diff --git a/cje-production/Y-build/buildproperties.txt b/cje-production/Y-build/buildproperties.txt index 46ede163060..9c532688b73 100644 --- a/cje-production/Y-build/buildproperties.txt +++ b/cje-production/Y-build/buildproperties.txt @@ -17,14 +17,14 @@ # CJE build variables BRANCH="master" -PATCH_OR_BRANCH_LABEL="java21" -BUILD_TYPE_NAME="Beta Java 21" +PATCH_OR_BRANCH_LABEL="java22" +BUILD_TYPE_NAME="Beta Java 22" BUILD_TYPE="Y" TESTED_BUILD_TYPE="Y" -RELEASE_VER="4.30" -STREAM="4.31.0" +RELEASE_VER="4.32" +STREAM="4.32.0" STREAMMajor="4" -STREAMMinor="31" +STREAMMinor="32" STREAMService="0" GIT_ROOT="git@github.com:" AGG_REPO="eclipse-platform/eclipse.platform.releng.aggregator.git" @@ -38,26 +38,26 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates" LOCAL_REPO="localMavenRepo" # Base builder parameters -BASEBUILDER_TAG="4.30" -API_PREV_REF_LABEL="4.30" -#API_FREEZE_REF_LABEL="4.30RC1" +BASEBUILDER_TAG="4.31" +API_PREV_REF_LABEL="4.31" +#API_FREEZE_REF_LABEL="4.32RC1" API_FREEZE_REF_LABEL="" # Change to appropriate versions and uncomment when entering API freeze #FREEZE_PARAMS="-DfreezeBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-${API_FREEZE_REF_LABEL}-202108251800/eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip -DfreezeName=Eclipse-SDK-${API_FREEZE_REF_LABEL} -DfreezeFilename=eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip" # Otherwise set to a blank space FREEZE_PARAMS=" " -PREVIOUS_RELEASE_VER="4.30" -PREVIOUS_RELEASE_REPO_ID="4.30" +PREVIOUS_RELEASE_VER="4.31" +PREVIOUS_RELEASE_REPO_ID="4.31" #build id for getting repo -BASEBUILD_ID="R-4.30-202312010110" +BASEBUILD_ID="R-4.31-202402290520" #release id for downloading eclipse -PREVIOUS_RELEASE_ID="R-4.30-202312010110" +PREVIOUS_RELEASE_ID="R-4.31-202402290520" BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/" -WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.22.0/R-3.22.0-20210612170523/repositoryunittests/" +WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.31.0/R-3.31.0-20230903090456/repositoryunittests/" BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder" -ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.31-I-builds/" +ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.32-I-builds/" #Maven parameters MAVEN_OPTS="-Xmx6G" diff --git a/cje-production/Y-build/publish.xml b/cje-production/Y-build/publish.xml index 3c1de6d92af..88014579efd 100644 --- a/cje-production/Y-build/publish.xml +++ b/cje-production/Y-build/publish.xml @@ -184,7 +184,7 @@ + value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64-java17_macosx.cocoa.x86_64_17,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-macM1-java17_macosx.cocoa.aarch64_17,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java17_win32.win32.x86_64_17,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java17_linux.gtk.x86_64_17,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java21_linux.gtk.x86_64_21,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java22_linux.gtk.x86_64_22" /> 4.0.0 org.eclipse eclipse-platform-parent - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT pom - 2024-03 + 2024-06 - 4.31 - 4.31 + 4.32 + 4.32 - 4.0.5-SNAPSHOT + 4.0.7-SNAPSHOT 1.4.3 - 3.2.2 + 3.2.5 - https://download.eclipse.org/eclipse/updates/4.31-I-builds/ + https://download.eclipse.org/eclipse/updates/4.32-I-builds/ - https://download.eclipse.org/eclipse/updates/4.31-I-builds + https://download.eclipse.org/eclipse/updates/4.32-I-builds https://repo.eclipse.org/content/repositories/tycho-snapshots/ UTF-8 https://repo.eclipse.org/content/repositories/eclipse-staging/ - 3.36.0.v20231114-0937 - - - -warn:-deprecation,unavoidableGenericProblems,warningToken - - - -warn:-deprecation,raw,unchecked,discouraged,warningToken + 3.37.0.v20240215-1558 17 + false + false @@ -247,14 +234,11 @@ org.eclipse.tycho target-platform-configuration - org.eclipse eclipse-sdk-prereqs - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT @@ -289,6 +273,12 @@ aarch64 + + + + true + + @@ -463,7 +453,6 @@ - ${code.ignoredWarnings} -verbose -inlineJSR -enableJavadoc @@ -482,7 +471,7 @@ **/package.html - false + true @@ -534,6 +523,7 @@ true ${surefire.testArgLine} ${surefire.platformSystemProperties} ${surefire.systemProperties} ${surefire.moduleProperties} + true @@ -564,7 +554,6 @@ ${tycho.version} warn - all ${comparator.repo} @@ -618,6 +607,7 @@ true true true + en UTF-8 UTF-8 true @@ -687,9 +677,34 @@ a Implementation Requirements: + + category + a + Category: + + + provisional + a + Provisional: + + + jniclass + a + JNI Class: + + + ThreadSafe + a + Thread Safe: + + + issue + a + Issue: + - + org.osgi org.osgi.annotation.bundle @@ -705,6 +720,22 @@ org.osgi.service.component.annotations 1.5.0 + + org.eclipse.pde + org.eclipse.pde.api.tools.annotations + 1.2.0 + + + + javax.inject + javax.inject + 1 + + + javax.annotation + javax.annotation-api + 1.3.2 + @@ -713,36 +744,36 @@ - java21patch + java22patch - 'v'yyyyMMdd-HHmm'_BETA_JAVA21' + 'v'yyyyMMdd-HHmm'_BETA_JAVA22' org.eclipse.jdt - 3.19.200.v20230705-1800 + 3.19.400.v20240221-1800 - [3.19.200.v20230705-1800,3.19.249.v20231213-1800) + [3.19.400.v20240221-1800,3.19.449.v20240612-1800) - https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110/ + https://download.eclipse.org/eclipse/updates/4.31/R-4.31-202402290520/ - eclipse-p2-repo-java21patch - https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110/ + eclipse-p2-repo-java22patch + https://download.eclipse.org/eclipse/updates/4.31/R-4.31-202402290520/ p2 @@ -789,7 +820,7 @@ For maintenance streams should always be "M-builds". Ideally, this value would be provided by the environment, see bug 489789. --> - https://download.eclipse.org/eclipse/updates/4.31-I-builds + https://download.eclipse.org/eclipse/updates/4.32-I-builds @@ -839,9 +870,6 @@ verify - - false - @@ -909,6 +937,10 @@ ${skipAPIAnalysis} + false + ${project.build.directory}/compilelogs + true + ${printApiMessages} @@ -1009,7 +1041,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.3.0 ${java.version} true @@ -1129,7 +1161,7 @@ jar - false + ${failOnJavadocErrors} true diff --git a/eclipse-platform-sources/pom.xml b/eclipse-platform-sources/pom.xml index 5b821794b10..3bbdc427824 100644 --- a/eclipse-platform-sources/pom.xml +++ b/eclipse-platform-sources/pom.xml @@ -15,7 +15,7 @@ org.eclipse eclipse-platform-parent - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT ../eclipse-platform-parent diff --git a/eclipse-platform-sources/sources.xml b/eclipse-platform-sources/sources.xml index cc53a8a647c..8d58d1e35e1 100644 --- a/eclipse-platform-sources/sources.xml +++ b/eclipse-platform-sources/sources.xml @@ -25,9 +25,9 @@ eclipse.platform/**/*.dll eclipse.platform/**/*.jnilib eclipse.platform/**/*.so - eclipse.platform.swt.binaries/**/*.dll - eclipse.platform.swt.binaries/**/*.jnilib - eclipse.platform.swt.binaries/**/*.so + eclipse.platform.swt/binaries/**/*.dll + eclipse.platform.swt/binaries/**/*.jnilib + eclipse.platform.swt/binaries/**/*.so rt.equinox.binaries/org.eclipse.equinox.executable/bin/** rt.equinox.binaries/org.eclipse.equinox.executable/contributed/** rt.equinox.binaries/**/*.dll diff --git a/eclipse.jdt b/eclipse.jdt index 607ce686424..c30e5d79c1d 160000 --- a/eclipse.jdt +++ b/eclipse.jdt @@ -1 +1 @@ -Subproject commit 607ce68642466d18cd7f190a4ec395ddf4306750 +Subproject commit c30e5d79c1de307a3c4bd0e1650a527acbeeefec diff --git a/eclipse.jdt.core b/eclipse.jdt.core index fd0e8bcef6e..b7b08711904 160000 --- a/eclipse.jdt.core +++ b/eclipse.jdt.core @@ -1 +1 @@ -Subproject commit fd0e8bcef6e5bc6be6b15c0e3ebea005296cbf05 +Subproject commit b7b0871190403aba78e0e0a4369e43a08ff05ef2 diff --git a/eclipse.jdt.core.binaries b/eclipse.jdt.core.binaries index 72d3bdcfae0..79101b0c099 160000 --- a/eclipse.jdt.core.binaries +++ b/eclipse.jdt.core.binaries @@ -1 +1 @@ -Subproject commit 72d3bdcfae0382e7821d0bbde2296657207fd138 +Subproject commit 79101b0c09910ab0c1fc3b19446b9a176b196916 diff --git a/eclipse.jdt.debug b/eclipse.jdt.debug index cd1b3f71ad8..fbe88c82527 160000 --- a/eclipse.jdt.debug +++ b/eclipse.jdt.debug @@ -1 +1 @@ -Subproject commit cd1b3f71ad8d1108ae3adae94a936c1b10a16e0f +Subproject commit fbe88c82527a2bc54b34626e40a3c9410ba77a58 diff --git a/eclipse.jdt.ui b/eclipse.jdt.ui index d0421bf6a90..a156877904c 160000 --- a/eclipse.jdt.ui +++ b/eclipse.jdt.ui @@ -1 +1 @@ -Subproject commit d0421bf6a90733dda4abae058478badaf851d804 +Subproject commit a156877904c031c279535dd199febb920eb1be1e diff --git a/eclipse.pde b/eclipse.pde index eb34cab3630..a6824f75205 160000 --- a/eclipse.pde +++ b/eclipse.pde @@ -1 +1 @@ -Subproject commit eb34cab36303cf3449d887c4852284444d66c324 +Subproject commit a6824f75205aca3e2fe3c802a406be4523c68830 diff --git a/eclipse.platform b/eclipse.platform index 21347e8ed66..d0c6961cd8f 160000 --- a/eclipse.platform +++ b/eclipse.platform @@ -1 +1 @@ -Subproject commit 21347e8ed66e9fdf3efecae4b22e81a3200b1310 +Subproject commit d0c6961cd8f3740abefda73e155c25299113bd39 diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/META-INF/MANIFEST.MF b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/META-INF/MANIFEST.MF index 605f6b495dd..d3ddaadc71c 100644 --- a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/META-INF/MANIFEST.MF +++ b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.doc.isv; singleton:=true -Bundle-Version: 3.14.2300.qualifier +Bundle-Version: 3.14.2400.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)" diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml deleted file mode 100644 index 3a35525fe51..00000000000 --- a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${fileList} ${dirList} - - org.eclipse.jdt.doc.isv/buildDoc.xml - generateJavadoc: - Using java home: ${java.home} and javadocExecutable: ${javadocExecutable} - -${basedir}/${replaceFile} before _* expansion: - - - - - - - - - - -${basedir}/${replaceFile} after _* expansion: - - - - - dummyForBug402392=dummyForBug402392 - - - - -${basedir}/${optionsFile} after _* expansion: - - - - - - - - - - - - - - -target/doc.bin.log after javadoc execution - - - - - - - - - - - - - - - - - - diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/cbi_basedirs.properties b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/cbi_basedirs.properties index e0bd6d9e31c..cdee8af58df 100644 --- a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/cbi_basedirs.properties +++ b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/cbi_basedirs.properties @@ -9,7 +9,7 @@ eclipse.platform.debug=../../../eclipse.platform/debug eclipse.platform.platform=../../../eclipse.platform/platform eclipse.platform.resources.bundles=../../../eclipse.platform/resources/bundles eclipse.platform.runtime.bundles=../../../eclipse.platform/runtime/bundles -eclipse.platform.swt.binaries=../../../eclipse.platform.swt.binaries/bundles +eclipse.platform.swt.binaries=../../../eclipse.platform.swt/binaries eclipse.platform.swt.bundles=../../../eclipse.platform.swt/bundles eclipse.platform.team.bundles=../../../eclipse.platform/team/bundles eclipse.platform.ua=../../../eclipse.platform/ua diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml index 2958657de2f..3cdfe8a5401 100644 --- a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml +++ b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml @@ -14,12 +14,12 @@ eclipse.platform.common eclipse.platform.common - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT ../../ org.eclipse.jdt org.eclipse.jdt.doc.isv - 3.14.2300-SNAPSHOT + 3.14.2400-SNAPSHOT eclipse-plugin @@ -45,16 +45,6 @@ org.eclipse.platform.doc.isv 0.0.0 - - eclipse-plugin - org.eclipse.pde.build - 0.0.0 - - - eclipse-plugin - org.eclipse.pde.core - 0.0.0 - eclipse-plugin org.eclipse.core.externaltools @@ -115,106 +105,159 @@ org.eclipse.update.configurator 0.0.0 + + eclipse-plugin + org.eclipse.platform.doc.isv + 0.0.0 + - org.eclipse.tycho.extras - tycho-document-bundle-plugin - - - schema-to-html - process-resources - - schema-to-html - - - - ${basedir}/${eclipse.jdt.core}/org.eclipse.jdt.apt.core/plugin.xml - ${basedir}/${eclipse.jdt.core}/org.eclipse.jdt.core/plugin.xml - ${basedir}/${eclipse.jdt.ui}/org.eclipse.jdt.core.manipulation/plugin.xml - ${basedir}/${eclipse.jdt.debug}/org.eclipse.jdt.debug/plugin.xml - ${basedir}/${eclipse.jdt.debug}/org.eclipse.jdt.debug.ui/plugin.xml - ${basedir}/${eclipse.jdt.ui}/org.eclipse.jdt.junit/plugin.xml - ${basedir}/${eclipse.jdt.ui}/org.eclipse.jdt.junit.core/plugin.xml - ${basedir}/${eclipse.jdt.debug}/org.eclipse.jdt.launching/plugin.xml - ${basedir}/${eclipse.jdt.ui}/org.eclipse.jdt.ui/plugin.xml - - ${basedir}/reference/extension-points - - - - - - org.apache.maven.plugins - maven-dependency-plugin + org.eclipse.tycho.extras + tycho-document-bundle-plugin + + + schema-to-html + process-resources + + schema-to-html + + + + ${basedir}/${eclipse.jdt.core}/org.eclipse.jdt.apt.core/plugin.xml + ${basedir}/${eclipse.jdt.core}/org.eclipse.jdt.core/plugin.xml + ${basedir}/${eclipse.jdt.ui}/org.eclipse.jdt.core.manipulation/plugin.xml + ${basedir}/${eclipse.jdt.debug}/org.eclipse.jdt.debug/plugin.xml + ${basedir}/${eclipse.jdt.debug}/org.eclipse.jdt.debug.ui/plugin.xml + ${basedir}/${eclipse.jdt.ui}/org.eclipse.jdt.junit/plugin.xml + ${basedir}/${eclipse.jdt.ui}/org.eclipse.jdt.junit.core/plugin.xml + ${basedir}/${eclipse.jdt.debug}/org.eclipse.jdt.launching/plugin.xml + ${basedir}/${eclipse.jdt.ui}/org.eclipse.jdt.ui/plugin.xml + + ${basedir}/reference/extension-points + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-platform-doc + process-resources + + unpack-dependencies + + + org.eclipse.platform.doc.isv + ${project.build.directory}/unpack/org.eclipse.platform.doc.isv/reference/api + + + - org.eclipse.tycho.extras - tycho-eclipserun-plugin + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + prepare-package + + javadoc + + + true + *.internal.*:*.internal + Eclipse JDT API Specification + Eclipse JDT API Specification +
Eclipse JDT
${releaseName} (${releaseNumberSDK})]]>
+ Copyright (c) 2000, 2023 Eclipse Contributors and others. All rights reserved.Guidelines for using Eclipse APIs.]]> + ${eclipse.jdt.core}/org.eclipse.jdt.annotation/src + ;${eclipse.jdt.core}/org.eclipse.jdt.core.compiler.batch/src + ;${eclipse.jdt.core}/org.eclipse.jdt.apt.core/src + ;${eclipse.jdt.core}/org.eclipse.jdt.core/antadapter + ;${eclipse.jdt.core}/org.eclipse.jdt.core/codeassist + ;${eclipse.jdt.core}/org.eclipse.jdt.core/compiler + ;${eclipse.jdt.core}/org.eclipse.jdt.core/dom + ;${eclipse.jdt.core}/org.eclipse.jdt.core/eval + ;${eclipse.jdt.core}/org.eclipse.jdt.core/formatter + ;${eclipse.jdt.core}/org.eclipse.jdt.core/model + ;${eclipse.jdt.core}/org.eclipse.jdt.core/search + ;${eclipse.jdt.debug}/org.eclipse.jdt.debug/eval + ;${eclipse.jdt.debug}/org.eclipse.jdt.debug/jdi + ;${eclipse.jdt.debug}/org.eclipse.jdt.debug/model + ;${eclipse.jdt.debug}/org.eclipse.jdt.debug.ui/ui + ;${eclipse.jdt.debug}/org.eclipse.jdt.launching/launching + ;${eclipse.jdt.ui}/org.eclipse.jdt.core.manipulation/common + ;${eclipse.jdt.ui}/org.eclipse.jdt.core.manipulation/refactoring + ;${eclipse.jdt.ui}/org.eclipse.jdt.junit/src + ;${eclipse.jdt.ui}/org.eclipse.jdt.junit.core/src + ;${eclipse.jdt.ui}/org.eclipse.jdt.junit.runtime/src + ;${eclipse.jdt.ui}/org.eclipse.jdt.junit4.runtime/src + ;${eclipse.jdt.ui}/org.eclipse.jdt.junit5.runtime/src + ;${eclipse.jdt.ui}/org.eclipse.jdt.ui/core extension + ;${eclipse.jdt.ui}/org.eclipse.jdt.ui/core refactoring + ;${eclipse.jdt.ui}/org.eclipse.jdt.ui/internal compatibility + ;${eclipse.jdt.ui}/org.eclipse.jdt.ui/ui + ;${eclipse.jdt.ui}/org.eclipse.jdt.ui/ui refactoring + ;${eclipse.platform.ant}/org.eclipse.ant.launching/src + ;${eclipse.platform.ant}/org.eclipse.ant.ui/Ant Editor + ;${eclipse.platform.ant}/org.eclipse.ant.ui/Ant Tools Support + + + + Java development tools core packages + org.eclipse.jdt.core;org.eclipse.jdt.core.* + + + Java development tools UI packages + org.eclipse.jdt.ui;org.eclipse.jdt.ui.* + + + Java development tools APT packages + org.eclipse.jdt.apt.core;org.eclipse.jdt.apt.core.*;com.sun.mirror.* + + + Java development tools debug and launching packages + org.eclipse.ant.launching;org.eclipse.ant.ui.launching;org.eclipse.jdt.debug.*;org.eclipse.jdt.launching;org.eclipse.jdt.launching.* + + + Java development tools JUnit packages + org.eclipse.jdt.junit;org.eclipse.jdt.junit.* + + + + + + ./../../../org.eclipse.platform.doc.isv/reference/api + ${project.build.directory}/unpack/org.eclipse.platform.doc.isv + + +
+
+
+
+ + maven-resources-plugin - dont_skip_me - compile - - false - - - -consolelog - -debug - -data - target/workspace - -application - org.eclipse.ant.core.antRunner - -buildfile - buildDoc.xml - -Dbasedir.properties=cbi_basedirs.properties - -Declipse.javadoc=${eclipse.javadoc} - - - - - org.eclipse.osgi.compatibility.state - eclipse-plugin - - - org.eclipse.ant.core - eclipse-plugin - - - org.apache.ant - eclipse-plugin - - - org.eclipse.help.base - eclipse-plugin - - - org.eclipse.pde.build - eclipse-plugin - - - org.eclipse.pde.core - eclipse-plugin - - - jakarta.annotation-api - eclipse-plugin - - - org.eclipse.update.configurator - eclipse-plugin - - - eclipse-plugin - com.ibm.icu - - - + copy-resources + + prepare-package - eclipse-run + copy-resources + + ${basedir}/reference/api + + + ${project.build.directory}/site/apidocs + + + diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/porting/4.31/faq.html b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/porting/4.31/faq.html new file mode 100644 index 00000000000..871e488891c --- /dev/null +++ b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/porting/4.31/faq.html @@ -0,0 +1,20 @@ + + + + + + + +Eclipse JDT 4.31 Plug-in Migration FAQ + + + + +

Eclipse JDT 4.31 Plug-in Migration FAQ

+ +
    +
  1. None
  2. +
+ + + \ No newline at end of file diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/porting/4.31/incompatibilities.html b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/porting/4.31/incompatibilities.html new file mode 100644 index 00000000000..f9488cde42e --- /dev/null +++ b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/porting/4.31/incompatibilities.html @@ -0,0 +1,19 @@ + + + + + + + +Incompatibilities between Eclipse 4.30 and 4.31 + + +

Incompatibilities between Eclipse 4.30 and 4.31

+ +

+ So far Eclipse did not change incompatibly between 4.30 and 4.31 in ways that affect + plug-ins. Plug-ins that ran on 4.30 should run on 4.31 without any problems. +

+ + + \ No newline at end of file diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/porting/4.31/recommended.html b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/porting/4.31/recommended.html new file mode 100644 index 00000000000..7d49edd6bbd --- /dev/null +++ b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/porting/4.31/recommended.html @@ -0,0 +1,23 @@ + + + + + + + +Adopting JDT 4.31 mechanisms and APIs + + + + +

Adopting JDT 4.31 mechanisms and APIs

+

+ This section describes changes that are required if you are trying to change + your 4.30 plug-in to adopt the 4.31 mechanisms and APIs. +

+ +
    +
  1. None
  2. +
+ + \ No newline at end of file diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/porting/eclipse_4_31_porting_guide.html b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/porting/eclipse_4_31_porting_guide.html new file mode 100644 index 00000000000..aa759eec8f9 --- /dev/null +++ b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/porting/eclipse_4_31_porting_guide.html @@ -0,0 +1,39 @@ + + + + + + + + + + +Eclipse JDT 4.31 Plug-in Migration Guide + + + + +

Eclipse JDT 4.31 Plug-in Migration Guide

+

This guide covers migrating Eclipse JDT 4.30 plug-ins to Eclipse JDT 4.31.

+

One of the goals of Eclipse 4.31 was to move Eclipse forward while remaining compatible + with previous versions to the greatest extent possible. That is, plug-ins written + against the Eclipse 4.30 APIs should continue to work in 4.31 in spite of the + API changes.

+

The key kinds of compatibility are API contract compatibility and binary compatibility. + API contract compatibility means that valid use of 4.30 APIs remains valid for + 4.31, so there is no need to revisit working code. Binary compatibility means + that the API method signatures, etc. did not change in ways that would cause + existing compiled ("binary") code to no longer link and run with the + new 4.31 libraries.

+

While every effort was made to avoid breakage, there are a few areas of incompatibility or new + APIs that should be adopted by clients. + This document describes those areas and provides instructions for migrating 4.30 plug-ins to + 4.31.

+ + + + \ No newline at end of file diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/topics_Porting.xml b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/topics_Porting.xml index 6eb1f236c6b..74b84f215c2 100644 --- a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/topics_Porting.xml +++ b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/topics_Porting.xml @@ -4,6 +4,12 @@ + + + + + + @@ -21,14 +27,14 @@ - - - - - - + + + + + + diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/pom.xml b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/pom.xml index d107f47b788..c58f36b2ac7 100644 --- a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/pom.xml +++ b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.common eclipse.platform.common - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT ../../ org.eclipse.jdt diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/topics_WhatsNew.xml b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/topics_WhatsNew.xml index 96d4ad1bb0c..be014811e9b 100644 --- a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/topics_WhatsNew.xml +++ b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/topics_WhatsNew.xml @@ -4,7 +4,7 @@ - - + + diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/add_default_case.png b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/add_default_case.png deleted file mode 100644 index 2635e31c043..00000000000 Binary files a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/add_default_case.png and /dev/null differ diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/add_default_case_result.png b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/add_default_case_result.png deleted file mode 100644 index 7b873be4b32..00000000000 Binary files a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/add_default_case_result.png and /dev/null differ diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/constant-renaming.png b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/constant-renaming.png deleted file mode 100644 index c2f8414262e..00000000000 Binary files a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/constant-renaming.png and /dev/null differ diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/deprecated-after.png b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/deprecated-after.png deleted file mode 100644 index 19492cdbe21..00000000000 Binary files a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/deprecated-after.png and /dev/null differ diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/deprecated-before.png b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/deprecated-before.png deleted file mode 100644 index 851e4b2a3b0..00000000000 Binary files a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/deprecated-before.png and /dev/null differ diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/formatter_align_arrows.png b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/formatter_align_arrows.png new file mode 100644 index 00000000000..b9dbbba402a Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/formatter_align_arrows.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/insert_break.png b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/insert_break.png deleted file mode 100644 index 1b424146a4e..00000000000 Binary files a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/insert_break.png and /dev/null differ diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/insert_break_result.png b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/insert_break_result.png deleted file mode 100644 index 39363d214dd..00000000000 Binary files a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/insert_break_result.png and /dev/null differ diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/make-static-refactoring-example-after.png b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/make-static-refactoring-example-after.png new file mode 100644 index 00000000000..bb6770b513a Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/make-static-refactoring-example-after.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/make-static-refactoring-example-before.png b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/make-static-refactoring-example-before.png new file mode 100644 index 00000000000..ed5406cece3 Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/make-static-refactoring-example-before.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/remove_default_case.png b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/remove_default_case.png deleted file mode 100644 index 26342bfd18f..00000000000 Binary files a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/remove_default_case.png and /dev/null differ diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/remove_default_case_result.png b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/remove_default_case_result.png deleted file mode 100644 index 64485523794..00000000000 Binary files a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/remove_default_case_result.png and /dev/null differ diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/resource-compiler-options.png b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/resource-compiler-options.png new file mode 100644 index 00000000000..f53a70d7058 Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/resource-compiler-options.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/resource-demo-code.png b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/resource-demo-code.png new file mode 100644 index 00000000000..9695da87dc1 Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/images/resource-demo-code.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/jdt_whatsnew.html b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/jdt_whatsnew.html index 601bf0a9f3d..c1ad51b8795 100644 --- a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/jdt_whatsnew.html +++ b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/whatsNew/jdt_whatsnew.html @@ -17,23 +17,23 @@ table.news tr td.content {vertical-align: top;} ul {padding-left: 13px;} -What's New in Eclipse 4.30 (JDT) +What's New in Eclipse 4.31 (JDT) -

What's New in Eclipse 4.30 (JDT)

+

Java Development Tools

Here are descriptions of some of the more interesting or significant changes made to the Java development tools (JDT) -for the 4.30 release of Eclipse. +for the 4.31 release of Eclipse. They are grouped into:

See also the Eclipse Platform What's New @@ -49,32 +49,24 @@

What's New in Eclipse 4.30 (JDT)

- + + - Java Language Features - -

- The release notably includes the following Java features: -
- JEP 440: Record Patterns. -
- JEP 441: Pattern Matching for Switch. -

- - - + --> + - + + --> @@ -83,116 +75,147 @@

JUnit

Java Editor

- - - Quick Fix to add default case - - You can use the new Quick Fix (Ctrl+1) to add the missing default case to an enhanced switch statement. For example, -

add default case quick fix

- will result in: -

result of add default case quick fix

- - - - - Quick Fix to remove default case - - You can use the new Quick Fix (Ctrl+1) to remove the default case when it is present with unconditional pattern in a switch. For example, -

remove default case quick fix

- will result in: -

result of remove default case quick fix

- - - - - Quick Fix to insert break statement - - You can use the new Quick Fix (Ctrl+1) to insert the break statement when there is an illegal fall-through to a pattern in a switch statement. - For example, -

insert break statement quick fix

- will result in: -

result of insert break statement quick fix

- - - - - Cleanup and quick fix to replace deprecated method calls - - A new cleanup has been added to the Source > Clean Up > Source Fixing tab page to replace deprecated method calls with inlined content. Choosing this option will inline - the implementation of the deprecated method if and only if: -
    -
  1. The deprecated method has Javadoc that specifies a @deprecated tag which ends with "use {@link ...}" or "replace by {@link ...}"
  2. -
  3. The {@link ...} tag refers to a method
  4. -
  5. The linked method is actually called in the implementation of the deprecated method
  6. -
  7. Methods and fields accessed in the linked method are visible at the location it will be inlined (e.g. using a package private method is ok to call if in same package)
  8. -
- For example, cleaning up the following: -

deprecated method call to inline

- will result in inlining the deprecated foo() call in foo2: -

result of deprecated method call inline

-

The functionality is also available as a quick fix for an individual call to a deprecated method that is marked with warning or error. One can also select a deprecated method call and initiate as a quick assist (select call and click CTRL + 1).

- - - - - Quick assist to rename constant fields + + + New Make Static Refactoring - A new quick assist has been added to rename static constant fields to follow a standard syntax using upper-case and underscores rather than camel case. - To use: select the constant and click CTRL+1. - For example, -

rename constant quick assist

- will offer to rename the constant "valConstant1" to "VAL_CONSTANT1". +

A new refactoring called 'Make Static' has been added to Eclipse's Java Development Tools (JDT), which converts instance methods into static methods, when possible. This refactoring adds an extra parameter to the method declarations to handle references to instance fields, methods, or classes in the original method. Existing calls to the method are altered accordingly, and if the extra parameter is necessary, the refactoring passes 'this' or the specific instance originally used to access the method.

+

To apply this refactoring, the following conditions must be met:

+
    +
  • The method is not a constructor.
  • +
  • The method does not override a method from the parent type nor is overridden in any child types.
  • +
  • The type in which the method is declared is not a local type, an anonymous type, or an annotation.
  • +
+

The refactoring can be executed by selecting a method invocation, except in cases where a super method invocation is selected.

+

Make Static Refactoring Example Before

+

Make Static Refactoring Example After

+ + - + + --> - + + + + + Analysis of Resource Leaks Improved with Annotations + + The compiler's capability to detect when resources (implementation of AutoCloseable) are not properly closed + has been enhanced. +

+ Previously, flow analysis for resource leaks was focused on resources that are created and closed within the same method. + It could not deal well with resources that are shared between different methods, + perhaps even different objects. +

+

+ The compiler now interprets an annotation @Owning to understand data flows of resources by way of the + following concepts: +

+
+
A source of resources
Here a resource will come into the focus of the current method, + along with a responsibility to close it.
+
A sink for resources
Here a resource will be consumed, either by closing, or by delegation + to other code which then will be responsible
+
+

Resource allocation is the primordial source, and a call to AutoCloseable.close() is the final sink. + When allocation and closing do not happen within the same method, then annotation @Owning should be used to create + connections through which responsibility for a resource can be transferred from one method to another. + The inverse annotation @NotOwning, on the other hand, signals that no such connection is made; + the original holder of the resource is still responsible for sending it to a suitable sink. +

+

+ code properly annotated for resource leak analysis +

+

+ It's in method produce() where a new resource is allocated. + The return statement in that method is governed by the @Owning annotation on the method. + This implies that returning this value is a sink from the point of view of produce(). + By this method produce() is considered safe. + But looking from the outside this sink is in fact the source by which the resource arrives in method test(). +

+

+ After method test() receives the resource, the responsibility to close is fulfilled by passing it down into consume(). + In method consume() it's the annotation on parameter in that creates the connection: + test() has done its part and now consume() is responsible. + Protecting the resource with a try-with-resources statement is the preferred way to fulfill the responsibility, its implicit close() call is the ultimate sink. + Thus the given combination of method calls indeed creates a provably safe data flow from initial source to final sink, + because both calls are governed by @Owning. +

+

+ The body of produce() also shows another detail: + just like test() it passes the resource as a parameter to another method, here: skipHeader(). + The parameter of skipHeader(), however, is annotated as @NotOwning + by which the method rejects any responsibility. + Indeed there's no close call to be found here, but that's OK under the @NotOwning annotation - this parameter is not a source. + As a result, still after the call to skipHeader() it is produce() who is responsible. + For that reason saying return in; is indeed necessary for produce() to demonstrate obedience to the contract. +

+

+ Additional rules exist for fields holding a resource and for methods other than close() that perform mandatory clean-up. + Details on those can be found in the documentation of org.eclipse.jdt.annotation.Owning. +

+

+ To enable this feature select Java Compiler > Errors/Warnings > Enable annotation based resource analysis in the project preferences: +

+

+ compiler properties dialog +

+ + - + + + Switch Statements/Expressions: Align Arrows on Column + + Switch statements and expressions with arrows can now be aligned so that all arrows are placed at the same position in line. + Open the formatter profile editor and find the new option under Indentation > Align items in columns > Arrows in switch statements/expressions. +

Formatter options and code preview

+ + - + + --> + - Pushdown of refactors and proposals to jdt.manipulations - - A significant amount of code was pushed down from org.eclipse.jdt.ui into org.eclipse.jdt.core.manipulations, specifically most of the proposal and refactor operations. This will allow these operations to be used in a headless environment. - - + --> - + diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/META-INF/MANIFEST.MF b/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/META-INF/MANIFEST.MF index d1c37353780..0cc692db206 100644 --- a/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/META-INF/MANIFEST.MF +++ b/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JDT Tip of the Day Provider Bundle-SymbolicName: org.eclipse.jdt.tips.user;singleton:=true -Bundle-Version: 0.3.0.qualifier +Bundle-Version: 0.3.100.qualifier Bundle-Vendor: Eclipse.org Automatic-Module-Name: org.eclipse.jdt.tips.user Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/content/provider.json b/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/content/provider.json index 2c48fc804c0..a370c903d22 100644 --- a/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/content/provider.json +++ b/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/content/provider.json @@ -4,7 +4,7 @@ "description": "Java and JDT Tips", "expression": "", "variables": { - "baseUrl": "http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/tips/org.eclipse.jdt.tips.user" + "baseUrl": "https://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/tips/org.eclipse.jdt.tips.user" }, "tips": [{ "date": "2018-01-05", diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/pom.xml b/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/pom.xml index 29cd4b3e685..92f3ab72c35 100644 --- a/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/pom.xml +++ b/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/pom.xml @@ -16,11 +16,11 @@ eclipse.platform.common eclipse.platform.common - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT ../../ org.eclipse.ui org.eclipse.tips.core - 0.3.0-SNAPSHOT + 0.3.100-SNAPSHOT eclipse-plugin diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/src/org/eclipse/jdt/tips/user/internal/JDTTipProvider.java b/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/src/org/eclipse/jdt/tips/user/internal/JDTTipProvider.java index f65b461f654..9426a072e92 100644 --- a/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/src/org/eclipse/jdt/tips/user/internal/JDTTipProvider.java +++ b/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/src/org/eclipse/jdt/tips/user/internal/JDTTipProvider.java @@ -34,7 +34,7 @@ public JDTTipProvider() throws MalformedURLException { if (fUrl != null) { setJsonUrl(fUrl); } else { - fUrl = "http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/tips/org.eclipse.jdt.tips.user/" + FILENAME; //$NON-NLS-1$ + fUrl = "https://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/tips/org.eclipse.jdt.tips.user/" + FILENAME; //$NON-NLS-1$ setJsonUrl(fUrl); } } diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/META-INF/MANIFEST.MF b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/META-INF/MANIFEST.MF index 9fc280dd56b..6b48fb918bc 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/META-INF/MANIFEST.MF +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.platform.doc.isv; singleton:=true -Bundle-Version: 4.31.0.qualifier +Bundle-Version: 4.32.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)" diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/buildDoc.xml b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/buildDoc.xml deleted file mode 100644 index 79486856cfa..00000000000 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/buildDoc.xml +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${fileList} ${dirList} - -org.eclipse.platform.doc.isv/buildDoc.xml - generateJavadoc: - Using javadocExecutable: ${javadocExecutable} - - - - - - - - - - - dummyForBug402392=dummyForBug402392 - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt index 5c3a6cb09d3..7c5a1629849 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt @@ -163,6 +163,8 @@ ;${dependency.dir}/org.osgi.service.prefs_*.jar ;${dependency.dir}/org.osgi.service.event_*.jar ;${dependency.dir}/org.osgi.service.cm_*.jar +;${dependency.dir}/org.osgi.service.http.whiteboard_*.jar +;${dependency.dir}/org.osgi.service.component.annotations_*.jar ;${dependency.dir}/jetty-http_*.jar ;${dependency.dir}/jetty-io_*.jar ;${dependency.dir}/jetty-security_*.jar @@ -183,7 +185,7 @@ ;${eclipse.platform.ui.bundles}/org.eclipse.e4.emf.xpath/${dot.classes} ;${rt.equinox.framework.bundles}/org.eclipse.osgi/${dot.classes} ;${rt.equinox.framework.bundles}/org.eclipse.osgi/osgi/osgi.annotation.jar -;${rt.equinox.framework.bundles}/org.eclipse.osgi.services/${dot.classes} +;${rt.equinox.framework.bundles}/org.eclipse.equinox.http.service.api/${dot.classes} ;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.director/${dot.classes} ;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.garbagecollector/${dot.classes} ;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.metadata.repository/${dot.classes} diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml index 43d4177866b..6c25a072b9a 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.common eclipse.platform.common - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT ../../ org.eclipse.platform @@ -50,6 +50,28 @@ + + maven-clean-plugin + + + + reference/api + + + reference/extension-points + + index.html + + + + samples + + samples.html + + + + + org.eclipse.tycho target-platform-configuration @@ -58,17 +80,17 @@ eclipse-plugin - org.eclipse.pde.build + com.ibm.icu 0.0.0 eclipse-plugin - org.eclipse.pde.core + org.osgi.service.event 0.0.0 eclipse-plugin - com.ibm.icu + org.osgi.service.http.whiteboard 0.0.0 @@ -246,6 +268,26 @@ org.osgi.service.cm 0.0.0 + + eclipse-plugin + org.eclipse.equinox.simpleconfigurator + 0.0.0 + + + eclipse-plugin + org.eclipse.e4.ui.workbench.addons.swt + 0.0.0 + + + eclipse-plugin + org.osgi.service.component.annotations + 0.0.0 + + + eclipse-plugin + org.eclipse.e4.emf.xpath + 0.0.0 + eclipse-plugin org.osgi.annotation.versioning @@ -270,42 +312,6 @@ - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-deps - compile - - copy-dependencies - - - - copy - compile - - copy - - - - - jakarta.annotation - jakarta.annotation-api - 1.3.5 - - - jakarta.inject - jakarta.inject-api - 1.0.5 - - - - - - - - org.eclipse.tycho.extras tycho-document-bundle-plugin @@ -371,97 +377,252 @@ - - - org.eclipse.tycho.extras - tycho-eclipserun-plugin - - - dont_skip_me - compile - - false - - - -consolelog - -debug - -data - target/workspace - -application - org.eclipse.ant.core.antRunner - -buildfile - buildDoc.xml - -Dbasedir.properties=cbi_basedirs.properties - -Declipse.javadoc=${eclipse.javadoc} - - - - - org.eclipse.osgi.compatibility.state - eclipse-plugin - - - org.osgi.service.cm - eclipse-plugin - - - org.eclipse.ant.core - eclipse-plugin - - - org.apache.ant - eclipse-plugin - - - org.eclipse.help.base - eclipse-plugin - - - org.eclipse.pde.build - eclipse-plugin - - - org.eclipse.pde.core - eclipse-plugin - - - jakarta.annotation-api - eclipse-plugin - 1.3.5 - - - jakarta.annotation-api - eclipse-plugin - 2.1.1 - - - org.eclipse.equinox.launcher - eclipse-plugin - - - org.eclipse.update.configurator - eclipse-plugin - - - eclipse-plugin - bcpg - - - eclipse-plugin - bcprov - - - eclipse-plugin - com.ibm.icu - - - + + + maven-resources-plugin + + + copy-extension-resources + process-resources + + copy-resources + + + ${basedir}/reference/extension-points + + + ${basedir}/${eclipse.platform.ua}/org.eclipse.ui.cheatsheets/schema/ + false + + cheatSheetContentFileSpec.html + cheatSheetContentFileSpec.exsd + compositeContentFile.html + compositeContentFile.exsd + org.eclipse.ui.intro/schema/introContentFileSpec.html + + + + ${basedir}/${eclipse.platform.ua}/org.eclipse.ui.intro/schema/ + false + + introContentFileSpec.html + + + + + + + copy-example-resources + process-resources + + copy-resources + + + ${basedir}/samples + + + ${basedir}/${eclipse.platform.team.examples} + false + + org.eclipse.compare.examples/doc-html/*.* + org.eclipse.compare.examples.xml/doc-html/*.* + org.eclipse.team.examples.filesystem/doc-html/*.* + + + + ${basedir}/${eclipse.platform.swt.examples} + false + + org.eclipse.swt.examples/doc-html/*.* + org.eclipse.swt.examples.views/doc-html/*.* + org.eclipse.swt.examples.launcher/doc-html/*.* + org.eclipse.swt.examples.ole.win32/doc-html/*.* + + + + ${basedir}/${eclipse.platform.ui.examples} + false + + org.eclipse.ui.examples.fieldassist/doc-html/*.* + org.eclipse.ui.examples.multipageeditor/doc-html/*.* + org.eclipse.ui.examples.propertysheet/doc-html/*.* + org.eclipse.ui.examples.readmetool/doc-html/*.* + org.eclipse.ui.examples.undo/doc-html/*.* + org.eclipse.ui.examples.javaeditor/doc-html/*.* + + + + + + + copy-javadoc + prepare-package - eclipse-run + copy-resources - - - + + ${basedir}/reference/api + + + ${project.build.directory}/site/apidocs + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + process-classes + + javadoc + + + true + *.internal.* + Eclipse Platform API Specification + Eclipse Platform API Specification +
Eclipse Platform
${releaseName} (${releaseNumberSDK})]]>
+ Copyright (c) 2000, 2023 Eclipse Contributors and others. All rights reserved.Guidelines for using Eclipse APIs.]]> + ;${eclipse.platform.ui.bundles}/org.eclipse.ltk.core.refactoring/src + ;${eclipse.platform.ui.bundles}/org.eclipse.ltk.ui.refactoring/src + ;${eclipse.pde}/org.eclipse.pde/src + ;${eclipse.platform.ant}/org.eclipse.ant.core/src + ;${eclipse.platform.debug}/org.eclipse.core.variables/src + ;${eclipse.platform.debug}/org.eclipse.debug.core/core + ;${eclipse.platform.debug}/org.eclipse.debug.ui/ui + ;${eclipse.platform.debug}/org.eclipse.ui.console/src + ;${eclipse.platform.debug}/org.eclipse.unittest.ui/src + ;${eclipse.platform.platform}/org.eclipse.platform/src + ;${eclipse.platform.resources.bundles}/org.eclipse.core.filesystem/src + ;${eclipse.platform.resources.bundles}/org.eclipse.core.resources/src + ;${eclipse.platform.runtime.bundles}/org.eclipse.core.contenttype/src + ;${eclipse.platform.runtime.bundles}/org.eclipse.core.expressions/src + ;${eclipse.platform.runtime.bundles}/org.eclipse.core.jobs/src + ;${eclipse.platform.runtime.bundles}/org.eclipse.core.runtime/src + ;${eclipse.platform.runtime.bundles}/org.eclipse.e4.core.contexts/src + ;${eclipse.platform.runtime.bundles}/org.eclipse.e4.core.di/src + ;${eclipse.platform.runtime.bundles}/org.eclipse.e4.core.di.annotations/src + ;${eclipse.platform.runtime.bundles}/org.eclipse.e4.core.di.extensions/src + ;${eclipse.platform.runtime.bundles}/org.eclipse.e4.core.services/src + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT Accessibility/common/ + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT Accessibility/win32/ + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT AWT/common/ + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT AWT/win32/ + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT Browser/common/ + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT Browser/win32/ + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT Custom Widgets/common/ + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT Drag and Drop/common/ + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/ + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT OLE Win32/win32/ + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT OpenGL/common + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT OpenGL/emulated + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT OpenGL/glx + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT OpenGL/win32 + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT PI/common/ + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT PI/common_j2se/ + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT PI/win32/ + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT Printing/common/ + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT Printing/win32/ + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT Program/common/ + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT Program/win32/ + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT/common/ + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT/common_j2se/ + ;${eclipse.platform.swt.bundles}/org.eclipse.swt/Eclipse SWT/win32/ + ;${eclipse.platform.team.bundles}/org.eclipse.compare/compare + ;${eclipse.platform.team.bundles}/org.eclipse.compare.core/src + ;${eclipse.platform.team.bundles}/org.eclipse.core.net/src + ;${eclipse.platform.team.bundles}/org.eclipse.jsch.core/src + ;${eclipse.platform.team.bundles}/org.eclipse.jsch.ui/src + ;${eclipse.platform.team.bundles}/org.eclipse.team.core/src + ;${eclipse.platform.team.bundles}/org.eclipse.team.ui/src + ;${eclipse.platform.ui.bundles}/org.eclipse.core.filebuffers/src + ;${eclipse.platform.ui.bundles}/org.eclipse.jface.text/projection + ;${eclipse.platform.ui.bundles}/org.eclipse.jface.text/src + ;${eclipse.platform.ui.bundles}/org.eclipse.search.core/search + ;${eclipse.platform.ui.bundles}/org.eclipse.search/newsearch + ;${eclipse.platform.ui.bundles}/org.eclipse.search/search + ;${eclipse.platform.ui.bundles}/org.eclipse.text/projection + ;${eclipse.platform.ui.bundles}/org.eclipse.text/src + ;${eclipse.platform.ui.bundles}/org.eclipse.ui.editors/src + ;${eclipse.platform.ui.bundles}/org.eclipse.ui.workbench.texteditor/src + ;${eclipse.platform.ua}/org.eclipse.help/src + ;${eclipse.platform.ua}/org.eclipse.help.base/src + ;${eclipse.platform.ua}/org.eclipse.help.base/src_demo + ;${eclipse.platform.ua}/org.eclipse.help.ui/src + ;${eclipse.platform.ua}/org.eclipse.help.webapp/src + ;${eclipse.platform.ua}/org.eclipse.ui.cheatsheets/src + ;${eclipse.platform.ua}/org.eclipse.ui.intro/src + ;${eclipse.platform.ua}/org.eclipse.ui.intro.universal/src + ;${eclipse.platform.ua}/org.eclipse.ui.intro.quicklinks/src + ;${eclipse.platform.ui.bundles}/org.eclipse.core.commands/src + ;${eclipse.platform.ui.bundles}/org.eclipse.core.databinding/src + ;${eclipse.platform.ui.bundles}/org.eclipse.core.databinding.beans/src + ;${eclipse.platform.ui.bundles}/org.eclipse.core.databinding.observable/src + ;${eclipse.platform.ui.bundles}/org.eclipse.core.databinding.property/src + ;${eclipse.platform.ui.bundles}/org.eclipse.e4.core.commands/src + ;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.bindings/src + ;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.css.core/src + ;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.css.swt/src + ;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.css.swt.theme/src + ;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.di/src + ;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.dialogs/src + ;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.ide/src + ;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.model.workbench/src + ;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.services/src + ;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.widgets/src + ;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.workbench/src + ;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.workbench.renderers.swt/src + ;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.workbench.swt/src + ;${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.workbench3/src + ;${eclipse.platform.ui.bundles}/org.eclipse.jface/src + ;${eclipse.platform.ui.bundles}/org.eclipse.jface.databinding/src + ;${eclipse.platform.ui.bundles}/org.eclipse.jface.notifications/src + ;${eclipse.platform.ui.bundles}/org.eclipse.ui/src + ;${eclipse.platform.ui.bundles}/org.eclipse.ui.forms/src + ;${eclipse.platform.ui.bundles}/org.eclipse.ui.genericeditor/src + ;${eclipse.platform.ui.bundles}/org.eclipse.ui.ide/extensions + ;${eclipse.platform.ui.bundles}/org.eclipse.ui.ide/src + ;${eclipse.platform.ui.bundles}/org.eclipse.ui.navigator/src + ;${eclipse.platform.ui.bundles}/org.eclipse.ui.navigator.resources/src + ;${eclipse.platform.ui.bundles}/org.eclipse.ui.views/src + ;${eclipse.platform.ui.bundles}/org.eclipse.ui.views.properties.tabbed/src + ;${eclipse.platform.ui.bundles}/org.eclipse.ui.workbench/Eclipse UI + ;${eclipse.platform.ui.bundles}/org.eclipse.ui.workbench/Eclipse UI Editor Support + ;${eclipse.platform.update}/org.eclipse.update.configurator/src + ;${rt.equinox.bundles.bundles}/org.eclipse.equinox.http.jetty/src + ;${rt.equinox.bundles.bundles}/org.eclipse.equinox.app/osgi + ;${rt.equinox.bundles.bundles}/org.eclipse.equinox.app/src + ;${rt.equinox.bundles.bundles}/org.eclipse.equinox.bidi/src + ;${rt.equinox.bundles.bundles}/org.eclipse.equinox.common/src + ;${rt.equinox.bundles.bundles}/org.eclipse.equinox.http.registry/src + ;${rt.equinox.bundles.bundles}/org.eclipse.equinox.http.servlet/src + ;${rt.equinox.bundles.bundles}/org.eclipse.equinox.jsp.jasper/src + ;${rt.equinox.bundles.bundles}/org.eclipse.equinox.jsp.jasper.registry/src + ;${rt.equinox.bundles.bundles}/org.eclipse.equinox.preferences/src + ;${rt.equinox.bundles.bundles}/org.eclipse.equinox.registry/src + ;${rt.equinox.bundles.bundles}/org.eclipse.equinox.security/src + ;${rt.equinox.framework.bundles}/org.eclipse.osgi/container/src + ;${rt.equinox.framework.bundles}/org.eclipse.osgi/supplement/src + ;${rt.equinox.p2.bundles}/org.eclipse.equinox.frameworkadmin/src + ;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.core/src + ;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.director/src + ;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.engine/src + ;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.metadata/src + ;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.metadata.repository/src + ;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.operations/src + ;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.repository/src + ;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.touchpoint.eclipse/src + ;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.ui/src + +
+
+
+
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/porting/4.31/faq.html b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/porting/4.31/faq.html new file mode 100644 index 00000000000..94c5f534005 --- /dev/null +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/porting/4.31/faq.html @@ -0,0 +1,13 @@ + + + + + + + +Eclipse 4.31 Plug-in Migration FAQ + + +

Eclipse 4.31 Plug-in Migration FAQ

+ + \ No newline at end of file diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/porting/4.31/incompatibilities.html b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/porting/4.31/incompatibilities.html new file mode 100644 index 00000000000..05da5168293 --- /dev/null +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/porting/4.31/incompatibilities.html @@ -0,0 +1,24 @@ + + + + + + + +Incompatibilities between Eclipse 4.30 and 4.31 + + +

Incompatibilities between Eclipse 4.30 and 4.31

+ +

+ Eclipse changed in incompatible ways between 4.30 and 4.31 in ways that affect + plug-ins. The following entries describe the areas that changed and provide + instructions for migrating 4.30 plug-ins to 4.31. Note that you only need to look + here if you are experiencing problems running your 4.30 plug-in on 4.31. +

+

+See also the list of deprecated API removals for this release. +

+ + + \ No newline at end of file diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/porting/4.31/recommended.html b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/porting/4.31/recommended.html new file mode 100644 index 00000000000..bcf4b0c0543 --- /dev/null +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/porting/4.31/recommended.html @@ -0,0 +1,25 @@ + + + + + + + + + Adopting 4.31 mechanisms and APIs + + + +

Adopting 4.31 mechanisms and APIs

+ +

This section describes changes that are required if you are + trying to change your 4.30 plug-in to adopt the 4.31 mechanisms and + APIs.

+ + + + + + \ No newline at end of file diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/porting/eclipse_4_31_porting_guide.html b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/porting/eclipse_4_31_porting_guide.html new file mode 100644 index 00000000000..089e8dcc087 --- /dev/null +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/porting/eclipse_4_31_porting_guide.html @@ -0,0 +1,35 @@ + + + + + + + +Eclipse 4.31 Plug-in Migration Guide + + + + +

Eclipse 4.31 Plug-in Migration Guide

+

This guide covers migrating Eclipse 4.30 plug-ins to Eclipse 4.31.

+

One of the goals of Eclipse 4.31 was to move Eclipse forward while remaining compatible + with previous versions to the greatest extent possible. That is, plug-ins written + against the Eclipse 4.30 APIs should continue to work in 4.31 in spite of any API changes.

+

The key kinds of compatibility are API contract compatibility and binary compatibility. + API contract compatibility means that valid use of 4.30 APIs remains valid for + 4.31, so there is no need to revisit working code. Binary compatibility means + that the API method signatures, etc. did not change in ways that would cause + existing compiled ("binary") code to no longer link and run with the + new 4.31 libraries.

+

While every effort was made to avoid breakage, there are a few areas of incompatibility or new + APIs that should be adopted by clients. + This document describes those areas and provides instructions for migrating 4.30 plug-ins to + 4.31.

+ + + + \ No newline at end of file diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/porting/removals.html b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/porting/removals.html index 613e409196d..bf673f20db0 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/porting/removals.html +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/porting/removals.html @@ -137,43 +137,6 @@

3. org.eclipse.core.launcher#Main and WebStartMain and

API removals after June 2021

-

1. Delete deprecated contents of org.eclipse.ui.commands package

- -The following deprecated contents of org.eclipse.ui.commands are not used anymore by the platform and will be deleted. - -
  • AbstractHandler
  • -
  • ActionHandler
  • -
  • CategoryEvent
  • -
  • CommandEvent
  • -
  • CommandException
  • -
  • CommandManagerEvent
  • -
  • ExecutionException
  • -
  • HandlerEvent
  • -
  • HandlerSubmission
  • -
  • ICategory
  • -
  • ICategoryListener
  • -
  • ICommand
  • -
  • ICommandListener
  • -
  • ICommandManager
  • -
  • ICommandManagerListener
  • -
  • IHandler
  • -
  • IHandlerListener
  • -
  • IKeyConfiguration
  • -
  • IKeyConfigurationListener
  • -
  • IKeySequenceBinding
  • -
  • IWorkbenchCommandSupport
  • -
  • KeyConfigurationEvent
  • -
  • NotDefinedException
  • -
  • NotHandledException
  • -
  • Priority
  • -
  • org.eclipse.ui.IWorkbench.getCommandSupport()
  • -
- -

-For further details or to provide feedback on this change, see bug 431177. -

- -

API removals after May 2022

@@ -251,9 +214,6 @@

4. Remove IModelProviderEvent's fields TARGET_CHANG For further details or to provide feedback on this change, see bug 570549.

-

Removed API in previous releases

- -

API removals after December 2025

@@ -272,6 +232,29 @@

1. Support for javax-annotation by the E4 InjectorEclipse 4.30 - New and Noteworthy: Support for Jakarta Annotations by Eclipse E4. + + +

API removals after March 2026

+ +

1. Bundle org.eclipse.osgi.services

+ +The bundle org.eclipse.osgi.services is deprecated for removal. +Its content has already been replaced by the official OSGi bundles published to Maven-Central and it only reexports these org.osgi.service.* bundles. +

+Consumers are encouraged to replace their requirements on the bundle org.eclipse.osgi.services by imports of the used org.osgi.service.* packages already now. +This allows the OSGi runtime to choose any suitable provider of the package that is available. +

+ +

2. PluginVersionIdentifier

+ +The class org.eclipse.core.runtime.PluginVersionIdentifier is deprecated for removal. +As replacement org.osgi.framework.Version should be used. + + + +

Removed API in previous releases

+ +
@@ -607,5 +590,46 @@

2. Remove MultiPageEditor and related API

For further details or to provide feedback on this change, see Issue 1155.

+ + +

API removals in the Eclipse 4.31 release

+

1. Delete deprecated contents of org.eclipse.ui.commands package

+ +The following deprecated contents of org.eclipse.ui.commands are not used anymore by the platform and will be deleted. + +
  • AbstractHandler
  • +
  • ActionHandler
  • +
  • CategoryEvent
  • +
  • CommandEvent
  • + +
  • CommandException
  • +
  • CommandManagerEvent
  • +
  • ExecutionException
  • +
  • HandlerEvent
  • +
  • HandlerSubmission
  • +
  • ICategory
  • +
  • ICategoryListener
  • +
  • ICommand
  • +
  • ICommandListener
  • +
  • ICommandManager
  • +
  • ICommandManagerListener
  • +
  • IHandler
  • +
  • IHandlerListener
  • +
  • IKeyConfiguration
  • +
  • IKeyConfigurationListener
  • +
  • IKeySequenceBinding
  • +
  • IWorkbenchCommandSupport
  • +
  • KeyConfigurationEvent
  • +
  • NotDefinedException
  • +
  • NotHandledException
  • +
  • Priority
  • +
  • org.eclipse.ui.IWorkbench.getCommandSupport()
  • +
+ +

+For further details or to provide feedback on this change, see bug 431177. +

+ + diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/topics_Porting.xml b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/topics_Porting.xml index 4de1a2e9313..cf0b56f6302 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/topics_Porting.xml +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/topics_Porting.xml @@ -5,6 +5,12 @@ + + + + + + @@ -30,6 +36,12 @@ + + + + + + diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/whatsNew/platform_isv_whatsnew.html b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/whatsNew/platform_isv_whatsnew.html index e000cdd003d..f88f772f5c0 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/whatsNew/platform_isv_whatsnew.html +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/whatsNew/platform_isv_whatsnew.html @@ -17,13 +17,13 @@ table.news tr td.content {vertical-align: top;} ul {padding-left: 13px;} -Eclipse Platform What's New in 4.30 +Eclipse Platform What's New in 4.31 -

What's New in Eclipse 4.30

+

Platform and Equinox API

Here are descriptions of some of the changes of interest to plug-in developers -made to the Eclipse Platform and SWT for the 4.30 release of Eclipse. +made to the Eclipse Platform and SWT for the 4.31 release of Eclipse.

  • Platform Changes
  • @@ -48,29 +48,75 @@

    What's New in Eclipse 4.30

    Platform Changes

    - - Eclipse Search + + + Viewer Limit in JFace -

    - The org.eclipse.search bundle has been split into core and ui bundles. This will allow headless extenders to make use of the text search engine. -

    +

    + The API method org.eclipse.jface.viewers.ColumnViewer.setDisplayIncrementally(int incrementSize) was added to + JFace. If incrementSize is set to some positive value, the viewer will initially show + no more than this number of child elements per parent element. + Additionally, the viewer provides a mechanism for a user to show more elements, if available, as needed. + This API solves the problem with UI hangs in case a viewer tries to display a very large number of child elements per parent element. +

    +

    + This feature is currently implemented in org.eclipse.jface.viewers.TableViewer + and org.eclipse.jface.viewers.TreeViewer but is not enabled by default; + incrementSize is 0 by default. + Each concrete viewer implementation is responsible to enable this feature if needed. +

    +

    Note that even though this feature is designed to be backwards compatible API, + there remains the possibility of regressions when converting existing viewer to use + the new API. Please fully test your code when enabling this functionality! +

    - - Snapshot API for Undoable operations + + Viewer Limit in Workbench + +

    Complementary to the JFace API above, org.eclipse.ui.IWorkbenchPreferenceConstants and + org.eclipse.ui.views.WorkbenchViewerSetup API's were added. + This API provides default workbench preference access and a convenient way for viewers + to use default workbench values without writing extra code to listen for preference changes. +

    + + + + + + + + Deprecation of Equinox Bundles -

    - The org.eclipse.ui.ide.undo package in the org.eclipse.ui.ide bundle has been migrated into the core platform and is now available in the org.eclipse.core.resources.undo.snapshot package and it's internal counterpart. This has allowed JDT to move significant portions of their refactor and proposal logic into bundles more suited to a headless environment. -

    +

    + The following Equinox bundles are deprecated for removal: +

    +
      +
    • + org.eclipse.osgi.services
      + Its content has been replaced by the official OSGi bundles published to Maven-Central and it only re-exports these org.osgi.service.* bundles. + Consumers are already encouraged to replace their requirements on the bundle org.eclipse.osgi.services with imports of the actual required org.osgi.service.* packages. + This allows the OSGi runtime to choose any suitable, available provider of the package. +
    • +
    • + org.eclipse.equinox.device
      + This implementation of the org.osgi.service.device service is not known to have any users and did not receive updates in the past. + It is deprecated for removal from future releases without replacement. + In case there are users after all, they can continue to use past releases, use an alternative implementation, or get in contact with the Equinox team. +
    • +
    + - + + --> diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.tips/pom.xml b/eclipse.platform.common/bundles/org.eclipse.platform.doc.tips/pom.xml index 2513c67d9f3..84c9bbab8d6 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.tips/pom.xml +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.tips/pom.xml @@ -16,7 +16,7 @@ eclipse.platform.common eclipse.platform.common - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT ../../ org.eclipse.ui diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/META-INF/MANIFEST.MF b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/META-INF/MANIFEST.MF index 15911a62f5e..4b529e9a337 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/META-INF/MANIFEST.MF +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.platform.doc.user; singleton:=true -Bundle-Version: 4.31.0.qualifier +Bundle-Version: 4.32.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)" diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/images/ref-templates-view.png b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/images/ref-templates-view.png deleted file mode 100644 index da2b6630b95..00000000000 Binary files a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/images/ref-templates-view.png and /dev/null differ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/pom.xml b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/pom.xml index 9ecee8a6853..f3478b56384 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/pom.xml +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.common eclipse.platform.common - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT ../../ org.eclipse.platform diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/help_preferences.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/help_preferences.htm index efd3d7cf27b..506cdde9939 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/help_preferences.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/help_preferences.htm @@ -7,10 +7,10 @@ - Help preferences + Help -

    Help preferences

    +

    Help

    On the command link Help preferences diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/help_preferences_content.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/help_preferences_content.htm index fb71d7fa895..cae1a086a11 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/help_preferences_content.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/help_preferences_content.htm @@ -7,10 +7,10 @@ - Help Content preferences + Help Content -

    Help Content preferences

    +

    Help Content

    Help topics from remote servers can be included seamlessly into the local help system. Use the diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-10.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-10.htm index f826396dcf2..b1b77500a2b 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-10.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-10.htm @@ -22,20 +22,20 @@

    General

    'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Workbench)")'> command link General preference page.

    - +
    - + - + @@ -46,9 +46,17 @@

    General

    - + + + + + + + automatically saved to disk.
    Set it to 0 to disable this feature
    diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-11.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-11.htm index 6b1f4b586cf..d933b539e62 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-11.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-11.htm @@ -61,12 +61,6 @@

    General options

    whenever it is possible. - - - - - + + + + + diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-12.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-12.htm index eb434c66ec7..fd54bd4042a 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-12.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-12.htm @@ -7,10 +7,10 @@ - Editors preference page + Editors -

    Editors preference page

    +

    Editors

    You can change the following preferences on the command linkGeneral > @@ -28,15 +28,34 @@

    Editors preference page

    - + + + + + + + + + + + + + + + + - - + + + + + + +
    Option Description Default
    Always run in backgroundAlways Run in Background Turn this option on to perform long running operations in the background without blocking you from doing other work.
    Off
    Keep next/previous part dialog openKeep Next/Previous Part Dialog Open If this option is turned on then the editor and view cycle dialogs will remain open when their activation key is let go. Normally the dialog closes as soon as the key combination is release. Off Off
    Workbench save intervalInitial Maximum Number of Elements Shown in ViewsSpecifies the limit for incremental view updates. Package Explorer, Project Explorer, Problems View, Java Outline View and JUnit View will + limit the number of initially shown children per parent element.
    + This avoids UI freezes in large viewers, where the limits of the underlying user interface toolkit are hit while trying + to render thousands of elements, leading to minute long UI freezes.
    Set it to 0 to disabl this feature.
    1000
    Workbench Save Interval The field indicates how often the state of the workbench like perspective layouts and open editors is - automatically saved to disk. Set to 0 to disable.
    5
    Off
    Show additional compare information in the status lineIf this option is on, additional information about a change is shown in the - status line. Turn this option on if you are interested in additional information about a change.Off
    Ignore white space This option controls whether or not whitespace change are shown in the compare @@ -170,6 +164,11 @@

    Text Compare options

    calculation time.
    Off
    Swap left and rightControlls wether the Compare editor swaps left and right sides of the display.Off
    When the end/beginning is reached while navigating an element @@ -180,10 +179,11 @@

    Text Compare options

    are comparing two or more elements you will be asked whether you want to go to the beginning/end of the current element or to go to the next/previous element. Moreover, if you choose to remember your decision, this option will be changed to one of the below respectively. -
  • Loop back to the beginning/end: When this option is on, the selection will me moved +
  • Got to the beginning/end of the element: When this option is on, the selection will be moved back to the beginning/end after you reach the end/beginning of an element.
  • Go to the next/previous element: If you are comparing two or more elements and this option is on after you reach the end/beginning of an element the next/previous element will be opened.
  • +
  • Do nothing: If this option is on, nothing will be done when the end/beginning is reached.
  • Prompt Size of recently opened files list Each file that is opened in an editor is stored in a list of recently used files in the File menu. This option controls the number of files that is displayed in that list.420
    Allow in-place system editorsSpecifies whether or not the workbench may open system editors of OLE applications on Windows in-place.On
    Restore editor state at startupSpecifies whether or not the workbench should restore the state of open editors on startup.On
    Promp to save on close even if still open elsewhereSpecifies whether or not the workbench prompts for saving when a dirty editor or view is closed, + but the same is still open in other partsOn
    Close editors automaticallySpecifies whether or not to re-use editors in the Workbench. If on, you may specify the number of editors - to use before they are recycled (the default is 8). You can also specify if a prompt dialog should be opened or - if a new editor should be opened when all editors are "dirty" (have unsaved changes). Once it is turned on, the - Pin Editor action is added to the toolbar and editor tab menu. Pinned editors are not recycled.OffSpecifies whether or not the workbench should automatically close editors when a given number of editors is reached.On
    Number of open editors before closingIf Close editors automatically is turned On this specifies the number of editor that are + kept open for automatically closing editors.99
    diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-16.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-16.htm index defecc921cf..8a92471c2a5 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-16.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-16.htm @@ -7,10 +7,10 @@ - Appearance preference page + Appearance -

    Appearance preference page

    +

    Appearance

    You can change the following preference on the command linkGeneral > @@ -21,21 +21,51 @@

    Appearance preference page

    Description Default + + Enable Theming + Specify whether theming of the user interface should be enabled. If disabled the usage + interface will only use operating system look and feel. + Enabled + Theme - Specify the currently active theme (look and feel). + Specify the currently active theme (look and feel). This setting is only available if + "Enable Theming" is enabled. + Dependent on the operating system + + + Color And Font Theme + Set this to "Reduced Palette" to reduce the amoung of different colors + used and to increase contrast. This setting is only available if "Enable Theming" is enabled. Dependent on the operating system - Enable animations - Specify if the animations should be enabled + Use round tabs + Specify whether the corner of the tabs should be rounded. Disabled Use mixed fonts and colors for labels - Specify if the fonts and colors for labels should be mixed - Fonts and colors should be mixed + Specify if the views should utilize colored labels. + Enabled + + Show most recently used tabs + Specifies whether the list of tabs should be sorted in the order in which they are most recently used. + Enabled + + + Always show full titles + Specify if the tabs in view areas should always show full titles. This setting is only available if + "Enable Theming" is enabled. + Disabled + + + Hide icons + Specify if the icons for tabs in view areas should be hidden. This setting is only available if + "Enable Theming" is enabled. + Disabled + diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-19.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-19.htm index cb3f599c08c..5193bb387e4 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-19.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-19.htm @@ -7,10 +7,10 @@ - Team + Version Control (Team) -

    Team

    +

    Version Control (Team)

    The command link Version Control diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-20-fileContent.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-20-fileContent.htm index 4d0fbd5095a..4d14ae8bdae 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-20-fileContent.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-20-fileContent.htm @@ -7,10 +7,10 @@ - Team File Content + File Content -

    Team File Content

    +

    File Content

    On the command link Team > File diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-20.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-20.htm index bf603417a30..c4d6e0a18bc 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-20.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-20.htm @@ -10,7 +10,7 @@ Ignored Resources -

    Team Ignored Resources

    +

    Ignored Resources

    On the command link Team > Ignored diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-20team-models.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-20team-models.htm index 746004cd1d0..ac8681fa6be 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-20team-models.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-20team-models.htm @@ -7,10 +7,10 @@ - Team Models + Models -

    Team Models

    +

    Models

    The command link Team > Modelspreference page allows you to select which model providers diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-22.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-22.htm index c145f7773ce..b1fc27c6fd7 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-22.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-22.htm @@ -6,7 +6,7 @@ "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." /> - Annotations preference page + Annotations -

    Annotations preference page

    +

    Annotations

    The following preferences can be changed on the diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-35.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-35.htm index 621d5babb25..0fce18e8d26 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-35.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-35.htm @@ -6,7 +6,7 @@ "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." /> - Quick Diff Preference Page + Quick Diff -

    Spelling Preference Page

    +

    Spelling

    The following preferences can be changed on the diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-42.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-42.htm index 2e34c471cf7..5508fd9215b 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-42.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-42.htm @@ -7,10 +7,10 @@ - Web Browser preferences + Web Browser -

    Web Browser preferences

    +

    Web Browser

    The following preferences can be changed on the diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-7.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-7.htm index 498586de257..247ad59e8e8 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-7.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-7.htm @@ -6,12 +6,12 @@ "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." /> - Accessibility preferences + Accessibility -

    Accessibility preferences

    +

    Accessibility

    The following preferences can be changed on the command linkGeneral > Editors > Text diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-antcontentassist.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-antcontentassist.htm index 68554bfb2c1..eca6e929c72 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-antcontentassist.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-antcontentassist.htm @@ -7,10 +7,10 @@ - Ant Content Assist Preferences + Ant Content Assist -

    Ant Content Assist Preferences

    +

    Ant Content Assist

    The following preferences can be changed on the command link Ant > Editor > Content diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-anteditor.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-anteditor.htm index 27ad17dae72..e42bf4c8ca1 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-anteditor.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-anteditor.htm @@ -6,10 +6,10 @@ - Ant editor + Ant Editor -

    Ant editor

    +

    Ant Editor

    The Ant editor provides specialized features for editor Ant buildfiles. Associated with the editor is a Ant buildfile specific Outline view which shows the structure of the Ant build file. It is updated as you edit the buildfile

    The editor diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-anteditorprefs.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-anteditorprefs.htm index b6be6981b0f..82bd3e089a0 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-anteditorprefs.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-anteditorprefs.htm @@ -7,10 +7,10 @@ - Ant Editor Preferences + Ant Editor -

    Ant Editor Preferences

    +

    Ant Editor

    The following preferences can be changed on the command link Ant > Editor diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-antformatter.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-antformatter.htm index 98cc1b65f7e..0e623bb2e57 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-antformatter.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-antformatter.htm @@ -7,10 +7,10 @@ - Ant Formatter Preferences + Ant Formatter -

    Ant Formatter Preferences

    +

    Ant Formatter

    The following preferences can be changed on the command link Ant > Editor > diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-antprefs.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-antprefs.htm index a297bf195c5..09471f00bcf 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-antprefs.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-antprefs.htm @@ -7,10 +7,10 @@ - General Ant Preferences + Ant -

    General Ant Preferences

    +

    Ant

    You can change the following preferences on the command linkAnt preference diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-antruntimeprefs.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-antruntimeprefs.htm index f071f022fef..121062f61f1 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-antruntimeprefs.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-antruntimeprefs.htm @@ -7,10 +7,10 @@ - Ant Runtime Preferences + Ant Runtime -

    Ant Runtime Preferences

    +

    Ant Runtime

    The following preferences can be changed on the command link Ant > Runtime diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-anttemplates.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-anttemplates.htm index 3b4f9d7cfeb..6c45241cdad 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-anttemplates.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-anttemplates.htm @@ -7,10 +7,10 @@ - Ant Templates Preference + Ant Templates -

    Ant Templates Preferences

    +

    Ant Templates

    The following preferences can be changed on the command linkAnt > Editor > diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-capabilitiespref.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-capabilitiespref.htm index 413c9114029..99ef22b0cea 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-capabilitiespref.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-capabilitiespref.htm @@ -10,7 +10,7 @@ Capabilities -

    Capabilities

    +

    Capabilities

    The command link General > Capabilities preference page allows you to enable or disable diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-content-type.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-content-type.htm index 798834d0e9f..64feb13d63c 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-content-type.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-content-type.htm @@ -7,10 +7,10 @@ - Content Types preference page + Content Types -

    Content Types preference page

    +

    Content Types

    The command linkGeneral > Content @@ -18,8 +18,6 @@

    Content Types preference page

    character sets. You can also associate arbitrary file names or file extensions with content types. A content type acts as a description of a certain class of files (for instance, XML files). Eclipse uses this description in various scenarios, such as editor look-ups and file comparisons.

    -

    To access the Content Types preference page, select General > Content - Types.

    Manage content type definitions

    You can define new content types from this preference page. On the right of the tree showing all content types, click on Add Root... or Add Child... (in case a content type is already selected) to @@ -45,6 +43,10 @@

    Associating editors with content types

    Those user-defined editor associations are stored in the user data area.

    Editor associations defined manually can be removed thanks to the Remove button. Editor associations that were defined by a plug-in are locked and cannot be removed.

    +

    In case there are multiple editors suitable to open a content type, you can declare one of these editors as + default editor (the preferred editor). Just select the editor in the associated editors list and press the + Default button. If there is no default editor, the first suitable editor found is used to open the + content type.

    Define default encoding for content type

    You can also set the default encoding for a given content type. To do this, simply enter the encoding name in the provided field and click Update.

    diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-globalizationprefs.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-globalizationprefs.htm index b9f0c6b6836..69eba929b54 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-globalizationprefs.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-globalizationprefs.htm @@ -7,10 +7,10 @@ - Globalization Preferences + Globalization -

    Globalization Preferences

    +

    Globalization

    On the command link General > diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-prefs.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-prefs.htm index 6cb58db71f5..bcfaae9923d 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-prefs.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-prefs.htm @@ -7,10 +7,10 @@ - Secure storage preference page + Secure Storage -

    Secure storage preference page

    +

    Secure Storage

    The command link General > Security > diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-startup-workspaces.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-startup-workspaces.htm index 3c439e5e8e1..45c4c6d78bb 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-startup-workspaces.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-startup-workspaces.htm @@ -7,10 +7,10 @@ - Startup and Shutdown, Workspaces + Workspaces -

    Startup and Shutdown, Workspaces

    +

    Workspaces

    The command link General > Startup and diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-startup.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-startup.htm index 489185c03a3..7e525a38fda 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-startup.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-startup.htm @@ -14,11 +14,8 @@

    Startup and Shutdown

    The command link General > Startup and - Shutdown preference page allows the selection of plug-ins to be automatically activated during workbench - startup.

    -

    Normally plug-ins are not activated until they are needed. However some plug-ins may specify that - they wish to be activated during startup. This preference page allows the selection of which of these plug-ins will - actually be activated during startup.

    + Shutdown
    preference page allows you to configure the startup behaviour.

    +

    General

    - - - - -
    @@ -80,7 +77,7 @@

    Startup and Shutdown

    - If this option is turned on then the workbench will ask if you wish to exit when closing the last window if. + If this option is turned on then the workbench will ask if you wish to exit when closing the last window.
    @@ -89,21 +86,43 @@

    Startup and Shutdown

    -
    - Plug-ins activated on startup -
    -
    -
    - This option allows you to select which available plug-ins should be activated on startup. -
    -
    -
    -
    +

    Windows Defender Exclusion Check

    +

    On Microsoft Windows 10 or later the Microsoft Defender can significantly slow down the startup and + overall performance of Eclipse-based applications. + These applications can now detect if Microsoft Defender is active, inform you about that and, if wanted, + can exclude itself from future Microsoft Defender scans. +

    +

    If Microsoft Defender is active, on first startup of a new installation, a dialog is shown. + Depending on your choice the exclusion is performed for the running installation or the + Microsoft Defender configuration is left untouched. + In both cases the choice is persisted and it is not asked again for this installation. + If you choose to cancel the dialog (by clicking "Cancel" or "Escape") the dialog is shown + again on the next startup. +

    +

    In the "Windows Defender Exclusion Check" section of this preference page you get more detailed + information about the Microsoft Defender handling, you can choose to disable the startup check for + all installations, run the exclusion check or to see the Powershell script used to exclude the current + installation. + Clicking "Run exclusion check" opens the startup dialog regardless of all persisted preferences. + Clicking the "Show Powershell script" button, unfolds the code of that script for review. +

    +

    Note

    +

    Be aware that in general adding exclusion could affect your computer's security level and therefore needs + administrator privileges. + The exclusion from Microsoft Defender scaning is done on process level. This means that + Microsoft Defender won't real-time scan any file opened by the excluded process. + This way the performance improvement applies to all files touched by the process and not only the jars + forming the application. At the same time it allows scheduled or on-demand scans to still check all files. +

    +

    + In general if you do not trust the installed application, plug-ins or content in the workspace, it is not + recommended to apply any exclusion. +

    +

    Plug-Ins Activated on Startup

    +

    The "plug-ins activated on startup" section allows the selection of plug-ins to be automatically + activated during workbench startup. Normally plug-ins are not activated until they are needed. However + some plug-ins may specify that they wish to be activated during startup. This list allows the selection + of which of these plug-ins will actually be activated during startup.

    diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-templates-view.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-templates-view.htm index 72cf0593193..11be1c9487c 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-templates-view.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-templates-view.htm @@ -11,9 +11,6 @@

    Templates view

    This view allows to work with the templates of the currently active editor. The contents of this view is editor-specific and not all editors provide templates.

    -

    In the example below, we see the Templates view showing the templates for a Java source file:

    -

    -

    To add the Templates view to the current perspective, click command link Window > Show View > Other... diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-texteditorprefs.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-texteditorprefs.htm index 5622eb31039..a6253b8cf0b 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-texteditorprefs.htm +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/reference/ref-texteditorprefs.htm @@ -6,7 +6,7 @@ "Copyright (c) IBM Corporation and others 2000, 2018. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." /> - Text Editors preference page + Text Editors -

    Text Editors preference page

    +

    Text Editors

    The following preferences can be changed on the command link General > Editors > diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/tips/images/round_tabs_preference_option.png b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/tips/images/round_tabs_preference_option.png deleted file mode 100644 index 131452cab79..00000000000 Binary files a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/tips/images/round_tabs_preference_option.png and /dev/null differ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/tips/platform_tips.html b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/tips/platform_tips.html index cc33ee82084..cd94fd952bd 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/tips/platform_tips.html +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/tips/platform_tips.html @@ -240,8 +240,10 @@

    Workbench

    Square tabs are used by default in the IDE:

    Square tabs in dark theme

    -

    In order to switch back to using round tabs, you can use the preference option:

    -

    Use round tabs appearance preference

    +

    In order to switch back to using round tabs, you can use the preference option Use round tabs on the + + command linkGeneral > Appearance + preferences page.

    diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/topics_Concepts.xml b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/topics_Concepts.xml index dcd09bb017f..d1e57366648 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/topics_Concepts.xml +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/topics_Concepts.xml @@ -43,6 +43,7 @@ + diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/topics_Reference.xml b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/topics_Reference.xml index f246b347157..2cda4624dd1 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/topics_Reference.xml +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/topics_Reference.xml @@ -108,23 +108,23 @@ - + - + - + - + @@ -181,7 +181,8 @@ - + + diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/topics_WhatsNew.xml b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/topics_WhatsNew.xml index 5a054a09621..8de1cf3929c 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/topics_WhatsNew.xml +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/topics_WhatsNew.xml @@ -4,6 +4,8 @@ - + + + diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/Launch_dialog.png b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/Launch_dialog.png new file mode 100644 index 00000000000..235b6b1180f Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/Launch_dialog.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/Progress_bar.png b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/Progress_bar.png new file mode 100644 index 00000000000..90a0b628df9 Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/Progress_bar.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/Quick_Search.png b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/Quick_Search.png new file mode 100644 index 00000000000..c54cc0ee929 Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/Quick_Search.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/active_tab.png b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/active_tab.png new file mode 100644 index 00000000000..0799489f28e Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/active_tab.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/compare_editor_differences.png b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/compare_editor_differences.png new file mode 100644 index 00000000000..8467e1e9961 Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/compare_editor_differences.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/default-editor-for-content-type.png b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/default-editor-for-content-type.png new file mode 100644 index 00000000000..c9adb5e2ffb Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/default-editor-for-content-type.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/featuresTab.png b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/featuresTab.png new file mode 100644 index 00000000000..ba4edc5107c Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/featuresTab.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/hover.png b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/hover.png new file mode 100644 index 00000000000..d759ad69c7b Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/hover.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/java_structure_compare_selection_differences.png b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/java_structure_compare_selection_differences.png new file mode 100644 index 00000000000..3988dc0c8ca Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/java_structure_compare_selection_differences.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/limit_in_junit_view.png b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/limit_in_junit_view.png new file mode 100644 index 00000000000..2e1cb61f2cf Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/limit_in_junit_view.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/limit_in_outline_view.png b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/limit_in_outline_view.png new file mode 100644 index 00000000000..80e3c00f124 Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/limit_in_outline_view.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/limit_in_package_explorer.png b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/limit_in_package_explorer.png new file mode 100644 index 00000000000..6557dc65a19 Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/limit_in_package_explorer.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/limit_in_problems_view.png b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/limit_in_problems_view.png new file mode 100644 index 00000000000..f7ddac1a0c2 Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/limit_in_problems_view.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/limit_in_project_explorer.png b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/limit_in_project_explorer.png new file mode 100644 index 00000000000..c7162ed6eeb Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/limit_in_project_explorer.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/preference_view_tabs_full_text.png b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/preference_view_tabs_full_text.png new file mode 100644 index 00000000000..9021087fb15 Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/preference_view_tabs_full_text.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/preference_view_tabs_hide_icons.png b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/preference_view_tabs_hide_icons.png new file mode 100644 index 00000000000..e3b379d4bbd Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/preference_view_tabs_hide_icons.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/view_tabs_full_text.png b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/view_tabs_full_text.png new file mode 100644 index 00000000000..423a6689149 Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/view_tabs_full_text.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/view_tabs_hide_icons.png b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/view_tabs_hide_icons.png new file mode 100644 index 00000000000..a19770f4ea6 Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/view_tabs_hide_icons.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/viewer_limit_preference.png b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/viewer_limit_preference.png new file mode 100644 index 00000000000..9f5e0f4b42c Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/viewer_limit_preference.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/windows-defender-autofix_preference-page.png b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/windows-defender-autofix_preference-page.png new file mode 100644 index 00000000000..5577d7aad3b Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/windows-defender-autofix_preference-page.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/windows-defender-autofix_startup-check.png b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/windows-defender-autofix_startup-check.png new file mode 100644 index 00000000000..ff659791a35 Binary files /dev/null and b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/images/windows-defender-autofix_startup-check.png differ diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html index 170f0174326..868feca512f 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html @@ -21,25 +21,22 @@ ul {padding-left: 13px;} /*]]>*/ - Eclipse Platform What's New in 4.30 + Eclipse Platform What's New in 4.31 -

    What's New in Eclipse 4.30 (Platform)

    +

    Platform and Equinox

    Here are descriptions of some of the more interesting or significant changes made to the Eclipse Platform for the - 4.30 release of Eclipse. They are grouped into:

    + 4.31 release of Eclipse. They are grouped into:

    -

    Plug-in developers will also be interested in the corresponding What's new document in the plug-in - developer's guide.

    We also recommend to read the Tips and Tricks.


    @@ -49,133 +46,374 @@

    What's New in Eclipse 4.30 (Platform)

    - + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + - + + --> - - - - - - - - - + + + + + + + + + + + + - - + + + + + + + + - - - - + + + - - - - - + + + + + diff --git a/eclipse.platform.common/pom.xml b/eclipse.platform.common/pom.xml index 3a395fdb92a..755d10570a3 100644 --- a/eclipse.platform.common/pom.xml +++ b/eclipse.platform.common/pom.xml @@ -15,7 +15,7 @@ org.eclipse eclipse-platform-parent - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT ../eclipse-platform-parent @@ -77,23 +77,6 @@ - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - process-resources - - copy-dependencies - - - true - true - - - - org.eclipse.tycho.extras tycho-document-bundle-plugin diff --git a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target index 68c41599fb4..c3ddcea42b3 100644 --- a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target +++ b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target @@ -10,14 +10,14 @@ - - - - - - - - + + + + + + + + @@ -26,12 +26,12 @@ - - - - - - + + + + + + @@ -41,32 +41,32 @@ - + - + - + - - - - + + + + - - - - - - - + + + + + + + @@ -82,7 +82,7 @@ - + @@ -106,7 +106,7 @@ com.ibm.icu icu4j - 74.1 + 74.2 jar @@ -136,7 +136,7 @@ net.java.dev.jna jna-platform - 5.13.0 + 5.14.0 jar @@ -148,7 +148,7 @@ org.apache.sshd sshd-osgi - 2.11.0 + 2.12.1 jar @@ -172,7 +172,7 @@ org.jsoup jsoup - 1.17.1 + 1.17.2 jar @@ -190,13 +190,13 @@ org.slf4j slf4j-api - 2.0.9 + 2.0.12 jar org.slf4j slf4j-simple - 2.0.9 + 2.0.12 jar @@ -227,6 +227,30 @@ 2.3.3 jar + + org.eclipse.jetty.ee8 + jetty-ee8-apache-jsp + 12.0.7 + jar + + + org.eclipse.jetty.ee8 + jetty-ee8-nested + 12.0.7 + jar + + + org.eclipse.jetty.ee8 + jetty-ee8-security + 12.0.7 + jar + + + org.eclipse.jetty.ee8 + jetty-ee8-servlet + 12.0.7 + jar + org.eclipse.jetty.toolchain jetty-servlet-api @@ -236,67 +260,43 @@ org.eclipse.jetty jetty-http - 12.0.3 + 12.0.7 jar org.eclipse.jetty jetty-io - 12.0.3 + 12.0.7 jar org.eclipse.jetty jetty-security - 12.0.3 + 12.0.7 jar org.eclipse.jetty jetty-server - 12.0.3 + 12.0.7 jar org.eclipse.jetty jetty-session - 12.0.3 + 12.0.7 jar org.eclipse.jetty jetty-util-ajax - 12.0.3 + 12.0.7 jar org.eclipse.jetty jetty-util - 12.0.3 - jar - - - org.eclipse.jetty.ee8 - jetty-ee8-apache-jsp - 12.0.3 - jar - - - org.eclipse.jetty.ee8 - jetty-ee8-nested - 12.0.3 - jar - - - org.eclipse.jetty.ee8 - jetty-ee8-security - 12.0.3 - jar - - - org.eclipse.jetty.ee8 - jetty-ee8-servlet - 12.0.3 + 12.0.7 jar @@ -305,10 +305,16 @@ 3.0.4 jar + + org.mortbay.jasper + apache-el + 9.0.83.1 + jar + org.mortbay.jasper apache-jsp - 9.0.52 + 9.0.83.1 jar @@ -318,25 +324,25 @@ net.bytebuddy byte-buddy-agent - 1.14.10 + 1.14.12 jar net.bytebuddy byte-buddy - 1.14.10 + 1.14.12 jar org.assertj assertj-core - 3.24.2 + 3.25.3 jar org.mockito mockito-core - 5.8.0 + 5.11.0 jar @@ -437,12 +443,6 @@ 1.1.1 jar - - org.osgi - org.osgi.service.http - 1.2.2 - jar - org.osgi org.osgi.service.log.stream @@ -568,20 +568,23 @@ jar - biz.aQute.bnd - biz.aQute.resolve - 7.0.0 - - - org.bndtools - org.bndtools.templating - 7.0.0 - - - org.bndtools - org.bndtools.templates.template - 7.0.0 - + biz.aQute.bnd + biz.aQute.resolve + 7.0.0 + jar + + + org.bndtools + org.bndtools.templates.template + 7.0.0 + jar + + + org.bndtools + org.bndtools.templating + 7.0.0 + jar + @@ -607,7 +610,7 @@ org.apache.felix org.apache.felix.scr - 2.2.6 + 2.2.10 jar @@ -623,73 +626,73 @@ org.junit.jupiter junit-jupiter-api - 5.10.1 + 5.10.2 jar org.junit.jupiter junit-jupiter-engine - 5.10.1 + 5.10.2 jar org.junit.jupiter junit-jupiter-migrationsupport - 5.10.1 + 5.10.2 jar org.junit.jupiter junit-jupiter-params - 5.10.1 + 5.10.2 jar org.junit.platform junit-platform-commons - 1.10.1 + 1.10.2 jar org.junit.platform junit-platform-engine - 1.10.1 + 1.10.2 jar org.junit.platform junit-platform-launcher - 1.10.1 + 1.10.2 jar org.junit.platform junit-platform-runner - 1.10.1 + 1.10.2 jar org.junit.platform junit-platform-suite-api - 1.10.1 + 1.10.2 jar org.junit.platform junit-platform-suite-commons - 1.10.1 + 1.10.2 jar org.junit.platform junit-platform-suite-engine - 1.10.1 + 1.10.2 jar org.junit.vintage junit-vintage-engine - 5.10.1 + 5.10.2 jar @@ -722,8 +725,14 @@ - + + + jakarta.activation + jakarta.activation-api + 2.1.3 + jar + jakarta.annotation jakarta.annotation-api @@ -749,10 +758,11 @@ jar - jakarta.xml.bind - jakarta.xml.bind-api - 4.0.1 - + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.2 + jar + diff --git a/eclipse.platform.releng.prereqs.sdk/pom.xml b/eclipse.platform.releng.prereqs.sdk/pom.xml index 77f6b992492..05c06900296 100644 --- a/eclipse.platform.releng.prereqs.sdk/pom.xml +++ b/eclipse.platform.releng.prereqs.sdk/pom.xml @@ -12,7 +12,7 @@ org.eclipse eclipse-platform-parent - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT ../eclipse-platform-parent diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product index a2b264d9ac3..e19f560dcf5 100755 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product @@ -1,7 +1,7 @@ - + http://eclipse.org/legal/epl/notice.php diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml index 46f8658fdb5..9948105504d 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml @@ -19,7 +19,7 @@ eclipse.platform.releng.tychoeclipsebuilder eclipse.platform.releng.tychoeclipsebuilder - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT eclipse-junit-tests @@ -36,8 +36,6 @@ a better way? --> ../../eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/target/doc.bin.log - ../../eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/target/doc.bin.log - ../../eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/target/platformconvert.txt - - - - + http://eclipse.org/legal/epl/notice.php diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/pom.xml index be833e5302c..dd1180c116a 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/pom.xml @@ -25,7 +25,7 @@ eclipse.platform.releng.tychoeclipsebuilder eclipse.platform.releng.tychoeclipsebuilder - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT equinox-sdk diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product index 68659332b87..397e2562a3b 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product @@ -1,7 +1,7 @@ - + diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml index 28251c94027..f06f3915ee3 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml @@ -19,7 +19,7 @@ eclipse.platform.releng.tychoeclipsebuilder eclipse.platform.releng.tychoeclipsebuilder - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT org.eclipse.rt.osgistarterkit.product @@ -30,7 +30,6 @@ org.eclipse.tycho tycho-packaging-plugin - ${tycho.version} '${buildId}' @@ -40,7 +39,6 @@ org.eclipse.tycho target-platform-configuration - p2 linux diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/category.xml b/eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/category.xml deleted file mode 100644 index 1685dbd4e46..00000000000 --- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/category.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - Eclipse Java 21 support for 2023-12 development stream. - - - diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/antrunbuild.xml b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/eclipse.releng.repository.java22patch/antrunbuild.xml similarity index 100% rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/antrunbuild.xml rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/eclipse.releng.repository.java22patch/antrunbuild.xml diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java22patch/eclipse.releng.repository.java22patch/category.xml b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/eclipse.releng.repository.java22patch/category.xml new file mode 100644 index 00000000000..dc009852b12 --- /dev/null +++ b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/eclipse.releng.repository.java22patch/category.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + Eclipse Java 22 support for 2024-03 development stream. + + + diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/patchMatchVersion.xsl b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/eclipse.releng.repository.java22patch/patchMatchVersion.xsl similarity index 100% rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/patchMatchVersion.xsl rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/eclipse.releng.repository.java22patch/patchMatchVersion.xsl diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/eclipse.releng.repository.java22patch/pom.xml similarity index 92% rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/pom.xml rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/eclipse.releng.repository.java22patch/pom.xml index 4c0475db066..9e5144dfdfd 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/eclipse.releng.repository.java22patch/pom.xml @@ -16,13 +16,13 @@ 4.0.0 eclipse.platform.releng - eclipse.platform.releng.java21patch - 4.31.0-SNAPSHOT + eclipse.platform.releng.java22patch + 4.32.0-SNAPSHOT ../ eclipse.platform.releng - eclipse.releng.repository.java21patch + eclipse.releng.repository.java22patch 1.2.300-SNAPSHOT eclipse-repository @@ -158,7 +158,7 @@ ${tycho.version} - categories-java21patch + categories-java22patch package publish-categories @@ -175,22 +175,22 @@ - assemble-java21patch + assemble-java22patch package - Java 21 support - Java21PatchRepo + Java 22 support + Java22PatchRepo assemble-repository - archive-java21patch + archive-java22patch pre-integration-test - Java 21 support - Java21PatchRepo + Java 22 support + Java22PatchRepo archive-repository diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/build.properties similarity index 100% rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/build.properties rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/build.properties diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/feature.properties similarity index 96% rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/feature.properties rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/feature.properties index c845deb3b2f..b6988a9c87d 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/feature.properties +++ b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/feature.properties @@ -28,7 +28,7 @@ description=Dummy feature for build-time constraint. # "copyright" property - text of the "Feature Update Copyright" copyright=\ -Copyright (c) 2000, 2023 IBM Corporation and others.\n\ +Copyright (c) 2000, 2024 IBM Corporation and others.\n\ \n\ This program and the accompanying materials\n\ are made available under the terms of the Eclipse Public License 2.0\n\ diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/feature.xml b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/feature.xml similarity index 92% rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/feature.xml rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/feature.xml index ecc16a0c8a3..a43365fe622 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/feature.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/feature.xml @@ -2,7 +2,7 @@ diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt similarity index 100% rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/pom.xml similarity index 85% rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/pom.xml rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/pom.xml index fc9abad52a3..e22bf4997cc 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/pom.xml @@ -13,12 +13,12 @@ 4.0.0 eclipse.platform.releng - eclipse.platform.releng.java21patch - 4.31.0-SNAPSHOT + eclipse.platform.releng.java22patch + 4.32.0-SNAPSHOT org.eclipse.jdt.feature org.eclipse.jdt - 3.19.200.v20230705-1800 + 3.19.400.v20240221-1800 eclipse-feature diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF similarity index 100% rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.dummy/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.dummy/build.properties similarity index 100% rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.dummy/build.properties rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.dummy/build.properties diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.dummy/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.dummy/pom.xml similarity index 92% rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.dummy/pom.xml rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.dummy/pom.xml index a3b9dcf3c66..ea7df0e79b1 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.dummy/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.dummy/pom.xml @@ -13,8 +13,8 @@ 4.0.0 eclipse.platform.releng - eclipse.platform.releng.java21patch - 4.31.0-SNAPSHOT + eclipse.platform.releng.java22patch + 4.32.0-SNAPSHOT org.eclipse.jdt org.eclipse.jdt.dummy diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/build.properties similarity index 100% rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/build.properties rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/build.properties diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/feature.properties similarity index 87% rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/feature.properties rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/feature.properties index 9c1c533ae23..9b616c0726e 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/feature.properties +++ b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/feature.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2023 IBM Corporation and others. +# Copyright (c) 2024 IBM Corporation and others. # # This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 @@ -18,17 +18,17 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=Eclipse JDT (Java Development Tools) Patch with Java 21 support for 2023-09 development stream +featureName=Eclipse JDT (Java Development Tools) Patch with Java 22 support for 2024-03 development stream # "providerName" property - name of the company that provides the feature providerName=Eclipse.org # "description" property - description of the feature -description=Eclipse Java 21 support for 2023-09 development stream.\n +description=Eclipse Java 22 support for 2024-03 development stream.\n # "copyright" property - text of the "Feature Update Copyright" copyright=\ -Copyright (c) 2000, 2023 IBM Corporation and others.\n\ +Copyright (c) 2000, 2024 IBM Corporation and others.\n\ \n\ This program and the accompanying materials\n\ are made available under the terms of the Eclipse Public License 2.0\n\ diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/feature.xml b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/feature.xml similarity index 86% rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/feature.xml rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/feature.xml index c25bb516d2b..114f4ae238c 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/feature.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/feature.xml @@ -1,6 +1,6 @@ - + eclipse.platform.releng eclipse.platform.releng.java21patch - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT org.eclipse.jdt.feature - org.eclipse.jdt.java21patch + org.eclipse.jdt.java22patch 1.2.300-SNAPSHOT eclipse-feature diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/sourceTemplateFeature/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/sourceTemplateFeature/feature.properties similarity index 90% rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/sourceTemplateFeature/feature.properties rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/sourceTemplateFeature/feature.properties index 07f28714b14..6cdd8830bc8 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/sourceTemplateFeature/feature.properties +++ b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/sourceTemplateFeature/feature.properties @@ -18,17 +18,17 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=Eclipse JDT (Java Development Tools) Source Patch with Java 21 support for 2023-12 development stream +featureName=Eclipse JDT (Java Development Tools) Source Patch with Java 22 support for 2024-03 development stream # "providerName" property - name of the company that provides the feature providerName=Eclipse.org # "description" property - description of the feature -description=Eclipse Java 21 support for 2023-12 development stream.\n +description=Eclipse Java 22 support for 2024-03 development stream.\n # "copyright" property - text of the "Feature Update Copyright" copyright=\ -Copyright (c) 2000, 2023 IBM Corporation and others.\n\ +Copyright (c) 2000, 2024 IBM Corporation and others.\n\ \n\ This program and the accompanying materials\n\ are made available under the terms of the Eclipse Public License 2.0\n\ diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/sourceTemplateFeature/p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/sourceTemplateFeature/p2.inf similarity index 100% rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/sourceTemplateFeature/p2.inf rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/sourceTemplateFeature/p2.inf diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/pom.xml similarity index 96% rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/pom.xml rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/pom.xml index 03daf92b17b..2686ecafe66 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/pom.xml @@ -18,13 +18,13 @@ org.eclipse eclipse-platform-parent - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT ../../eclipse-platform-parent eclipse.platform.releng eclipse.platform.releng.java21patch - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT pom diff --git a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml index 21eae85d302..09ca70235da 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml @@ -19,7 +19,7 @@ org.eclipse eclipse-platform-parent - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT ../eclipse-platform-parent diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/feature.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/feature.xml index 9e4f80cf515..286b2311c99 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/feature.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/feature.xml @@ -2,7 +2,7 @@ diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/forceQualifierUpdate.txt b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/forceQualifierUpdate.txt index abe1889418b..b5064e9e1cb 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/forceQualifierUpdate.txt +++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/forceQualifierUpdate.txt @@ -1,23 +1,2 @@ # To force a version qualifier update add the bug here -Bug 403352 - Update all parent versions to match our build stream -Bug 414132 - several "Unanticipated" comparator issues logged in I20130730-0800 -Bug 419092 - [Mac] Kepler doesn't launch without JRE 6, even if JDK 7 is installed (Platform Runtime build) -Bug 425840 - Unanticipated comparator error in I20140115-1300 -Bug 429093 - Some old icons can be removed from equinox. -Bug 433814 - Unanticipated comparator error last few I-builds -Bug 435503 - rcp.config shows unexpected comparator errors (gtk executables recompiled) -Bug 434815 - [Mac] Luna M7 doesn't launch without JRE 6, -Bug 434815 - [Mac] Luna M7 doesn't launch without JRE 6,redux -Bug 434619 - Switching to GTK+ 2/3 should be easier for products (follow-up) -Bug 442290 - Add ppc64le support into 4.5 build -Bug 444051 - Comparator error in I20140914-2000 build - again. -Bug 454373 - Comparator error in rcp.config in 20141207-2000 -Bug 454373 - Comparator error in rcp.config in I20141210-0800 -Bug 449990 - [1.9] --launcher.XXMaxPermSize should not pass -XX:MaxPermSize= for Oracle VMs >= 8 -Bug 458558 - [1.9] --launcher.XXMaxPermSize should not pass -XX:MaxPermSize= for Oracle VMs >= 8 -Bug 458558 - [1.9] --launcher.XXMaxPermSize should not pass -XX:MaxPermSize= for Oracle VMs >= 8 -Touch due to changes for "Mac App" layout -Bug 461674 - [Mac] Look for eclipse.ini in new place -Bug 461674 - [Mac] Look for eclipse.ini in new place -Bug 461674 - [Mac] Look for eclipse.ini in new place -Touch due to recompiled launcher binaries. \ No newline at end of file +https://github.com/eclipse-equinox/equinox/pull/401 diff --git a/eclipse.platform.releng/bundles/org.eclipse.ant.optional.junit/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.ant.optional.junit/pom.xml index 6c670b5cda1..fd6e8722d93 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.ant.optional.junit/pom.xml +++ b/eclipse.platform.releng/bundles/org.eclipse.ant.optional.junit/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.releng eclipse.platform.releng - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT ../../ org.eclipse.ant diff --git a/eclipse.platform.releng/bundles/org.eclipse.rcp/META-INF/MANIFEST.MF b/eclipse.platform.releng/bundles/org.eclipse.rcp/META-INF/MANIFEST.MF index 54533ab5bb5..ec149b433fa 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.rcp/META-INF/MANIFEST.MF +++ b/eclipse.platform.releng/bundles/org.eclipse.rcp/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rcp; singleton:=true -Bundle-Version: 4.31.0.qualifier +Bundle-Version: 4.32.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/eclipse.platform.releng/bundles/org.eclipse.rcp/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.rcp/pom.xml index b5f7d4dafb3..2b3677d568d 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.rcp/pom.xml +++ b/eclipse.platform.releng/bundles/org.eclipse.rcp/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.releng eclipse.platform.releng - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT ../../ org.eclipse.rcp diff --git a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/forceQualifierUpdate.txt b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/forceQualifierUpdate.txt index b655525a7ca..d26bf952509 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/forceQualifierUpdate.txt +++ b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/forceQualifierUpdate.txt @@ -2,3 +2,4 @@ Bug 403352 - Update all parent versions to match our build stream Bug 534597 - Unanticipated comparator errors in I20180511-2000 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184 +https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659 \ No newline at end of file diff --git a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/pom.xml index 15e5bc472dc..33dbe4ccfff 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/pom.xml +++ b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/pom.xml @@ -16,7 +16,7 @@ eclipse.platform.releng eclipse.platform.releng - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT ../../ org.eclipse.releng diff --git a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/TouchBundles.java b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/TouchBundles.java new file mode 100644 index 00000000000..53bc6fc2a26 --- /dev/null +++ b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/TouchBundles.java @@ -0,0 +1,154 @@ +/******************************************************************************* + * Copyright (c) 2023 Andrey Loskutov and others. + * + * 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: + * Andrey Loskutov - initial API and implementation + *******************************************************************************/ +package org.eclipse.releng.tests; + +import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; +import java.util.Arrays; +import java.util.Map; +import java.util.Map.Entry; +import java.util.stream.Collectors; + +public class TouchBundles { + + final static String FQU_FILE = "forceQualifierUpdate.txt"; + static String ticketMessage; + + /** + * Tries to map & touch all bundles that are mentioned in artifactcomparisons. + * + * @param args first is path to the extracted artifactcomparisons.zip, second + * path to the root directory with all repositories, third one is + * the ticket message + * @throws Exception + */ + public static void main(String[] args) throws Exception { + if (args.length != 3) { + System.out.println("Arguments: first is path to the artifactcomparisons.zip, \n" + + "second is the path to the root directory with all repositories, \n" + + "third is the ticket message"); + System.exit(1); + } + Path artifactsPath = Paths.get(args[0]); + File[] badDirs = artifactsPath.toFile().listFiles(); + if (badDirs == null) { + System.out.println("No files found in " + artifactsPath); + System.exit(1); + } + + Path rootReposDir = Paths.get(args[1]); + File[] gitDirs = rootReposDir.toFile().listFiles(); + if (gitDirs == null) { + System.out.println("No files found in " + rootReposDir); + System.exit(1); + } + ticketMessage = args[2].strip(); + if (ticketMessage.isBlank()) { + ticketMessage = "Touching " + FQU_FILE + " to force bundle rebuild\n"; + } + + Map badDirMap = Arrays.asList(badDirs).stream().filter(File::isDirectory) + .collect(Collectors.toMap(File::getName, f -> f)); + + Map gitDirMap = Arrays.asList(gitDirs).stream().filter(File::isDirectory) + .collect(Collectors.toMap(File::getName, f -> f)); + + if (gitDirMap.containsKey("eclipse.pde.ui")) { + gitDirMap.put("eclipse.pde", gitDirMap.get("eclipse.pde.ui")); + } + if (gitDirMap.containsKey("eclipse.platform.releng.aggregator")) { + gitDirMap.put("eclipse.platform.releng", + new File(gitDirMap.get("eclipse.platform.releng.aggregator"), "eclipse.platform.releng")); + } + + for (Entry entry : badDirMap.entrySet()) { + String dirName = entry.getKey(); + File badDir = entry.getValue(); + File repoDir = gitDirMap.get(dirName); + if (repoDir == null) { + System.err.println("Repo " + dirName + " not found in " + rootReposDir); + continue; + } + + if (repoDir.isDirectory()) { + updateRepo(badDir, repoDir); + } else { + System.err.println("Repo " + repoDir + " is not a directory in " + rootReposDir); + } + } + } + + private static void updateRepo(File badDir, File repoDir) { + System.out.println("Checking " + badDir + " -> " + repoDir); + File[] dirs = badDir.listFiles(); + if (dirs == null) { + System.err.println("No children at " + badDir); + return; + } + for (File dir : dirs) { + File gitDir = new File(repoDir, dir.getName()); + if (isBundleWithChanges(dir)) { + updateFQU(gitDir); + } else { + updateRepo(new File(badDir, dir.getName()), gitDir); + } + } + } + + private static void updateFQU(File dir) { + if (!dir.isDirectory()) { + System.err.println("\tCan't update non existing directory " + dir); + return; + } + System.out.println("\tUpdating " + dir); + File fquFile = new File(dir, FQU_FILE); + try { + boolean created; + if (!fquFile.exists()) { + created = true; + Files.createFile(fquFile.toPath()); + } else { + created = false; + } + Path path = fquFile.toPath(); + String content = Files.readString(path); + if (content.endsWith(ticketMessage)) { + // already updated + System.out.println("\t\tAlready updated: " + fquFile); + return; + } + if (created) { + System.out.println("\t\tWill create new file: " + fquFile); + } else { + System.out.println("\t\tWill update file: " + fquFile); + } + if (content.endsWith("\n")) { + Files.write(path, ticketMessage.getBytes(), StandardOpenOption.APPEND); + } else { + Files.write(path, ("\n" + ticketMessage).getBytes(), StandardOpenOption.APPEND); + } + } catch (Exception e) { + System.err.println("Failed to update file " + fquFile); + } + } + + private static boolean isBundleWithChanges(File dir) { + return dir.isDirectory() && new File(dir, "target").isDirectory(); + } + + +} diff --git a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/test.xml b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/test.xml index 53715c20a73..23e78a23ce3 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/test.xml +++ b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/test.xml @@ -232,7 +232,7 @@ + value="-DdownloadHost=${downloadHost} -DbuildId=${buildId}" /> diff --git a/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/META-INF/MANIFEST.MF b/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/META-INF/MANIFEST.MF index 9978acdddbd..eaff64c2644 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/META-INF/MANIFEST.MF +++ b/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/META-INF/MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.sdk.examples; singleton:=true -Bundle-Version: 4.31.0.qualifier +Bundle-Version: 4.32.0.qualifier Bundle-Localization: plugin diff --git a/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/pom.xml index f3de25d1a17..614e4e1d8c3 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/pom.xml +++ b/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.releng eclipse.platform.releng - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT ../../ org.eclipse.sdk diff --git a/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/META-INF/MANIFEST.MF b/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/META-INF/MANIFEST.MF index a4f6f2cd849..ab3ca04bdbe 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/META-INF/MANIFEST.MF +++ b/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/META-INF/MANIFEST.MF @@ -2,6 +2,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests Bundle-SymbolicName: org.eclipse.sdk.tests; singleton:=true -Bundle-Version: 4.31.0.qualifier +Bundle-Version: 4.32.0.qualifier Eclipse-BundleShape: dir diff --git a/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/pom.xml index bacd2c40320..29b18eaef33 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/pom.xml +++ b/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.releng eclipse.platform.releng - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT ../../ org.eclipse.sdk diff --git a/eclipse.platform.releng/bundles/org.eclipse.test.performance.win32/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.test.performance.win32/pom.xml index 899fdd2665c..fa09cab972a 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.test.performance.win32/pom.xml +++ b/eclipse.platform.releng/bundles/org.eclipse.test.performance.win32/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.releng eclipse.platform.releng - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT ../../ org.eclipse.test diff --git a/eclipse.platform.releng/bundles/org.eclipse.test.performance/.settings/org.eclipse.jdt.core.prefs b/eclipse.platform.releng/bundles/org.eclipse.test.performance/.settings/org.eclipse.jdt.core.prefs index 3ab012c85ef..bdb89d64c20 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.test.performance/.settings/org.eclipse.jdt.core.prefs +++ b/eclipse.platform.releng/bundles/org.eclipse.test.performance/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,5 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.builder.annotationPath.allLocations=disabled org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning org.eclipse.jdt.core.builder.invalidClasspath=abort @@ -27,9 +28,11 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 +org.eclipse.jdt.core.compiler.problem.APILeak=warning +org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=info +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning org.eclipse.jdt.core.compiler.problem.deprecation=warning @@ -87,7 +90,7 @@ org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariable org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error org.eclipse.jdt.core.compiler.problem.potentialNullReference=info org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning @@ -99,17 +102,23 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=info org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled +org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled diff --git a/eclipse.platform.releng/bundles/org.eclipse.test.performance/forceQualifierUpdate.txt b/eclipse.platform.releng/bundles/org.eclipse.test.performance/forceQualifierUpdate.txt index 343c2198f37..f6f142b8d13 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.test.performance/forceQualifierUpdate.txt +++ b/eclipse.platform.releng/bundles/org.eclipse.test.performance/forceQualifierUpdate.txt @@ -3,3 +3,4 @@ Bug 403352 - Update all parent versions to match our build stream Bug 485498 - Add generics to org.eclipse.test.performance Bug 534597 - Unanticipated comparator errors in I20180511-2000 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184 +https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659 \ No newline at end of file diff --git a/eclipse.platform.releng/bundles/org.eclipse.test.performance/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.test.performance/pom.xml index 1c8c517dbc5..76050d0cb0e 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.test.performance/pom.xml +++ b/eclipse.platform.releng/bundles/org.eclipse.test.performance/pom.xml @@ -14,14 +14,11 @@ eclipse.platform.releng eclipse.platform.releng - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT ../../ org.eclipse.test org.eclipse.test.performance 3.20.0-SNAPSHOT eclipse-plugin - - -warn:-raw,unchecked - diff --git a/eclipse.platform.releng/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/AwtScreenshot.java b/eclipse.platform.releng/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/AwtScreenshot.java index ee7906dc126..b9c4628465b 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/AwtScreenshot.java +++ b/eclipse.platform.releng/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/AwtScreenshot.java @@ -93,8 +93,15 @@ public static void dumpAwtScreenshot(String screenshotFile) { processBuilder.environment().put("AWT_TOOLKIT", "CToolkit"); } Process process = processBuilder.start(); - new StreamForwarder(process.getErrorStream(), System.out).start(); - new StreamForwarder(process.getInputStream(), System.out).start(); + + @SuppressWarnings("resource") // never close process streams + InputStream errorStream = process.getErrorStream(); + + @SuppressWarnings("resource") // never close process streams + InputStream inputStream = process.getInputStream(); + + new StreamForwarder(errorStream, System.out).start(); + new StreamForwarder(inputStream, System.out).start(); long end = System.currentTimeMillis() + TIMEOUT_SECONDS * 1000; boolean done = false; do { diff --git a/eclipse.platform.releng/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceMonitor.java b/eclipse.platform.releng/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceMonitor.java index 77068e633f4..a844f196826 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceMonitor.java +++ b/eclipse.platform.releng/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceMonitor.java @@ -46,6 +46,7 @@ protected void collectGlobalPerformanceInfo(Map scalars) { // no default implementation } + @SuppressWarnings("unchecked") void addScalar(Map scalars, Dim dimension, long value) { scalars.put(dimension, new Scalar(dimension, value)); } diff --git a/eclipse.platform.releng/bundles/org.eclipse.test/forceQualifierUpdate.txt b/eclipse.platform.releng/bundles/org.eclipse.test/forceQualifierUpdate.txt index 959342a0312..a12081b0b94 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.test/forceQualifierUpdate.txt +++ b/eclipse.platform.releng/bundles/org.eclipse.test/forceQualifierUpdate.txt @@ -5,3 +5,4 @@ Bug 516465 - Add missing about.html to o.e.test Pick up new signing certificate Bug 566471 - I20200828-0150 - Comparator Errors Found https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184 +https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659 \ No newline at end of file diff --git a/eclipse.platform.releng/bundles/org.eclipse.test/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.test/pom.xml index a6eb7285d49..47381b36a51 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.test/pom.xml +++ b/eclipse.platform.releng/bundles/org.eclipse.test/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.releng eclipse.platform.releng - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT ../../ org.eclipse.test diff --git a/eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/AbstractJUnitResultFormatter.java b/eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/AbstractJUnitResultFormatter.java index de8c659c80c..4aa78b8773a 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/AbstractJUnitResultFormatter.java +++ b/eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/AbstractJUnitResultFormatter.java @@ -129,8 +129,9 @@ Reader getSysErrReader() throws IOException { * @throws IOException If any I/O problem occurs during writing the data */ void writeSysOut(Writer writer) throws IOException { - Objects.requireNonNull(writer, "Writer cannot be null"); - writeFrom(this.sysOutStore, writer); + @SuppressWarnings("resource") // requireNonNull just returns first argument + Writer w = Objects.requireNonNull(writer, "Writer cannot be null"); + writeFrom(this.sysOutStore, w); } /** @@ -141,8 +142,9 @@ void writeSysOut(Writer writer) throws IOException { * @throws IOException If any I/O problem occurs during writing the data */ void writeSysErr(Writer writer) throws IOException { - Objects.requireNonNull(writer, "Writer cannot be null"); - writeFrom(this.sysErrStore, writer); + @SuppressWarnings("resource") // requireNonNull just returns first argument + Writer w = Objects.requireNonNull(writer, "Writer cannot be null"); + writeFrom(this.sysErrStore, w); } static Optional traverseAndFindTestClass(TestPlan testPlan, TestIdentifier testIdentifier) { diff --git a/eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/LegacyXmlResultFormatter.java b/eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/LegacyXmlResultFormatter.java index 83975fe68a8..0c4b1c3cbac 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/LegacyXmlResultFormatter.java +++ b/eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/LegacyXmlResultFormatter.java @@ -247,8 +247,8 @@ void writeProperties(final XMLStreamWriter writer) throws XMLStreamException { void writeTestCase(final XMLStreamWriter writer) throws XMLStreamException { for (final Map.Entry entry : testIds.entrySet()) { final TestIdentifier testId = entry.getKey(); - if (!testId.isTest()) { - // only interested in test methods + if (!testId.isTest() && isSuccessful(testId)) { + // only interested in test methods and in failing containers continue; } // find the parent class of this test method @@ -256,10 +256,16 @@ void writeTestCase(final XMLStreamWriter writer) throws XMLStreamException { if (!parent.isPresent()) { continue; } - final String classname = parent.get().getLegacyReportingName(); + writer.writeStartElement(ELEM_TESTCASE); - writer.writeAttribute(ATTR_CLASSNAME, classname); - writer.writeAttribute(ATTR_NAME, testId.getDisplayName()); + if (testId.isTest()) { + final String classname = parent.get().getLegacyReportingName(); + writer.writeAttribute(ATTR_CLASSNAME, classname); + writer.writeAttribute(ATTR_NAME, testId.getDisplayName()); + } else { // is a container + writer.writeAttribute(ATTR_CLASSNAME, testId.getDisplayName()); + writer.writeAttribute(ATTR_NAME, ""); + } final Stats stats = entry.getValue(); writer.writeAttribute(ATTR_TIME, String.valueOf((stats.endedAt - stats.startedAt) / ONE_SECOND)); // skipped element if the test was skipped @@ -275,6 +281,13 @@ void writeTestCase(final XMLStreamWriter writer) throws XMLStreamException { } } + private boolean isSuccessful(final TestIdentifier testId) { + return !aborted.containsKey(testId)// + && !failed.containsKey(testId) // + && !errored.containsKey(testId)// + && !skipped.containsKey(testId); + } + private void writeSkipped(final XMLStreamWriter writer, final TestIdentifier testIdentifier) throws XMLStreamException { if (!skipped.containsKey(testIdentifier)) { @@ -290,49 +303,27 @@ private void writeSkipped(final XMLStreamWriter writer, final TestIdentifier tes private void writeFailed(final XMLStreamWriter writer, final TestIdentifier testIdentifier) throws XMLStreamException { - if (!failed.containsKey(testIdentifier)) { - return; - } - writer.writeStartElement(ELEM_FAILURE); - final Optional cause = failed.get(testIdentifier); - if (cause.isPresent()) { - final Throwable t = cause.get(); - final String message = t.getMessage(); - if (message != null && !message.trim().isEmpty()) { - writer.writeAttribute(ATTR_MESSAGE, message); - } - writer.writeAttribute(ATTR_TYPE, t.getClass().getName()); - writer.writeCharacters(ExceptionUtils.readStackTrace(t)); - } - writer.writeEndElement(); + writeIfPresentInMap(writer, testIdentifier, ELEM_FAILURE, failed, true); } private void writeErrored(final XMLStreamWriter writer, final TestIdentifier testIdentifier) throws XMLStreamException { - if (!errored.containsKey(testIdentifier)) { - return; - } - writer.writeStartElement(ELEM_ERROR); - final Optional cause = errored.get(testIdentifier); - if (cause.isPresent()) { - final Throwable t = cause.get(); - final String message = t.getMessage(); - if (message != null && !message.trim().isEmpty()) { - writer.writeAttribute(ATTR_MESSAGE, message); - } - writer.writeAttribute(ATTR_TYPE, t.getClass().getName()); - writer.writeCharacters(ExceptionUtils.readStackTrace(t)); - } - writer.writeEndElement(); + writeIfPresentInMap(writer, testIdentifier, ELEM_ERROR, errored, true); } private void writeAborted(final XMLStreamWriter writer, final TestIdentifier testIdentifier) throws XMLStreamException { - if (!aborted.containsKey(testIdentifier)) { + writeIfPresentInMap(writer, testIdentifier, ELEM_ABORTED, aborted, false); + } + + private static void writeIfPresentInMap(XMLStreamWriter writer, TestIdentifier testIdentifier, + String elemFailure, Map> map, boolean writeExceptionStackTrace) + throws XMLStreamException { + if (!map.containsKey(testIdentifier)) { return; } - writer.writeStartElement(ELEM_ABORTED); - final Optional cause = aborted.get(testIdentifier); + writer.writeStartElement(elemFailure); + final Optional cause = map.get(testIdentifier); if (cause.isPresent()) { final Throwable t = cause.get(); final String message = t.getMessage(); @@ -340,6 +331,10 @@ private void writeAborted(final XMLStreamWriter writer, final TestIdentifier tes writer.writeAttribute(ATTR_MESSAGE, message); } writer.writeAttribute(ATTR_TYPE, t.getClass().getName()); + + if (writeExceptionStackTrace) { + writer.writeCharacters(ExceptionUtils.readStackTrace(t)); + } } writer.writeEndElement(); } diff --git a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml index c65613df785..a8002e2f048 100644 --- a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml @@ -3,7 +3,7 @@ eclipse.platform.releng eclipse.platform.releng - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT ../../ org.eclipse.help.feature org.eclipse.help org.eclipse.help.feature - 2.3.1700-SNAPSHOT + 2.3.1800-SNAPSHOT eclipse-feature diff --git a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml index 629df777b92..eab085ccfe2 100644 --- a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml b/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml index ba9858c7a33..d9f87cdb4e4 100644 --- a/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml +++ b/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml @@ -14,7 +14,7 @@ eclipse.platform.releng eclipse.platform.releng - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT ../../ org.eclipse.platform.feature diff --git a/eclipse.platform.releng/features/org.eclipse.platform-feature/rootfiles/.eclipseproduct b/eclipse.platform.releng/features/org.eclipse.platform-feature/rootfiles/.eclipseproduct index bc71ec3ebd3..b108c5cd94b 100644 --- a/eclipse.platform.releng/features/org.eclipse.platform-feature/rootfiles/.eclipseproduct +++ b/eclipse.platform.releng/features/org.eclipse.platform-feature/rootfiles/.eclipseproduct @@ -1,3 +1,3 @@ name=Eclipse Platform id=org.eclipse.platform -version=4.31.0 +version=4.32.0 diff --git a/eclipse.platform.releng/features/org.eclipse.rcp/feature.xml b/eclipse.platform.releng/features/org.eclipse.rcp/feature.xml index 36ef84813db..5a08afaaa55 100644 --- a/eclipse.platform.releng/features/org.eclipse.rcp/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.rcp/feature.xml @@ -2,7 +2,7 @@ eclipse.platform.releng eclipse.platform.releng - 4.31.0-SNAPSHOT + 4.32.0-SNAPSHOT ../../ org.eclipse.rcp.feature diff --git a/eclipse.platform.releng/features/org.eclipse.rcp/rootfiles/readme/readme_eclipse.html b/eclipse.platform.releng/features/org.eclipse.rcp/rootfiles/readme/readme_eclipse.html index 3208a23d257..627ab745b1b 100644 --- a/eclipse.platform.releng/features/org.eclipse.rcp/rootfiles/readme/readme_eclipse.html +++ b/eclipse.platform.releng/features/org.eclipse.rcp/rootfiles/readme/readme_eclipse.html @@ -4,9 +4,9 @@ -Eclipse Project Release Notes 4.30 +Eclipse Project Release Notes 4.31 @@ -19,12 +19,12 @@

    Release 4.30 + name="mozTocId299852">Release 4.31

    Last revised Nov 20, 2023 + name="mozTocId299852">Last revised Feb 24, 2024

    @@ -57,7 +57,7 @@

  • Target Operating Environments
  • Compatibility with Previous Releases
      -
    1. Compatibility of Release 4.30 with 4.29
    2. +
    3. Compatibility of Release 4.31 with 4.30
  • Known Issues
      @@ -159,10 +159,10 @@

  • Interoperability with Previous Releases
      -
    1. Interoperability of Release 4.30 with previous releases +
    2. Interoperability of Release 4.31 with previous releases
        -
      1. Sharing projects between heterogeneous Eclipse 4.30 and 4.29
      2. -
      3. Using Eclipse 4.30 to develop plug-ins that work in Eclipse 4.29
      4. +
      5. Sharing projects between heterogeneous Eclipse 4.31 and 4.30
      6. +
      7. Using Eclipse 4.31 to develop plug-ins that work in Eclipse 4.30
  • @@ -176,7 +176,7 @@

    Most of the Eclipse SDK is "pure" Java code and has no direct dependence on the underlying operating system. The chief dependence is therefore on the Java Platform itself. Portions are targeted to specific classes of operating environments, requiring their source code to only reference facilities available in particular class libraries (e.g. J2ME Foundation 1.1, J2SE 1.4, Java 5, etc).

    -

    In general, the 4.30 release of the Eclipse Project is developed on Java SE 17 VMs. As such, the Eclipse SDK as a whole is targeted at all modern, desktop Java VMs.

    +

    In general, the 4.31 release of the Eclipse Project is developed on Java SE 17 VMs. As such, the Eclipse SDK as a whole is targeted at all modern, desktop Java VMs.

    Appendix 1 contains a table that indicates the class library level required for each bundle.

    @@ -187,9 +187,9 @@

    problems with running Eclipse on a reference platform.

    - Eclipse 4.30 is tested and validated on a number of reference platforms. For the complete list, see Target Environments in the - 4.30 Plan. + Eclipse 4.31 is tested and validated on a number of reference platforms. For the complete list, see Target Environments in the + 4.31 Plan.

    As stated above, we expect that Eclipse works fine on other current Java VM and OS versions but we cannot flag these as reference platforms without significant community support for testing @@ -208,42 +208,42 @@

    Compatibility of Release 4.30 with 4.29 + name="mozTocId324309">Compatibility of Release 4.31 with 4.30

    Eclipse 4.30 is compatible with Eclipse 4.29 (and all earlier 4.x and 3.x versions). + name="mozTocId324309">Eclipse 4.31 is compatible with Eclipse 4.30 (and all earlier 4.x and 3.x versions).

    API Contract Compatibility: Eclipse SDK 4.30 is upwards contract-compatible with Eclipse SDK 4.29 except in those areas noted in the - Eclipse 4.30 Plug-in Migration Guide. Programs that use affected APIs and extension points - will need to be ported to Eclipse SDK 4.30 APIs. Downward contract compatibility is not supported. There is no guarantee that compliance with Eclipse SDK 4.30 APIs would ensure compliance with - Eclipse SDK 4.29 APIs. Refer to Evolving Java-based APIs for a discussion of the kinds of API changes that maintain contract + name="mozTocId324309"> API Contract Compatibility: Eclipse SDK 4.31 is upwards contract-compatible with Eclipse SDK 4.30 except in those areas noted in the + Eclipse 4.31 Plug-in Migration Guide. Programs that use affected APIs and extension points + will need to be ported to Eclipse SDK 4.31 APIs. Downward contract compatibility is not supported. There is no guarantee that compliance with Eclipse SDK 4.31 APIs would ensure compliance with + Eclipse SDK 4.30 APIs. Refer to Evolving Java-based APIs for a discussion of the kinds of API changes that maintain contract compatibility.

    - Binary (plug-in) Compatibility: Eclipse SDK 4.30 is upwards binary-compatible with Eclipse SDK 4.29 except in those areas noted in the Eclipse 4.30 Plug-in Migration Guide . Downward plug-in compatibility is not supported. - Plug-ins for Eclipse SDK 4.30 will not be usable in Eclipse SDK 4.29. Refer to Evolving Java-based APIs for a discussion of + Binary (plug-in) Compatibility: Eclipse SDK 4.31 is upwards binary-compatible with Eclipse SDK 4.30 except in those areas noted in the Eclipse 4.31 Plug-in Migration Guide . Downward plug-in compatibility is not supported. + Plug-ins for Eclipse SDK 4.31 will not be usable in Eclipse SDK 4.30. Refer to Evolving Java-based APIs for a discussion of the kinds of API changes that maintain binary compatibility.

    - Source Compatibility: Eclipse SDK 4.30 is upwards source-compatible with Eclipse SDK 4.29 except in the areas noted in the Eclipse 4.30 Plug-in Migration Guide . This means that source files written to use Eclipse - SDK 4.30 APIs might successfully compile and run against Eclipse SDK 4.29 APIs, although this is not guaranteed. Downward source compatibility is not supported. If source files use new Eclipse SDK + Source Compatibility: Eclipse SDK 4.31 is upwards source-compatible with Eclipse SDK 4.30 except in the areas noted in the Eclipse 4.31 Plug-in Migration Guide . This means that source files written to use Eclipse + SDK 4.31 APIs might successfully compile and run against Eclipse SDK 4.30 APIs, although this is not guaranteed. Downward source compatibility is not supported. If source files use new Eclipse SDK APIs, they will not be usable with an earlier version of the Eclipse SDK.

    - Workspace Compatibility: Eclipse SDK 4.30 is upwards workspace-compatible with earlier 3.x and 4.x versions of the Eclipse SDK unless noted. This means that workspaces and projects - created with Eclipse SDK 4.29, 4.28, 4.27, 4.26, 4.25, 4.24, 4.23, 4.22, 4.21, 4.20, 4.19, 4.18, 4.17, 4.16, 4.15, 4.14, 4.13, 4.12, 4.11, 4.10, 4.9, 4.8, 4.7, 4.6, 4.5 and 4.4 can be successfully opened by Eclipse SDK 4.30 and upgraded to a 4.30 workspace. This includes both hidden metadata, which is localized to a + Workspace Compatibility: Eclipse SDK 4.31 is upwards workspace-compatible with earlier 3.x and 4.x versions of the Eclipse SDK unless noted. This means that workspaces and projects + created with Eclipse SDK 4.30, 4.29, 4.28, 4.27, 4.26, 4.25, 4.24, 4.23, 4.22, 4.21, 4.20, 4.19, 4.18, 4.17, 4.16, 4.15, 4.14, 4.13, 4.12, 4.11, 4.10, 4.9, 4.8, 4.7, 4.6, 4.5 and 4.4 can be successfully opened by Eclipse SDK 4.31 and upgraded to a 4.31 workspace. This includes both hidden metadata, which is localized to a particular workspace, as well as metadata files found within a workspace project (e.g., the .project file), which may propagate between workspaces via file copying or team repositories. Individual - plug-ins developed for Eclipse SDK 4.30 should provide similar upwards compatibility for their hidden and visible workspace metadata created by earlier versions; 4.30 plug-in developers are + plug-ins developed for Eclipse SDK 4.31 should provide similar upwards compatibility for their hidden and visible workspace metadata created by earlier versions; 4.31 plug-in developers are responsible for ensuring that their plug-ins recognize metadata from earlier versions and process it appropriately. User interface session state may be discarded when a workspace is upgraded. - Downward workspace compatibility is not supported. A workspace created (or opened) by a product based on Eclipse 4.30 will be unusable with a product based on an earlier version of Eclipse. Visible - metadata files created (or overwritten) by Eclipse 4.30 will generally be unusable with earlier versions of Eclipse. + Downward workspace compatibility is not supported. A workspace created (or opened) by a product based on Eclipse 4.31 will be unusable with a product based on an earlier version of Eclipse. Visible + metadata files created (or overwritten) by Eclipse 4.31 will generally be unusable with earlier versions of Eclipse.

    Non-compliant usage of API's: All non-API methods and classes, and certainly everything in a package with "internal" in its name or x-internal in the bundle manifest entry, are @@ -279,7 +279,7 @@

    Viewer Limit in Workbench +

    + Several of the most commonly used Eclipse views have enabled incremental view updates. + These views limit the initially-shown number of children to 1000 per parent element, and support incrementally displaying the next + batch of elements. The increment number can be configured in the preferences under + General > Initial maximum number of elements shown in views as follows: +

    +

    New preference

    +

    + Other (3rd party) views can also read this preference to enable this feature for that view; this must be done explicitly for each view. +

    +

    + The support for incremental view updates was added to avoid UI freezes in large viewers, where SWT/JFace + approaches the limits of the underlying native widget machinery while trying to render + many thousands of elements, leading to minute long UI freezes. +

    +

    + Incremental view update is currently enabled in the following views: +

    +
      +
    1. Package Explorer
    2. +
    3. Project Explorer
    4. +
    5. Problems
    6. +
    7. Java Outline
    8. +
    9. JUnit
    10. +
    +

    Package Explorer

    +

    Project Explorer

    +

    Problems View

    +

    Java Outline

    +

    JUnit View

    +

    + This new preference can be disabled in products by specifying + org.eclipse.ui.workbench/largeViewLimit=0 in the + plugin_customization.ini file or via an Oomph preference task. + In the same way, the preference value can be changed for products that need a lower or higher limit. +

    +
    Filter Field for the Installation Details Dialog's Features Tab +

    + Previously the Features tab of the Installation Details dialog, unlike the dialog's Plug-ins tab, did not provide a filter field. + That inconsistency has been addressed, making it easier to find details about a specific feature. +

    +

    Hovering over tabs

    +
    Showing Resolved Workspace Path in Launch Dialog +

    + A new feature has been implemented in the Eclipse launch dialog, which alerts the user that, the tilde (~) character, + which usually refers to the user's home directory according to many operating system shell semantics, is unresolved whenever + they enter that character. Additionally, this enhancement displays the resolved path within a label, offering user + clear insight into the specified path. +

    +

    Launch Dialog

    +
    Displaying Search Patterns in the Title Bar of Quick Search Dialogs +

    + Distinguishing between the search patterns of concurrently open Quick Search dialogs was challenging, as they were all + uniformly labeled as "Quick Search". A new functionality has been incorporated, wherein the search term is displayed alongside + the "Quick Search" label in the title bar of the dialog. This enhancement ensures that each window is uniquely identifiable, + now denoted as "Quick Search - " followed by the respective search term, thereby enhancing effortless navigation and improved user clarity. +

    +

    Quick Search dialog

    +
    Compare Editor +

    + The number of differences between two files is shown on the toolbar of compare editor; + this is equal to the number of change markers shown next to the scroll bar in compare editor. + This feature is helpful when the files compared are large and have many differences that cannot be counted manually. +

    +

    Compare Editor

    +

    + The number of differences changes based on the selection in the compilation unit of Java Structure Compare. +

    +

    Compare Editor

    +
    Default Editor for a Content Type +

    + For the case that there are multiple editors suitable to open a given content type, the user can declare one of these editors as + default editor, i.e., the preferred editor. Simply select the editor in the associated editors list and press the + Default button. If there is no default editor, the first suitable editor found is used to open the + content type. +

    +

    Default Editor

    +
    -

    Security

    -
    p2 Director Application Security
    Hovering Over Editor / View Tabs +

    When using the Light theme on macOS, the background color of unselected tabs + now slightly changes color when the user hovers over them with the mouse cursor. + The same hovering behaviour already exists on Windows and when using the Dark theme. +

    +

    Hovering over tabs

    +
    Highlighting of Active Part +

    The Light theme now also highlights the active part with a blue underline just + like it was already done when using the Dark theme. +

    +

    Highlighting of active part

    +
    Full Text in View Tabs - To provide similar security controls as available in the IDE, - the following command-line arguments are now supported the p2 director application: -

    -
    -
    -trustSignedContentOnly | -tsco
    -
    - Whether to trust each artifact only if it is jar-signed or PGP-signed. -
    -
    -trustedAuthorities | -ta <comma separated list>
    -
    - The authorities from which repository content, including repository metadata, is trusted. An empty value will reject all remote connections. -
    -
    -trustedPGPKeys | -tk <comma separated list>
    -
    - The fingerprints of PGP keys to trust as signers of artifacts. An empty value will reject all PGP keys. -
    -
    -trustedCertificates | -tc <comma separated list>
    -
    - The SHA-256 'fingerprints' of unanchored certificates to trust as signers of artifacts. An empty value will reject all unanchored certificates. -
    -
    -verboseTrust | -vt
    -
    - Whether to print detailed information about the content trust. -
    -
    +

    + A new preference has been introduced to enhance the user experience for managing views. With this preference, users have more control over how view tabs are displayed. +

    +

    + Previously, as the number of views increased within a view stack, the tab titles became very small, displaying only icons. + This made it more challenging for users to identify views solely based on icons, sometimes leading to a cluttered UI and decreased usability. +

    +

    + To address this issue, two options are now available in the Tab icons and titles in view areas section on the General > Appearance preference page: +

    +
      +
    • + Always show full titles: This option ensures that the full text of each view title is always visible in each tab, regardless of the number of views present. + It improves usability by making it easier for users to identify views by label. + By default this option is off. +

      + Always show full titles + Always show full titles +
    • +
    • + Hide icons: With this option selected, view icons are hidden, and only the full text of each view title is displayed in each tab. + This helps in decluttering the UI and ensures that the editor area remains the focal point, especially in scenarios where numerous views are open. + By default this option is off. +

      + Hide icons + Hide icons +
    • +

    General Updates

    Eclipse Launcher Reloads Configuration Files on Restart +

    + Previously when Eclipse was restarted using File > Restart or File > Switch Workspace as well as after installing or updating from a p2 update site, + it restarted with same arguments as those in effect for the initial start. + Any manual changes made to the eclipse.ini, as well as changes made by p2 touchpoints when installing or updating, were ignored. + To actually apply the changes of a modified eclipse.ini, it was necessary to exit the application and restart it from the launcher. +

    +

    + Now the Eclipse launcher is enhanced to reload the configuration files on restart, + so any changes to the eclipse.ini take effect immediately. + In addition, any command line arguments specified for the initial launch remain in effect on restart, + except if the restart command contains --launcher.skipOldUserArgs. +

    +
    New 'wires' Command in the OSGi Console +

    + Previously it was quite challenging to determine if or why a certain bundle was using other bundles or was used by other bundles. + There is now a new wires command that, for a specified bundle, prints all wires that are used by the bundle and any wires it provides to other bundles. + This provides a powerful tool for analyzing dependency problems and for determining why a bundle is actually used. +

    +

    + For example, you can open Host OSGi console and use the wires command as follows: + +WARNING: This console is connected to the current running instance of Eclipse! +____________________________ +Welcome to Apache Felix Gogo + +g! ss org.eclipse.ui.workbench + +id State Bundle +5018 ACTIVE org.eclipse.ui.workbench_3.131.100 + +g! wires 5018 + +Bundle org.eclipse.ui.workbench 3.131.100: +is wired to: + - com.ibm.icu 74.1.0 + - because of Import-Package: com.ibm.icu.util + - jakarta.annotation-api 2.1.1 + - because of Import-Package: jakarta.annotation; version="[2.1.0,3.0.0)" + - jakarta.inject.jakarta.inject-api 2.0.1 + - because of Import-Package: jakarta.inject; version="[2.0.0,3.0.0)" + - org.apache.felix.scr 2.2.6 + - because of Require-Capability: osgi.extender; filter:="(&(osgi.extender=osgi.component)(version>=1.2)(!(version>=2.0)))" + - org.eclipse.core.databinding.observable 1.13.200 + - because of Require-Bundle: org.eclipse.core.databinding.observable; bundle-version="[1.2.0,2.0.0)" + - org.eclipse.core.databinding.property 1.10.200 + - because of Require-Bundle: org.eclipse.core.databinding.property; bundle-version="[1.2.0,2.0.0)" + - org.eclipse.core.runtime 3.31.0 + - because of Require-Bundle: org.eclipse.core.runtime; bundle-version="[3.29.0,4.0.0)" + - org.eclipse.e4.core.commands 1.1.300 + - because of Import-Package: org.eclipse.e4.core.commands + - because of Import-Package: org.eclipse.e4.core.commands.internal + - org.eclipse.e4.core.contexts 1.12.500 + - because of Require-Bundle: org.eclipse.e4.core.contexts; bundle-version="1.0.0" + - org.eclipse.e4.core.di 1.9.300 + - because of Require-Bundle: org.eclipse.e4.core.di; bundle-version="1.1.0" + - org.eclipse.e4.core.di.extensions 0.18.200 + - because of Require-Bundle: org.eclipse.e4.core.di.extensions; bundle-version="0.13.0" + - org.eclipse.e4.core.services 2.4.300 + - because of Require-Bundle: org.eclipse.e4.core.services; bundle-version="2.2.0" + - org.eclipse.e4.ui.bindings 0.14.300 + - because of Require-Bundle: org.eclipse.e4.ui.bindings; bundle-version="0.9.0" + - org.eclipse.e4.ui.css.swt 0.15.300 + - because of Require-Bundle: org.eclipse.e4.ui.css.swt; bundle-version="0.9.1" + - org.eclipse.e4.ui.css.swt.theme 0.14.300 + - because of Require-Bundle: org.eclipse.e4.ui.css.swt.theme; bundle-version="0.9.0" + - org.eclipse.e4.ui.di 1.5.300 + - because of Require-Bundle: org.eclipse.e4.ui.di; bundle-version="0.9.0" + - org.eclipse.e4.ui.model.workbench 2.4.200 + - because of Require-Bundle: org.eclipse.e4.ui.model.workbench; bundle-version="0.9.1" + - org.eclipse.e4.ui.services 1.6.300 + - because of Import-Package: org.eclipse.e4.ui.services + - because of Require-Bundle: org.eclipse.e4.ui.services; bundle-version="1.3.0" + - org.eclipse.e4.ui.workbench 1.15.300 + - because of Import-Package: org.eclipse.e4.ui.internal.workbench + - because of Import-Package: org.eclipse.e4.ui.internal.workbench.addons + - because of Import-Package: org.eclipse.e4.ui.workbench + - because of Import-Package: org.eclipse.e4.ui.workbench.modeling + - org.eclipse.e4.ui.workbench.addons.swt 1.5.300 + - because of Require-Bundle: org.eclipse.e4.ui.workbench.addons.swt; bundle-version="0.10.0" + - org.eclipse.e4.ui.workbench.renderers.swt 0.16.300 + - because of Import-Package: org.eclipse.e4.ui.internal.workbench.renderers.swt + - because of Import-Package: org.eclipse.e4.ui.workbench.renderers.swt + - org.eclipse.e4.ui.workbench.swt 0.17.300 + - because of Import-Package: org.eclipse.e4.ui.internal.workbench.swt + - because of Require-Bundle: org.eclipse.e4.ui.workbench.swt; bundle-version="0.9.1" + - org.eclipse.e4.ui.workbench3 0.17.300 + - because of Require-Bundle: org.eclipse.e4.ui.workbench3; bundle-version="0.15.0"; visibility:="reexport" + - org.eclipse.emf.ecore.xmi 2.37.0 + - because of Require-Bundle: org.eclipse.emf.ecore.xmi; bundle-version="2.11.0" + - org.eclipse.help 3.10.300 + - because of Require-Bundle: org.eclipse.help; bundle-version="[3.2.0,4.0.0)" + - org.eclipse.jface 3.33.0 + - because of Require-Bundle: org.eclipse.jface; bundle-version="[3.31.0,4.0.0)" + - org.eclipse.jface.databinding 1.15.200 + - because of Require-Bundle: org.eclipse.jface.databinding; bundle-version="[1.3.0,2.0.0)" + - org.eclipse.osgi 3.19.0 + - because of Import-Package: javax.xml.parsers + - because of Import-Package: org.w3c.dom + - because of Import-Package: org.xml.sax + - because of Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=17))" + - org.osgi.service.event 1.4.1.202109301733 + - because of Import-Package: org.osgi.service.event; version="[1.2.0,2.0.0)" +and is consumed by: + - org.eclipse.jdt.ui 3.31.100 + - because it Require-Bundle: org.eclipse.ui.workbench; bundle-version="[3.131.0,4.0.0)" + - org.eclipse.ui 3.205.100 + - because it Require-Bundle: org.eclipse.ui.workbench; bundle-version="[3.130.0,4.0.0)"; visibility:="reexport" + - org.eclipse.ui.editors 3.17.200 + - because it Require-Bundle: org.eclipse.ui.workbench; bundle-version="[3.130.0,4.0.0)" + - org.eclipse.ui.genericeditor 1.3.300 + - because it Require-Bundle: org.eclipse.ui.workbench; bundle-version="3.109.0" + - org.eclipse.ui.intro.quicklinks 1.2.300 + - because it Require-Bundle: org.eclipse.ui.workbench; bundle-version="3.108.0" + +

    +
    Support for Jakarta Annotations by Eclipse E4
    Windows Defender Automatic Configuration - The Eclipse E4 Platform Dependency Injector now supports annotations from the jakarta.inject and jakarta.annotation package. -

    - Plug-in developers are encouraged to migrate their E4 application model element classes to use for example jakarta.inject.Inject instead of javax.inject.Inject - or jakarta.annotation.PostConstruct instead of javax.annotation.PostConstruct. - At the moment annotations from both namespaces jakarta and javax are supported. -

    - The support for annotations from the javax.inject and javax.annotation package is now deprecated and will be removed in a future release, after a deprecation period of at least two years. - If it necessary to make a Plug-in compatible with past versions (that don't support jakarta annotations), recent and future versions (that don't support javax annotations) of the E4-Injector, - it can be considered to apply the annotations from both namespaces simultaneously and to import the packages from both namespaces only optionally. - But this strategy does not work for usages of the javax/jakarta.inject.Provider and should generally be used with caution and be verified in detail for more complex setups. + On Microsoft Windows 10 or later, the Microsoft Defender can significantly slow down the startup and overall performance of Eclipse-based applications. + The Eclipse IDE can now detect if Microsoft Defender is active, inform the user about it and, if desired, can exclude itself from future Defender scans.

    +

    Windows Defender autofix startup check

    - The Eclipse SDK itself already has been migrated off these annotations from the javax namespace to the jakarta replacements and therefore does not pull the former into a target-platform anymore. - If your application still needs these javax annotations you potentially have to add them explicitly to your target using entries like: + On Windows the General > Startup and Shutdown preference page offers further information + and allows the user to disable the startup check for new installations and to run the exclusion check again for the running installation.

    -
    
    -  <unit id="jakarta.inject.jakarta.inject-api" version="1.0.5"/>
    -  <unit id="jakarta.annotation-api" version="1.3.5"/>
    -      
    +

    Windows Defender autofix preference page

    - Counterintuitively the javax annotations are provided by a bundle with the same symbolic name as their jakarta successor but with a 1.x version, while the jakarta successors have a 2.x version. - It is therefore necessary to specify the version explicitly since those bundles are not required in their latest version. + Creators of custom Eclipse-based products that use the org.eclipse.ui.ide.workbench application and want to suppress the new startup check for their product + can disable it by adding the following entry to their product's preferenceCustomization properties file:

    -
    New Http Client Backend for P2 -

    The ECF Backend used by P2 has switched to use the httpjava-client to lower the dependency chain and efforts to maintain certain third party libraries.

    +

    org.eclipse.ui/windows.defender.startup.check.skip=true

    - For now Eclipse will ship both, the new and the old backend while the newer one takes precedence. If you see any issues please proceed as follows: -

      -
    1. Collect as much data as possible, e.g. is a proxy used, are the site you want contact password protected, your os and similar what could be useful or is know to diverge from standard desktop environment settings.
    2. -
    3. Open an issue here with the description of the problem and the collected data.
    4. -
    5. Consider providing a test-case for P2 to make sure your use-case is covered now and in the future and will not break again
    6. -
    7. Configure your eclipse.ini to include -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclientjava unless the problem is fixed
    8. -
    + To execute the startup check for products that run applications other than org.eclipse.ui.ide.workbench add the entry:

    +

    org.eclipse.ui/windows.defender.startup.check.app=<application-id-in-use>

    Improvement in Progress Bar Consistency and Smoothness +

    + Previously in Eclipse, the progress bar did not accurately reflect the progress relative to the total time. Specifically, the initial half of the progress bar advanced rapidly, + while a noticeable delay occurred in the latter half. This discrepancy was due to the utilisation of bundle-changed events for progress determination, which resulted in an uneven + progression due to the non-uniform nature of these events. +

    +

    + The progress is now determined as a function of the service level events occurring while the workbench is being bootstrapped. This gives more meaningful values about the progress + the workbench has achieved towards completion. This modification has led to a more consistent and smooth advancement of the progress bar, leading to an overall improved user experience. +

    +

    Progress Bar

    +