diff --git a/.github/workflows/licensecheck.yml b/.github/workflows/licensecheck.yml index 993efbf486..322b7baf67 100644 --- a/.github/workflows/licensecheck.yml +++ b/.github/workflows/licensecheck.yml @@ -21,6 +21,7 @@ jobs: uses: eclipse-dash/dash-licenses/.github/workflows/mavenLicenseCheck.yml@master with: projectId: technology.m2e + javaVersion: 21 setupScript: 'cd org.eclipse.m2e.maven.runtime && mvn generate-resources' secrets: gitlabAPIToken: ${{ secrets.M2E_GITLAB_API_TOKEN }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 9e2e5f5791..3a98273e78 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -20,11 +20,11 @@ jobs: timeout-minutes: 45 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: fetch-depth: 0 submodules: true - - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2 + - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0 with: java-version: | 17 @@ -33,9 +33,9 @@ jobs: - name: Set up Maven uses: stCarolas/setup-maven@v5 with: - maven-version: 3.9.6 + maven-version: 3.9.9 - name: Cache local Maven repository - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 + uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1 with: path: ~/.m2/repository # re-cache on changes in the pom and target files @@ -46,12 +46,12 @@ jobs: uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 # v1.0.1 with: run: >- - mvn clean verify --batch-mode -Pits + mvn clean verify --batch-mode --threads 1C -Pits -Dtycho.p2.baselineMode=failCommon - -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true + -Dmaven.test.failure.ignore=true -Dtycho.surefire.deleteWorkDir=true - name: Upload Test Results - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 with: name: test-results-${{ matrix.os }} if-no-files-found: warn @@ -62,7 +62,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Upload - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 with: name: Event File path: ${{ github.event_path }} diff --git a/.mvn/maven.config b/.mvn/maven.config index 4bb3874742..fa967a0552 100644 --- a/.mvn/maven.config +++ b/.mvn/maven.config @@ -5,4 +5,4 @@ --fail-at-end -Dtycho.localArtifacts=ignore -Dtycho.target.pomDependencies=consider --Dtycho-version=4.0.4 +-Dtycho-version=4.0.9 diff --git a/Jenkinsfile b/Jenkinsfile index dd865e89d1..3428f1036e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,16 +1,16 @@ pipeline { options { timeout(time: 45, unit: 'MINUTES') - buildDiscarder(logRotator(numToKeepStr:'10')) + buildDiscarder(logRotator(numToKeepStr:'5', artifactNumToKeepStr: 'master'.equals(env.BRANCH_NAME) ? '5' : '1' )) disableConcurrentBuilds(abortPrevious: true) timestamps() } agent { - label "centos-latest" + label 'ubuntu-latest' } tools { - maven 'apache-maven-3.9.6' - jdk 'openjdk-jdk21-latest' + maven 'apache-maven-3.9.9' + jdk 'temurin-jdk21-latest' } stages { stage('get m2e-core-tests') { @@ -18,35 +18,20 @@ pipeline { sh 'git submodule update --init --recursive --remote' } } - stage('initialize PGP') { - when { - anyOf{ - branch 'master'; - branch pattern: 'm2e-[0-9]+\\.[0-9]+\\.x', comparator: "REGEXP" - } - } - steps { - withCredentials([file(credentialsId: 'secret-subkeys.asc', variable: 'KEYRING')]) { - sh 'gpg --batch --import "${KEYRING}"' - sh ''' - for fpr in $(gpg --list-keys --with-colons | awk -F: \'/fpr:/ {print $10}\' | sort -u) - do - echo -e "5\ny\n" | gpg --batch --command-fd 0 --expert --edit-key ${fpr} trust - done - ''' - } - } - } stage('Build') { steps { - withCredentials([string(credentialsId: 'gpg-passphrase', variable: 'KEYRING_PASSPHRASE')]) { + withCredentials([ + file(credentialsId: 'secret-subkeys.asc', variable: 'KEYRING'), + string(credentialsId: 'gpg-passphrase', variable: 'KEYRING_PASSPHRASE') + ]) { xvnc(useXauthority: true) { - sh ''' - mavenArgs="clean verify --batch-mode -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true -Dtycho.p2.baselineMode=failCommon" + sh '''#!/bin/bash -x + mavenArgs="clean verify --batch-mode -Dmaven.test.failure.ignore=true -Dtycho.p2.baselineMode=failCommon" if [[ ${BRANCH_NAME} == master ]] || [[ ${BRANCH_NAME} =~ m2e-[0-9]+\\.[0-9]+\\.x ]]; then - mvn ${mavenArgs} -Peclipse-sign,its -Dgpg.passphrase="${KEYRING_PASSPHRASE}" -Dgpg.keyname="011C526F29B2CE79" + mvn ${mavenArgs} -Peclipse-sign,its -Dtycho.pgp.signer.bc.secretKeys="${KEYRING}" -Dgpg.passphrase="${KEYRING_PASSPHRASE}" else - # Clear KEYRING_PASSPHRASE environment variable + # Clear signing environment variables for PRs + export KEYRING='EMPTY' export KEYRING_PASSPHRASE='EMPTY' mvn ${mavenArgs} -Pits fi @@ -59,7 +44,6 @@ pipeline { */target/work/data/.metadata/.log,\ m2e-core-tests/*/target/work/data/.metadata/.log,\ **/target/artifactcomparison/*' - archiveArtifacts (artifacts: '**/target/products/*.zip,**/target/products/*.tar.gz', onlyIfSuccessful: true) junit '*/target/surefire-reports/TEST-*.xml,*/*/target/surefire-reports/TEST-*.xml' } } @@ -69,8 +53,8 @@ pipeline { branch 'master' } steps { - sshagent ( ['projects-storage.eclipse.org-bot-ssh']) { - sh ''' + sshagent(['projects-storage.eclipse.org-bot-ssh']) { + sh '''#!/bin/bash -x deployM2ERepository() { echo Deploy m2e repo to ${1} diff --git a/m2e-core-tests b/m2e-core-tests index 813942ef2f..c153faa8aa 160000 --- a/m2e-core-tests +++ b/m2e-core-tests @@ -1 +1 @@ -Subproject commit 813942ef2fbc42c989f2104d59d213aa70340d12 +Subproject commit c153faa8aa9286f51fa35b7123718a96fc3a7bd5 diff --git a/m2e-parent/pom.xml b/m2e-parent/pom.xml index 8f4705fcfa..b698432b31 100644 --- a/m2e-parent/pom.xml +++ b/m2e-parent/pom.xml @@ -199,15 +199,6 @@ - - org.eclipse.cbi.maven.plugins - eclipse-jarsigner-plugin - 1.5.0 - - true - DO_NOT_RESIGN - - @@ -220,25 +211,6 @@ - - eclipse-sign - - - - org.eclipse.cbi.maven.plugins - eclipse-jarsigner-plugin - - - sign - - sign - - - - - - - windows diff --git a/org.eclipse.m2e.apt.core/.classpath b/org.eclipse.m2e.apt.core/.classpath index 3628e33687..35386b94bb 100644 --- a/org.eclipse.m2e.apt.core/.classpath +++ b/org.eclipse.m2e.apt.core/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.apt.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.apt.core/.settings/org.eclipse.jdt.core.prefs index 8489dba2db..cde898ab7e 100644 --- a/org.eclipse.m2e.apt.core/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.apt.core/.settings/org.eclipse.jdt.core.prefs @@ -23,9 +23,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -130,7 +130,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.apt.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.apt.core/META-INF/MANIFEST.MF index f617b24e96..ebd0c0d3fe 100644 --- a/org.eclipse.m2e.apt.core/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.apt.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.m2e.apt.core;singleton:=true -Bundle-Version: 2.2.202.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)", org.eclipse.core.resources, @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)", org.eclipse.m2e.jdt;bundle-version="[2.0.0,3.0.0)", org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)" Eclipse-LazyStart: true -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.m2e.apt;x-friends:="org.eclipse.m2e.apt.ui", org.eclipse.m2e.apt.preferences diff --git a/org.eclipse.m2e.apt.tests/.classpath b/org.eclipse.m2e.apt.tests/.classpath index 427e49b0d4..c9bfedfe9c 100644 --- a/org.eclipse.m2e.apt.tests/.classpath +++ b/org.eclipse.m2e.apt.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.apt.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.apt.tests/.settings/org.eclipse.jdt.core.prefs index c79abff38c..e07a4dd8f4 100644 --- a/org.eclipse.m2e.apt.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.apt.tests/.settings/org.eclipse.jdt.core.prefs @@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -100,4 +100,4 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.eclipse.m2e.apt.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.apt.tests/META-INF/MANIFEST.MF index a6086b96f5..76686f910d 100644 --- a/org.eclipse.m2e.apt.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.apt.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: m2e-apt Tests Plug-in Bundle-SymbolicName: org.eclipse.m2e.apt.tests Bundle-Version: 2.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.m2e.tests.common, org.junit, org.eclipse.jdt.core, diff --git a/org.eclipse.m2e.apt.tests/projects/argumentMap/pom.xml b/org.eclipse.m2e.apt.tests/projects/argumentMap/pom.xml index 4bd112074e..fc0213c33e 100644 --- a/org.eclipse.m2e.apt.tests/projects/argumentMap/pom.xml +++ b/org.eclipse.m2e.apt.tests/projects/argumentMap/pom.xml @@ -8,10 +8,9 @@ maven-compiler-plugin - 2.4 + 3.13.0 - 1.6 - 1.6 + 11 -AaddGeneratedAnnotation=true false diff --git a/org.eclipse.m2e.apt.tests/projects/nonjar_plugin_deps/pom.xml b/org.eclipse.m2e.apt.tests/projects/nonjar_plugin_deps/pom.xml index 781f6eb5bd..9c657efae5 100644 --- a/org.eclipse.m2e.apt.tests/projects/nonjar_plugin_deps/pom.xml +++ b/org.eclipse.m2e.apt.tests/projects/nonjar_plugin_deps/pom.xml @@ -26,10 +26,9 @@ maven-compiler-plugin - 3.1 + 3.13.0 - 1.6 - 1.6 + 11 diff --git a/org.eclipse.m2e.apt.tests/projects/p1/pom.xml b/org.eclipse.m2e.apt.tests/projects/p1/pom.xml index bc5e330990..b4e9e1201e 100644 --- a/org.eclipse.m2e.apt.tests/projects/p1/pom.xml +++ b/org.eclipse.m2e.apt.tests/projects/p1/pom.xml @@ -8,10 +8,12 @@ maven-compiler-plugin - 2.3.2 + 3.13.0 - 1.6 - 1.6 + 11 + + org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor + diff --git a/org.eclipse.m2e.apt.tests/projects/p11/pom.xml b/org.eclipse.m2e.apt.tests/projects/p11/pom.xml index 1048b13f4c..6afaed860a 100644 --- a/org.eclipse.m2e.apt.tests/projects/p11/pom.xml +++ b/org.eclipse.m2e.apt.tests/projects/p11/pom.xml @@ -11,10 +11,9 @@ maven-compiler-plugin - 3.5 + 3.13.0 - 1.6 - 1.6 + 11 org.hibernate diff --git a/org.eclipse.m2e.apt.tests/projects/p12/new-pom.xml b/org.eclipse.m2e.apt.tests/projects/p12/new-pom.xml index 6a60780d59..2aa3db8f73 100644 --- a/org.eclipse.m2e.apt.tests/projects/p12/new-pom.xml +++ b/org.eclipse.m2e.apt.tests/projects/p12/new-pom.xml @@ -11,10 +11,9 @@ maven-compiler-plugin - 2.3.2 + 3.13.0 - 1.6 - 1.6 + 11 diff --git a/org.eclipse.m2e.apt.tests/projects/p12/pom.xml b/org.eclipse.m2e.apt.tests/projects/p12/pom.xml index f3ae105c04..669d5086d0 100644 --- a/org.eclipse.m2e.apt.tests/projects/p12/pom.xml +++ b/org.eclipse.m2e.apt.tests/projects/p12/pom.xml @@ -11,10 +11,9 @@ maven-compiler-plugin - 2.3.2 + 3.13.0 - 1.6 - 1.6 + 11 -proc:none diff --git a/org.eclipse.m2e.apt.tests/projects/p1_test_classpath_disabled/pom.xml b/org.eclipse.m2e.apt.tests/projects/p1_test_classpath_disabled/pom.xml index d936c4eaab..5efd031e4b 100644 --- a/org.eclipse.m2e.apt.tests/projects/p1_test_classpath_disabled/pom.xml +++ b/org.eclipse.m2e.apt.tests/projects/p1_test_classpath_disabled/pom.xml @@ -11,10 +11,9 @@ maven-compiler-plugin - 2.3.2 + 3.13.0 - 1.6 - 1.6 + 11 diff --git a/org.eclipse.m2e.apt.tests/projects/p2/pom.xml b/org.eclipse.m2e.apt.tests/projects/p2/pom.xml index c9bc69835f..1f6a300829 100644 --- a/org.eclipse.m2e.apt.tests/projects/p2/pom.xml +++ b/org.eclipse.m2e.apt.tests/projects/p2/pom.xml @@ -8,10 +8,9 @@ maven-compiler-plugin - 2.3.2 + 3.13.0 - 1.6 - 1.6 + 11 target/generated-sources/m2e-apt/ target/generated-test-sources/m2e-apt/ diff --git a/org.eclipse.m2e.apt.tests/projects/p3/pom.xml b/org.eclipse.m2e.apt.tests/projects/p3/pom.xml index 9d49c29273..50e1068bf6 100644 --- a/org.eclipse.m2e.apt.tests/projects/p3/pom.xml +++ b/org.eclipse.m2e.apt.tests/projects/p3/pom.xml @@ -8,10 +8,9 @@ maven-compiler-plugin - 2.3.2 + 3.13.0 - 1.6 - 1.6 + 11 -proc:none diff --git a/org.eclipse.m2e.apt.tests/projects/p8/pom.xml b/org.eclipse.m2e.apt.tests/projects/p8/pom.xml index 30a35c2c02..07d6b8889f 100644 --- a/org.eclipse.m2e.apt.tests/projects/p8/pom.xml +++ b/org.eclipse.m2e.apt.tests/projects/p8/pom.xml @@ -11,10 +11,9 @@ maven-compiler-plugin - 2.3.2 + 3.13.0 - 1.6 - 1.6 + 11 -proc:none diff --git a/org.eclipse.m2e.apt.tests/src/org/eclipse/m2e/apt/tests/M2eAptProjectconfiguratorTest.java b/org.eclipse.m2e.apt.tests/src/org/eclipse/m2e/apt/tests/M2eAptProjectconfiguratorTest.java index 7f741d5e8e..35dc437f61 100644 --- a/org.eclipse.m2e.apt.tests/src/org/eclipse/m2e/apt/tests/M2eAptProjectconfiguratorTest.java +++ b/org.eclipse.m2e.apt.tests/src/org/eclipse/m2e/apt/tests/M2eAptProjectconfiguratorTest.java @@ -54,7 +54,7 @@ public class M2eAptProjectconfiguratorTest extends AbstractM2eAptProjectConfigur public void testMavenCompilerPluginSupport() throws Exception { // Note: this is the old default, in new plugin versions it is // "target/generated-test-sources/test-annotations" - defaultTest("p1", COMPILER_OUTPUT_DIR, "target/generated-sources/test-annotations"); + defaultTest("p1", COMPILER_OUTPUT_DIR, "target/generated-test-sources/test-annotations"); } @Test diff --git a/org.eclipse.m2e.apt.ui/.classpath b/org.eclipse.m2e.apt.ui/.classpath index 3628e33687..35386b94bb 100644 --- a/org.eclipse.m2e.apt.ui/.classpath +++ b/org.eclipse.m2e.apt.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.apt.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.apt.ui/.settings/org.eclipse.jdt.core.prefs index e43bdaafc9..173fa831e8 100644 --- a/org.eclipse.m2e.apt.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.apt.ui/.settings/org.eclipse.jdt.core.prefs @@ -22,9 +22,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -129,7 +129,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.apt.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.apt.ui/META-INF/MANIFEST.MF index 7f46de820f..0cff75ed59 100644 --- a/org.eclipse.m2e.apt.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.apt.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.m2e.apt.ui;singleton:=true -Bundle-Version: 2.0.402.qualifier +Bundle-Version: 2.0.500.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -11,6 +11,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.jdt.ui, org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: %Bundle-Vendor Automatic-Module-Name: org.eclipse.m2e.apt.ui diff --git a/org.eclipse.m2e.binaryproject.tests/.classpath b/org.eclipse.m2e.binaryproject.tests/.classpath index 427e49b0d4..c9bfedfe9c 100644 --- a/org.eclipse.m2e.binaryproject.tests/.classpath +++ b/org.eclipse.m2e.binaryproject.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.binaryproject.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.binaryproject.tests/.settings/org.eclipse.jdt.core.prefs index d4540a53f9..3a79233b13 100644 --- a/org.eclipse.m2e.binaryproject.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.binaryproject.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.eclipse.m2e.binaryproject.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.binaryproject.tests/META-INF/MANIFEST.MF index 7379da8272..2be653996b 100644 --- a/org.eclipse.m2e.binaryproject.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.binaryproject.tests/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Require-Bundle: org.eclipse.m2e.core, org.eclipse.m2e.jdt, org.eclipse.jdt.core, org.eclipse.core.runtime -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: org.eclipse.m2e.binaryproject.tests diff --git a/org.eclipse.m2e.binaryproject.ui/.classpath b/org.eclipse.m2e.binaryproject.ui/.classpath index 3628e33687..35386b94bb 100644 --- a/org.eclipse.m2e.binaryproject.ui/.classpath +++ b/org.eclipse.m2e.binaryproject.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.binaryproject.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.binaryproject.ui/.settings/org.eclipse.jdt.core.prefs index d4540a53f9..3a79233b13 100644 --- a/org.eclipse.m2e.binaryproject.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.binaryproject.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.eclipse.m2e.binaryproject.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.binaryproject.ui/META-INF/MANIFEST.MF index 18abdc9463..2bb7fa1827 100644 --- a/org.eclipse.m2e.binaryproject.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.binaryproject.ui/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.binaryproject.ui;singleton:=true -Bundle-Version: 2.0.200.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Vendor: Eclipse.org - m2e Bundle-Name: M2E Binary Project UI Require-Bundle: org.eclipse.ui, @@ -10,6 +10,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.m2e.binaryproject;bundle-version="[2.0.0,3.0.0)", org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.m2e.binaryproject.ui diff --git a/org.eclipse.m2e.binaryproject/.classpath b/org.eclipse.m2e.binaryproject/.classpath index 3628e33687..35386b94bb 100644 --- a/org.eclipse.m2e.binaryproject/.classpath +++ b/org.eclipse.m2e.binaryproject/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.binaryproject/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.binaryproject/.settings/org.eclipse.jdt.core.prefs index d4540a53f9..3a79233b13 100644 --- a/org.eclipse.m2e.binaryproject/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.binaryproject/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.eclipse.m2e.binaryproject/META-INF/MANIFEST.MF b/org.eclipse.m2e.binaryproject/META-INF/MANIFEST.MF index dac548a820..bda4209c21 100644 --- a/org.eclipse.m2e.binaryproject/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.binaryproject/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.binaryproject;singleton:=true -Bundle-Version: 2.1.203.qualifier +Bundle-Version: 2.2.0.qualifier Bundle-Vendor: Eclipse.org - m2e Bundle-Name: M2E Binary Project Core Require-Bundle: org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)", org.eclipse.debug.core;bundle-version="3.9.0", org.eclipse.jdt.launching;bundle-version="3.10.0" -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.eclipse.m2e.binaryproject.internal;x-friends:="org.eclipse.m2e.sourcelookup,org.eclipse.m2e.sourcelookup.ui" Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.m2e.binaryproject diff --git a/org.eclipse.m2e.core.tests/.classpath b/org.eclipse.m2e.core.tests/.classpath index 427e49b0d4..c9bfedfe9c 100644 --- a/org.eclipse.m2e.core.tests/.classpath +++ b/org.eclipse.m2e.core.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.core.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.core.tests/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..23fa13b170 --- /dev/null +++ b/org.eclipse.m2e.core.tests/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.eclipse.m2e.core.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.tests/META-INF/MANIFEST.MF index 60603f825e..b571372e94 100644 --- a/org.eclipse.m2e.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: M2E Maven Integration for Eclipse Core Tests Bundle-SymbolicName: org.eclipse.m2e.core.tests Bundle-Version: 2.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: Eclipse.org - m2e Require-Bundle: org.eclipse.m2e.tests.common, org.eclipse.core.runtime, diff --git a/org.eclipse.m2e.core.ui.tests/.classpath b/org.eclipse.m2e.core.ui.tests/.classpath index 427e49b0d4..c9bfedfe9c 100644 --- a/org.eclipse.m2e.core.ui.tests/.classpath +++ b/org.eclipse.m2e.core.ui.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.core.ui.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.core.ui.tests/.settings/org.eclipse.jdt.core.prefs index 9478cb1653..1e0cb16bbc 100644 --- a/org.eclipse.m2e.core.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.core.ui.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.eclipse.m2e.core.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.ui.tests/META-INF/MANIFEST.MF index 924420503f..9d96befc9a 100644 --- a/org.eclipse.m2e.core.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core.ui.tests/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Fragment-Host: org.eclipse.m2e.core.ui Bundle-ManifestVersion: 2 Bundle-Name: M2E Maven Integration for Eclipse UI Tests Bundle-SymbolicName: org.eclipse.m2e.core.ui.tests -Bundle-Version: 2.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-Version: 2.1.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: Eclipse.org - m2e Require-Bundle: org.eclipse.m2e.tests.common, org.junit, diff --git a/org.eclipse.m2e.core.ui.tests/pom.xml b/org.eclipse.m2e.core.ui.tests/pom.xml index e792445f59..7e1fe48155 100644 --- a/org.eclipse.m2e.core.ui.tests/pom.xml +++ b/org.eclipse.m2e.core.ui.tests/pom.xml @@ -23,7 +23,7 @@ org.eclipse.m2e.core.ui.tests M2E Maven Integration for Eclipse UI Tests - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT eclipse-test-plugin diff --git a/org.eclipse.m2e.core.ui.tests/resources/projects/simple-tycho/simple.tests/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.m2e.core.ui.tests/resources/projects/simple-tycho/simple.tests/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000000..f897a7f1cb --- /dev/null +++ b/org.eclipse.m2e.core.ui.tests/resources/projects/simple-tycho/simple.tests/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/org.eclipse.m2e.core.ui/.classpath b/org.eclipse.m2e.core.ui/.classpath index 3628e33687..35386b94bb 100644 --- a/org.eclipse.m2e.core.ui/.classpath +++ b/org.eclipse.m2e.core.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.core.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.core.ui/.settings/org.eclipse.jdt.core.prefs index 70cb335670..05bc5a22d9 100644 --- a/org.eclipse.m2e.core.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.core.ui/.settings/org.eclipse.jdt.core.prefs @@ -28,9 +28,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -145,7 +145,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF index bb2fea3f04..5f61075051 100644 --- a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.core.ui;singleton:=true -Bundle-Version: 2.0.801.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-Version: 2.1.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/components/WorkingSetGroup.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/components/WorkingSetGroup.java index e59c5b2919..bd56f962a0 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/components/WorkingSetGroup.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/components/WorkingSetGroup.java @@ -131,7 +131,7 @@ public Image getImage(Object element) { ImageDescriptor imageDescriptor = workingSet.getImageDescriptor(); if(imageDescriptor != null) { try { - return (Image) images.create(imageDescriptor); + return images.create(imageDescriptor); } catch(DeviceResourceException ex) { return null; } diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/MavenPropertyDialog.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/MavenPropertyDialog.java index 15067fc760..79256e8b64 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/MavenPropertyDialog.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/MavenPropertyDialog.java @@ -13,9 +13,10 @@ package org.eclipse.m2e.core.ui.internal.dialogs; -// import org.eclipse.debug.ui.StringVariableSelectionDialog; import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.DialogSettings; import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.swt.SWT; import org.eclipse.swt.events.VerifyEvent; import org.eclipse.swt.events.VerifyListener; @@ -28,11 +29,14 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; +import org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator; import org.eclipse.m2e.core.ui.internal.Messages; public class MavenPropertyDialog extends Dialog { + private static final String DIALOG_SETTINGS = MavenPropertyDialog.class.getName(); + private final String title; private final String initialName; @@ -64,6 +68,8 @@ public MavenPropertyDialog(Shell shell, String title, String initialName, String @Override protected Control createDialogArea(Composite parent) { Composite comp = new Composite(parent, SWT.NONE); + comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + GridLayout gridLayout = new GridLayout(2, false); gridLayout.marginTop = 7; gridLayout.marginWidth = 12; @@ -186,4 +192,21 @@ public void create() { super.create(); updateButtons(); } + + @Override + protected boolean isResizable() { + return true; + } + + @Override + protected IDialogSettings getDialogBoundsSettings() { + IDialogSettings pluginSettings = M2EUIPluginActivator.getDefault().getDialogSettings(); + IDialogSettings dialogSettings = pluginSettings.getSection(DIALOG_SETTINGS); + if(dialogSettings == null) { + dialogSettings = new DialogSettings(DIALOG_SETTINGS); + pluginSettings.addSection(dialogSettings); + } + return dialogSettings; + } + } diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizardPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizardPage.java index dffd36df02..a4e5e6fcae 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizardPage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizardPage.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Comparator; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; @@ -250,7 +251,7 @@ public Object[] getElements(Object element) { if(element instanceof List) { @SuppressWarnings("unchecked") List projects = (List) element; - return projects.toArray(new MavenProjectInfo[projects.size()]); + return sorted(projects); } return EMPTY; } @@ -260,14 +261,20 @@ public Object[] getChildren(Object parentElement) { if(parentElement instanceof List) { @SuppressWarnings("unchecked") List projects = (List) parentElement; - return projects.toArray(new MavenProjectInfo[projects.size()]); + return sorted(projects); } else if(parentElement instanceof MavenProjectInfo mavenProjectInfo) { Collection projects = mavenProjectInfo.getProjects(); - return projects.toArray(new MavenProjectInfo[projects.size()]); + return sorted(projects); } return EMPTY; } + private MavenProjectInfo[] sorted(Collection projects) { + List sortedProjects = new ArrayList<>(projects); + sortedProjects.sort(Comparator.comparing(MavenProjectInfo::getLabel)); + return sortedProjects.toArray(MavenProjectInfo[]::new); + } + @Override public Object getParent(Object element) { return null; diff --git a/org.eclipse.m2e.core/.classpath b/org.eclipse.m2e.core/.classpath index 50c3b9e446..da5b3991fa 100644 --- a/org.eclipse.m2e.core/.classpath +++ b/org.eclipse.m2e.core/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs index 696a7c3b81..017ef28aa6 100644 --- a/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs @@ -29,9 +29,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -146,7 +146,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF index aead1fa934..83c8bd7a06 100644 --- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.m2e.core;singleton:=true -Bundle-Version: 2.6.1.qualifier +Bundle-Version: 2.7.0.qualifier Bundle-Activator: org.eclipse.m2e.core.internal.MavenPluginActivator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)", org.eclipse.core.resources;bundle-version="3.9.0", org.eclipse.core.filesystem;bundle-version="1.7.700" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.eclipse.m2e.core, org.eclipse.m2e.core.embedder, org.eclipse.m2e.core.internal; diff --git a/org.eclipse.m2e.core/pom.xml b/org.eclipse.m2e.core/pom.xml index fc9ab355b2..ecba174723 100644 --- a/org.eclipse.m2e.core/pom.xml +++ b/org.eclipse.m2e.core/pom.xml @@ -19,7 +19,7 @@ org.eclipse.m2e.core - 2.6.1-SNAPSHOT + 2.7.0-SNAPSHOT eclipse-plugin Maven Integration for Eclipse Core Plug-in diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryManager.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryManager.java index 5e2ad4fa43..bad2ec7a60 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryManager.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryManager.java @@ -974,7 +974,7 @@ static class Context { } private MavenExecutionRequest configureExecutionRequest(MavenExecutionRequest request, IProjectRegistry state, - IFile pom, IProjectConfiguration resolverConfiguration) throws CoreException { + IFile pom, IProjectConfiguration resolverConfiguration) { if(pom != null) { request.setPom(ProjectRegistryManager.toJavaIoFile(pom)); } diff --git a/org.eclipse.m2e.discovery/.classpath b/org.eclipse.m2e.discovery/.classpath index 3628e33687..35386b94bb 100644 --- a/org.eclipse.m2e.discovery/.classpath +++ b/org.eclipse.m2e.discovery/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.discovery/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.discovery/.settings/org.eclipse.jdt.core.prefs index ffbf9b784f..d485022b41 100644 --- a/org.eclipse.m2e.discovery/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.discovery/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -108,7 +108,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF index be2eba0db6..5b836941af 100644 --- a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF @@ -2,8 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.m2e.discovery;singleton:=true -Bundle-Version: 2.0.202.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-Version: 2.1.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Require-Bundle: org.eclipse.equinox.p2.ui.discovery, diff --git a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscovery.java b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscovery.java index 312222217a..c678a32ecf 100644 --- a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscovery.java +++ b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscovery.java @@ -153,8 +153,8 @@ public static LifecycleMappingMetadataSource getLifecycleMappingMetadataSource(C } // To ensure we can delete the temporary file we need to prevent caching, see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4386865 URLConnection conn = url.openConnection(); - if(conn instanceof JarURLConnection) { - ((JarURLConnection) conn).setDefaultUseCaches(false); + if(conn instanceof JarURLConnection jarConn) { + jarConn.setDefaultUseCaches(false); } try (InputStream is = conn.getInputStream()) { return LifecycleMappingFactory.createLifecycleMappingMetadataSource(is); diff --git a/org.eclipse.m2e.editor.lemminx.tests/.classpath b/org.eclipse.m2e.editor.lemminx.tests/.classpath index 427e49b0d4..c9bfedfe9c 100644 --- a/org.eclipse.m2e.editor.lemminx.tests/.classpath +++ b/org.eclipse.m2e.editor.lemminx.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.editor.lemminx.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.editor.lemminx.tests/.settings/org.eclipse.jdt.core.prefs index 62ef3488cc..23fa13b170 100644 --- a/org.eclipse.m2e.editor.lemminx.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.editor.lemminx.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.eclipse.m2e.editor.lemminx.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor.lemminx.tests/META-INF/MANIFEST.MF index f2b6fc5368..4e9ab741b3 100644 --- a/org.eclipse.m2e.editor.lemminx.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.editor.lemminx.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: M2E Maven POM File Editor using Wild Web Developer, Lemminx and Mav Bundle-SymbolicName: org.eclipse.m2e.editor.lemminx.tests Bundle-Version: 2.0.2.qualifier Automatic-Module-Name: org.eclipse.m2e.editor.lemminx.tests -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: Eclipse.org - m2e Fragment-Host: org.eclipse.m2e.editor.lemminx Require-Bundle: org.junit, diff --git a/org.eclipse.m2e.editor.lemminx.tests/src/org/eclipse/m2e/editor/lemminx/tests/EditorTest.java b/org.eclipse.m2e.editor.lemminx.tests/src/org/eclipse/m2e/editor/lemminx/tests/EditorTest.java index e0dce907ae..76e2398519 100644 --- a/org.eclipse.m2e.editor.lemminx.tests/src/org/eclipse/m2e/editor/lemminx/tests/EditorTest.java +++ b/org.eclipse.m2e.editor.lemminx.tests/src/org/eclipse/m2e/editor/lemminx/tests/EditorTest.java @@ -14,9 +14,8 @@ import java.io.IOException; import java.io.InputStream; +import java.lang.reflect.Method; import java.util.Arrays; -import java.util.Set; -import java.util.stream.Collectors; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; @@ -26,18 +25,19 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.TextSelection; +import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.eclipse.jface.text.source.ISourceViewer; +import org.eclipse.lsp4e.operations.completion.LSContentAssistProcessor; import org.eclipse.m2e.core.internal.preferences.MavenPreferenceConstants; import org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator; import org.eclipse.m2e.editor.pom.MavenPomEditor; import org.eclipse.m2e.tests.common.AbstractMavenProjectTestCase; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.TableItem; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; import org.eclipse.ui.tests.harness.util.DisplayHelper; +import org.eclipse.ui.texteditor.AbstractTextEditor; import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.ITextEditorActionConstants; import org.eclipse.wildwebdeveloper.xml.internal.Activator; @@ -91,19 +91,13 @@ public void testGenericEditorHasMavenExtensionEnabled() throws Exception { })); int offset = editorPart.getDocumentProvider().getDocument(editorPart.getEditorInput()).get() .indexOf(""); - Set beforeShells = Arrays.stream(display.getShells()).filter(Shell::isVisible) - .collect(Collectors.toSet()); editorPart.getSelectionProvider().setSelection(new TextSelection(offset, 0)); editorPart.getAction(ITextEditorActionConstants.CONTENT_ASSIST).run(); - assertTrue("Missing completion proposals", DisplayHelper.waitForCondition(display, WAIT_TIMEOUT, () -> { - Set afterShells = Arrays.stream(display.getShells()).filter(Shell::isVisible) - .collect(Collectors.toSet()); - afterShells.removeAll(beforeShells); - return afterShells.stream().flatMap(shell -> Arrays.stream(shell.getChildren())) - .filter(Table.class::isInstance).map(Table.class::cast).findFirst() - .map(table -> Arrays.stream(table.getItems()).map(TableItem::getText).anyMatch("compile"::equals)) - .orElse(Boolean.FALSE).booleanValue(); - })); + LSContentAssistProcessor contentAssistProcessor = new LSContentAssistProcessor(); + ICompletionProposal[] proposals = contentAssistProcessor + .computeCompletionProposals(getSourceViewer(editorPart), offset); + assertTrue("Missing completion proposals", + Arrays.stream(proposals).map(ICompletionProposal::getDisplayString).anyMatch("compile"::equals)); } @Test @@ -145,4 +139,15 @@ private IProject createMavenProject(String projectName, String pomFileName) thro } } + private static ISourceViewer getSourceViewer(ITextEditor editor) { + try { + Method method = AbstractTextEditor.class.getDeclaredMethod("getSourceViewer"); + method.setAccessible(true); + return (ISourceViewer) method.invoke(editor); + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + } diff --git a/org.eclipse.m2e.editor.lemminx/.classpath b/org.eclipse.m2e.editor.lemminx/.classpath index 3628e33687..35386b94bb 100644 --- a/org.eclipse.m2e.editor.lemminx/.classpath +++ b/org.eclipse.m2e.editor.lemminx/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.editor.lemminx/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.editor.lemminx/.settings/org.eclipse.jdt.core.prefs index d4540a53f9..3a79233b13 100644 --- a/org.eclipse.m2e.editor.lemminx/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.editor.lemminx/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF index c689eb6472..41a95b8d72 100644 --- a/org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: M2E Maven POM File Editor using Wild Web Developer, LemMinX and Maven LS extension (requires Incubating components) Bundle-SymbolicName: org.eclipse.m2e.editor.lemminx;singleton:=true -Bundle-Version: 2.0.600.qualifier +Bundle-Version: 2.0.700.qualifier Automatic-Module-Name: org.eclipse.m2e.xmlls.extension Import-Package: javax.inject;version="[1.0.0,2.0.0)", org.apache.commons.cli;version="1.6.0", @@ -15,5 +15,5 @@ Require-Bundle: org.eclipse.wildwebdeveloper.xml;bundle-version="[1.3,1.4)", org.eclipse.m2e.core, org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)", org.eclipse.core.resources -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: Eclipse.org - m2e diff --git a/org.eclipse.m2e.editor.lemminx/pom.xml b/org.eclipse.m2e.editor.lemminx/pom.xml index 7f3a98fc73..21b5a7f73e 100644 --- a/org.eclipse.m2e.editor.lemminx/pom.xml +++ b/org.eclipse.m2e.editor.lemminx/pom.xml @@ -24,7 +24,7 @@ org.eclipse.m2e.editor.lemminx M2E Maven POM File Editor (Wild Web Developer, LemMinX, LS) eclipse-plugin - 2.0.600-SNAPSHOT + 2.0.700-SNAPSHOT diff --git a/org.eclipse.m2e.editor.tests/.classpath b/org.eclipse.m2e.editor.tests/.classpath index 427e49b0d4..c9bfedfe9c 100644 --- a/org.eclipse.m2e.editor.tests/.classpath +++ b/org.eclipse.m2e.editor.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.editor.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.editor.tests/.settings/org.eclipse.jdt.core.prefs index 00a1fd4d07..4fca80c6dc 100644 --- a/org.eclipse.m2e.editor.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.editor.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,11 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.eclipse.m2e.editor.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor.tests/META-INF/MANIFEST.MF index cb5c185139..b08500ed85 100644 --- a/org.eclipse.m2e.editor.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.editor.tests/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.m2e.editor.tests Bundle-Version: 2.0.0.qualifier Bundle-Vendor: Eclipse.org - m2e Automatic-Module-Name: org.eclipse.m2e.editor.tests -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.m2e.editor, org.eclipse.m2e.tests.common, org.junit, diff --git a/org.eclipse.m2e.editor/.classpath b/org.eclipse.m2e.editor/.classpath index 3628e33687..35386b94bb 100644 --- a/org.eclipse.m2e.editor/.classpath +++ b/org.eclipse.m2e.editor/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.editor/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.editor/.settings/org.eclipse.jdt.core.prefs index 70cb335670..05bc5a22d9 100644 --- a/org.eclipse.m2e.editor/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.editor/.settings/org.eclipse.jdt.core.prefs @@ -28,9 +28,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -145,7 +145,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF index 539404dfe9..3218de22af 100644 --- a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.m2e.editor;singleton:=true -Bundle-Version: 2.0.401.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Activator: org.eclipse.m2e.editor.MavenEditorPlugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)", org.eclipse.core.resources, @@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="1.7.500", org.eclipse.m2e.discovery;bundle-version="[2.0.0,3.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.m2e.editor;x-friends:="org.eclipse.m2e.editor.xml", org.eclipse.m2e.editor.composites;x-friends:="org.eclipse.m2e.editor.xml", diff --git a/org.eclipse.m2e.feature/feature.xml b/org.eclipse.m2e.feature/feature.xml index 123886e332..e9de8bf706 100644 --- a/org.eclipse.m2e.feature/feature.xml +++ b/org.eclipse.m2e.feature/feature.xml @@ -2,7 +2,7 @@ - + diff --git a/org.eclipse.m2e.jdt.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.jdt.tests/.settings/org.eclipse.jdt.core.prefs index 62ef3488cc..23fa13b170 100644 --- a/org.eclipse.m2e.jdt.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.jdt.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.eclipse.m2e.jdt.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.jdt.tests/META-INF/MANIFEST.MF index a01493a3c1..90c8c457e5 100644 --- a/org.eclipse.m2e.jdt.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.jdt.tests/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.jdt.tests;singleton:=true -Bundle-Version: 2.0.1.qualifier +Bundle-Version: 2.1.0.qualifier Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.jobs, org.eclipse.jdt.core, @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.debug.core, org.eclipse.ui.tests.harness, org.eclipse.ui -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: Eclipse.org - m2e Automatic-Module-Name: org.eclipse.m2e.jdt.tests Bundle-Name: M2E JDT Integration Tests diff --git a/org.eclipse.m2e.jdt.tests/projects/compilerWarnings/pom.xml b/org.eclipse.m2e.jdt.tests/projects/compilerWarnings/pom.xml index 19df808f80..44d4e13208 100644 --- a/org.eclipse.m2e.jdt.tests/projects/compilerWarnings/pom.xml +++ b/org.eclipse.m2e.jdt.tests/projects/compilerWarnings/pom.xml @@ -13,7 +13,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.13.0 -warn:-serial diff --git a/org.eclipse.m2e.jdt.ui/.classpath b/org.eclipse.m2e.jdt.ui/.classpath index 3628e33687..35386b94bb 100644 --- a/org.eclipse.m2e.jdt.ui/.classpath +++ b/org.eclipse.m2e.jdt.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.jdt.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.jdt.ui/.settings/org.eclipse.jdt.core.prefs index ffbf9b784f..d485022b41 100644 --- a/org.eclipse.m2e.jdt.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.jdt.ui/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -108,7 +108,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF index f9e72ff4e6..6156a39209 100644 --- a/org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.m2e.jdt.ui;singleton:=true -Bundle-Version: 2.0.401.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Localization: plugin Export-Package: org.eclipse.m2e.jdt.ui.internal;x-internal:=true, org.eclipse.m2e.jdt.ui.internal.actions;x-internal:=true, @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.m2e.jdt;bundle-version="[2.0.0,3.0.0)", org.eclipse.jface.text;bundle-version="3.21.0" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.m2e.jdt.ui.internal.MavenJdtUiPlugin -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: %Bundle-Vendor Import-Package: org.slf4j;version="[1.7.0,3.0.0)" Automatic-Module-Name: org.eclipse.m2e.jdt.ui diff --git a/org.eclipse.m2e.jdt/.classpath b/org.eclipse.m2e.jdt/.classpath index 3628e33687..35386b94bb 100644 --- a/org.eclipse.m2e.jdt/.classpath +++ b/org.eclipse.m2e.jdt/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.jdt/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.jdt/.settings/org.eclipse.jdt.core.prefs index 11358cf629..500c99ee84 100644 --- a/org.eclipse.m2e.jdt/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.jdt/.settings/org.eclipse.jdt.core.prefs @@ -28,9 +28,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -145,7 +145,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF b/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF index 2cc4f19700..cacf40da9e 100644 --- a/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.m2e.jdt;singleton:=true -Bundle-Version: 2.3.600.qualifier +Bundle-Version: 2.4.0.qualifier Bundle-Localization: plugin Export-Package: org.eclipse.m2e.jdt, org.eclipse.m2e.jdt.internal;x-friends:="org.eclipse.m2e.jdt.ui", @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)", org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.m2e.jdt.MavenJdtPlugin -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: %Bundle-Vendor Import-Package: com.google.gson;version="[2.9.1,3.0.0)", org.apache.commons.codec.digest;version="[1.14.0,2.0.0)", diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java index 0356efdd14..c52709a097 100644 --- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java +++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java @@ -114,11 +114,8 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon List sources = new ArrayList<>(); List targets = new ArrayList<>(); - //Special case - targets.add("jsr14"); //$NON-NLS-1$ - ENVIRONMENTS.put("jsr14", "J2SE-1.5"); //$NON-NLS-1$ //$NON-NLS-2$ - List releases = new ArrayList<>(List.of("6", "7", "8")); + List releases = new ArrayList<>(List.of("8")); for(IExecutionEnvironment ee : JavaRuntime.getExecutionEnvironmentsManager().getExecutionEnvironments()) { String eeId = ee.getId(); @@ -144,7 +141,7 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon RELEASES = Collections.unmodifiableList(releases); } - protected static final String DEFAULT_COMPILER_LEVEL = "1.5"; //$NON-NLS-1$ + protected static final String DEFAULT_COMPILER_LEVEL = "1.8"; //$NON-NLS-1$ private static final QualifiedName LINKED_MAVEN_RESOURCE = new QualifiedName(MavenJdtPlugin.PLUGIN_ID, "linkedSource"); diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaProjectConversionParticipant.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaProjectConversionParticipant.java index 01639b4e2a..aa90225126 100644 --- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaProjectConversionParticipant.java +++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaProjectConversionParticipant.java @@ -74,13 +74,13 @@ public class JavaProjectConversionParticipant extends AbstractProjectConversionP private static final String DEFAULT_TEST_RESOURCES = "src/test/resources"; //$NON-NLS-1$ - private static final String DEFAULT_JAVA_VERSION = "1.5"; //$NON-NLS-1$ + private static final String DEFAULT_JAVA_VERSION = "1.8"; //$NON-NLS-1$ private static final String COMPILER_GROUP_ID = "org.apache.maven.plugins"; //$NON-NLS-1$ private static final String COMPILER_ARTIFACT_ID = "maven-compiler-plugin"; //$NON-NLS-1$ - private static final String DEFAULT_COMPILER_VERSION = "3.8.1"; //$NON-NLS-1$ + private static final String DEFAULT_COMPILER_VERSION = "3.13.0"; //$NON-NLS-1$ private static final String TARGET_KEY = "target"; //$NON-NLS-1$ diff --git a/org.eclipse.m2e.launching/.classpath b/org.eclipse.m2e.launching/.classpath index 3628e33687..35386b94bb 100644 --- a/org.eclipse.m2e.launching/.classpath +++ b/org.eclipse.m2e.launching/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.launching/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.launching/.settings/org.eclipse.jdt.core.prefs index ffbf9b784f..d485022b41 100644 --- a/org.eclipse.m2e.launching/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.launching/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -108,7 +108,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.launching/META-INF/MANIFEST.MF b/org.eclipse.m2e.launching/META-INF/MANIFEST.MF index 9d3d8c5799..47ebfe88af 100644 --- a/org.eclipse.m2e.launching/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.launching/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.m2e.launching;singleton:=true -Bundle-Version: 2.0.602.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)", org.eclipse.core.variables, @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)", org.eclipse.m2e.core.ui;bundle-version="[2.0.0,3.0.0)", org.eclipse.m2e.workspace.cli;bundle-version="0.1.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.m2e.actions;x-internal:=true, org.eclipse.m2e.internal.launch;x-internal:=true, diff --git a/org.eclipse.m2e.launching/src/org/eclipse/m2e/ui/internal/launch/MavenLaunchMainTab.java b/org.eclipse.m2e.launching/src/org/eclipse/m2e/ui/internal/launch/MavenLaunchMainTab.java index 3d1f40a46d..6f03c80ebf 100644 --- a/org.eclipse.m2e.launching/src/org/eclipse/m2e/ui/internal/launch/MavenLaunchMainTab.java +++ b/org.eclipse.m2e.launching/src/org/eclipse/m2e/ui/internal/launch/MavenLaunchMainTab.java @@ -32,6 +32,8 @@ import org.eclipse.debug.ui.AbstractLaunchConfigurationTab; import org.eclipse.debug.ui.StringVariableSelectionDialog; import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.viewers.ColumnWeightData; +import org.eclipse.jface.viewers.TableLayout; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.SWT; import org.eclipse.swt.events.FocusAdapter; @@ -355,17 +357,23 @@ public void widgetSelected(SelectionEvent e) { }); this.propsTable = tableViewer.getTable(); + + TableLayout tableLayout = new TableLayout(); + ColumnWeightData weightData = new ColumnWeightData(20, true); + tableLayout.addColumnData(weightData); + weightData = new ColumnWeightData(80, true); + tableLayout.addColumnData(weightData); + this.propsTable.setLayout(tableLayout); + //this.tProps.setItemCount(10); this.propsTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 4, 3)); this.propsTable.setLinesVisible(true); this.propsTable.setHeaderVisible(true); final TableColumn propColumn = new TableColumn(this.propsTable, SWT.NONE, 0); - propColumn.setWidth(120); propColumn.setText(Messages.launchPropName); final TableColumn valueColumn = new TableColumn(this.propsTable, SWT.NONE, 1); - valueColumn.setWidth(200); valueColumn.setText(Messages.launchPropValue); final Button addPropButton = new Button(mainComposite, SWT.NONE); @@ -404,8 +412,6 @@ public void widgetSelected(SelectionEvent e) { runtimeSelector = new MavenRuntimeSelector(mainComposite); runtimeSelector.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 4, 1)); runtimeSelector.addSelectionChangedListener(event -> entriesChanged()); - - goalsText.setFocus(); } protected Shell getShell() { diff --git a/org.eclipse.m2e.lemminx.feature/feature.xml b/org.eclipse.m2e.lemminx.feature/feature.xml index bc00abb851..e938a76951 100644 --- a/org.eclipse.m2e.lemminx.feature/feature.xml +++ b/org.eclipse.m2e.lemminx.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.m2e.logback.feature/feature.xml b/org.eclipse.m2e.logback.feature/feature.xml index b8731afe8f..067c7852ca 100644 --- a/org.eclipse.m2e.logback.feature/feature.xml +++ b/org.eclipse.m2e.logback.feature/feature.xml @@ -2,7 +2,7 @@ - + diff --git a/org.eclipse.m2e.logback/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.logback/.settings/org.eclipse.jdt.core.prefs index ffbf9b784f..d485022b41 100644 --- a/org.eclipse.m2e.logback/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.logback/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -108,7 +108,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.logback/META-INF/MANIFEST.MF b/org.eclipse.m2e.logback/META-INF/MANIFEST.MF index bc3acb774b..2c576a2138 100644 --- a/org.eclipse.m2e.logback/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.logback/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.logback;singleton:=true -Bundle-Version: 2.6.1.qualifier +Bundle-Version: 2.7.0.qualifier Bundle-Name: M2E Logback Appender and Configuration Bundle-Vendor: Eclipse.org - m2e -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Fragment-Host: ch.qos.logback.classic;bundle-version="[1.3.0,1.6.0)" Require-Bundle: org.eclipse.core.runtime, org.eclipse.jface, diff --git a/org.eclipse.m2e.mavenarchiver/.classpath b/org.eclipse.m2e.mavenarchiver/.classpath index 3628e33687..35386b94bb 100644 --- a/org.eclipse.m2e.mavenarchiver/.classpath +++ b/org.eclipse.m2e.mavenarchiver/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.mavenarchiver/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.mavenarchiver/.settings/org.eclipse.jdt.core.prefs index 9478cb1653..1e0cb16bbc 100644 --- a/org.eclipse.m2e.mavenarchiver/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.mavenarchiver/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.eclipse.m2e.mavenarchiver/META-INF/MANIFEST.MF b/org.eclipse.m2e.mavenarchiver/META-INF/MANIFEST.MF index 67f710edc4..5bf8b5cf20 100644 --- a/org.eclipse.m2e.mavenarchiver/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.mavenarchiver/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: m2e connector for the mavenarchiver and pom properties Bundle-SymbolicName: org.eclipse.m2e.mavenarchiver;singleton:=true -Bundle-Version: 2.0.501.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Vendor: Eclipse.org - m2e -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)", org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", diff --git a/org.eclipse.m2e.model.edit/META-INF/MANIFEST.MF b/org.eclipse.m2e.model.edit/META-INF/MANIFEST.MF index 7b5c8845f7..896a8899af 100644 --- a/org.eclipse.m2e.model.edit/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.model.edit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-Name: M2E Maven Project Model Edit Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: Eclipse.org - m2e -Bundle-Version: 2.0.500.qualifier +Bundle-Version: 2.0.600.qualifier Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.model.edit;singleton:=true Require-Bundle: org.eclipse.core.runtime, diff --git a/org.eclipse.m2e.pde.connector.tests/.classpath b/org.eclipse.m2e.pde.connector.tests/.classpath index 427e49b0d4..c9bfedfe9c 100644 --- a/org.eclipse.m2e.pde.connector.tests/.classpath +++ b/org.eclipse.m2e.pde.connector.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.pde.connector.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.pde.connector.tests/.settings/org.eclipse.jdt.core.prefs index 62ef3488cc..23fa13b170 100644 --- a/org.eclipse.m2e.pde.connector.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.pde.connector.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.eclipse.m2e.pde.connector.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.pde.connector.tests/META-INF/MANIFEST.MF index 6590357ea0..00a679983b 100644 --- a/org.eclipse.m2e.pde.connector.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.pde.connector.tests/META-INF/MANIFEST.MF @@ -10,4 +10,4 @@ Require-Bundle: org.eclipse.m2e.tests.common, org.eclipse.pde.ds.core, org.osgi.service.component.annotations Automatic-Module-Name: org.eclipse.m2e.pde.connector.tests -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.m2e.pde.connector.tests/projects/tycho/.mvn/extensions.xml b/org.eclipse.m2e.pde.connector.tests/projects/tycho/.mvn/extensions.xml index 6235ae1bce..568530568d 100644 --- a/org.eclipse.m2e.pde.connector.tests/projects/tycho/.mvn/extensions.xml +++ b/org.eclipse.m2e.pde.connector.tests/projects/tycho/.mvn/extensions.xml @@ -3,6 +3,6 @@ org.eclipse.tycho tycho-build - 3.0.0 + 4.0.9 diff --git a/org.eclipse.m2e.pde.connector.tests/projects/tycho/pde.tycho.plugin.with.ds/META-INF/MANIFEST.MF b/org.eclipse.m2e.pde.connector.tests/projects/tycho/pde.tycho.plugin.with.ds/META-INF/MANIFEST.MF index 46fe6ebdae..ccdd464dff 100644 --- a/org.eclipse.m2e.pde.connector.tests/projects/tycho/pde.tycho.plugin.with.ds/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.pde.connector.tests/projects/tycho/pde.tycho.plugin.with.ds/META-INF/MANIFEST.MF @@ -5,4 +5,4 @@ Bundle-Version: 0.0.1.qualifier Service-Component: OSGI-INF/pde.tycho.plugin.with.ds.AComponent.xml Automatic-Module-Name: pde.tycho.plugin.with.ds Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.m2e.pde.connector.tests/projects/tycho/pde.tycho.plugin/META-INF/MANIFEST.MF b/org.eclipse.m2e.pde.connector.tests/projects/tycho/pde.tycho.plugin/META-INF/MANIFEST.MF index b5aa3a2937..d9354ef6d4 100644 --- a/org.eclipse.m2e.pde.connector.tests/projects/tycho/pde.tycho.plugin/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.pde.connector.tests/projects/tycho/pde.tycho.plugin/META-INF/MANIFEST.MF @@ -2,5 +2,5 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: pde.tycho.plugin Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: pde.tycho.plugin diff --git a/org.eclipse.m2e.pde.connector.tests/projects/tycho/pde.tycho.pomless.plugin/META-INF/MANIFEST.MF b/org.eclipse.m2e.pde.connector.tests/projects/tycho/pde.tycho.pomless.plugin/META-INF/MANIFEST.MF index 622fb739eb..2d278c48ee 100644 --- a/org.eclipse.m2e.pde.connector.tests/projects/tycho/pde.tycho.pomless.plugin/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.pde.connector.tests/projects/tycho/pde.tycho.pomless.plugin/META-INF/MANIFEST.MF @@ -2,5 +2,5 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: pde.tycho.pomless.plugin Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: pde.tycho.plugin diff --git a/org.eclipse.m2e.pde.connector.tests/projects/tycho/pom.xml b/org.eclipse.m2e.pde.connector.tests/projects/tycho/pom.xml index 44c19b785a..bcbddfb4d7 100644 --- a/org.eclipse.m2e.pde.connector.tests/projects/tycho/pom.xml +++ b/org.eclipse.m2e.pde.connector.tests/projects/tycho/pom.xml @@ -10,7 +10,7 @@ UTF-8 - 3.0.0 + 4.0.9 diff --git a/org.eclipse.m2e.pde.connector.tests/src/org/eclipse/m2e/pde/connector/tests/TychoConnectorTest.java b/org.eclipse.m2e.pde.connector.tests/src/org/eclipse/m2e/pde/connector/tests/TychoConnectorTest.java index 05108c727e..3d54a9647a 100644 --- a/org.eclipse.m2e.pde.connector.tests/src/org/eclipse/m2e/pde/connector/tests/TychoConnectorTest.java +++ b/org.eclipse.m2e.pde.connector.tests/src/org/eclipse/m2e/pde/connector/tests/TychoConnectorTest.java @@ -45,7 +45,9 @@ import org.eclipse.m2e.tests.common.WorkspaceHelpers; import org.eclipse.pde.core.plugin.IPluginModelBase; import org.eclipse.pde.core.plugin.PluginRegistry; -import org.eclipse.pde.internal.core.natures.PDE; +import org.eclipse.pde.core.project.IBundleProjectDescription; +import org.eclipse.pde.internal.core.natures.FeatureProject; +import org.eclipse.pde.internal.core.natures.PluginProject; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -53,13 +55,13 @@ @SuppressWarnings("restriction") public class TychoConnectorTest extends AbstractMavenProjectTestCase { - static final Set PLUGIN_NATURES = Set.of(PDE.PLUGIN_NATURE, JavaCore.NATURE_ID, IMavenConstants.NATURE_ID); - static final Set PLUGIN_BUILDERS = Set.of(PDE.MANIFEST_BUILDER_ID, PDE.SCHEMA_BUILDER_ID, + static final Set PLUGIN_NATURES = Set.of(IBundleProjectDescription.PLUGIN_NATURE, JavaCore.NATURE_ID, IMavenConstants.NATURE_ID); + static final Set PLUGIN_BUILDERS = Set.of(PluginProject.MANIFEST_BUILDER_ID, PluginProject.SCHEMA_BUILDER_ID, JavaCore.BUILDER_ID, IMavenConstants.BUILDER_ID); - static final Set PLUGIN_WITH_DS_BUILDERS = Set.of(PDE.MANIFEST_BUILDER_ID, PDE.SCHEMA_BUILDER_ID, + static final Set PLUGIN_WITH_DS_BUILDERS = Set.of(PluginProject.MANIFEST_BUILDER_ID, PluginProject.SCHEMA_BUILDER_ID, "org.eclipse.pde.ds.core.builder", JavaCore.BUILDER_ID, IMavenConstants.BUILDER_ID); - static final Set FEATURE_NATURES = Set.of(PDE.FEATURE_NATURE, IMavenConstants.NATURE_ID); - static final Set FEATURE_BUILDERS = Set.of(PDE.FEATURE_BUILDER_ID, IMavenConstants.BUILDER_ID); + static final Set FEATURE_NATURES = Set.of(FeatureProject.NATURE, IMavenConstants.NATURE_ID); + static final Set FEATURE_BUILDERS = Set.of(FeatureProject.BUILDER_ID, IMavenConstants.BUILDER_ID); // FIXME: requires the osgi.compatibility fragment. diff --git a/org.eclipse.m2e.pde.connector/.classpath b/org.eclipse.m2e.pde.connector/.classpath index 3628e33687..35386b94bb 100644 --- a/org.eclipse.m2e.pde.connector/.classpath +++ b/org.eclipse.m2e.pde.connector/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.pde.connector/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.pde.connector/.settings/org.eclipse.jdt.core.prefs index d4540a53f9..3a79233b13 100644 --- a/org.eclipse.m2e.pde.connector/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.pde.connector/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.eclipse.m2e.pde.connector/META-INF/MANIFEST.MF b/org.eclipse.m2e.pde.connector/META-INF/MANIFEST.MF index a9ffc04c1f..09e44d9862 100644 --- a/org.eclipse.m2e.pde.connector/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.pde.connector/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: M2E PDE Connector Bundle-SymbolicName: org.eclipse.m2e.pde.connector;singleton:=true -Bundle-Version: 2.1.601.qualifier +Bundle-Version: 2.2.0.qualifier Automatic-Module-Name: org.eclipse.m2e.pde.connector -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: Eclipse.org - m2e Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)", org.eclipse.core.resources;bundle-version="3.16.0", org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)", - org.eclipse.pde.core, + org.eclipse.pde.core;bundle-version="3.19.0", org.eclipse.jdt.core, org.eclipse.pde.ds.annotations Service-Component: OSGI-INF/org.eclipse.m2e.pde.connector.PDEBuildProjectFileResolver.xml diff --git a/org.eclipse.m2e.pde.connector/src/org/eclipse/m2e/pde/connector/PDEProjectHelper.java b/org.eclipse.m2e.pde.connector/src/org/eclipse/m2e/pde/connector/PDEProjectHelper.java index c802757b76..fab51920cb 100644 --- a/org.eclipse.m2e.pde.connector/src/org/eclipse/m2e/pde/connector/PDEProjectHelper.java +++ b/org.eclipse.m2e.pde.connector/src/org/eclipse/m2e/pde/connector/PDEProjectHelper.java @@ -45,12 +45,12 @@ import org.eclipse.pde.core.build.IBuildModel; import org.eclipse.pde.core.plugin.IPluginModelBase; import org.eclipse.pde.core.plugin.PluginRegistry; -import org.eclipse.pde.internal.core.natures.PDE; +import org.eclipse.pde.core.project.IBundleProjectDescription; public class PDEProjectHelper { - @SuppressWarnings("restriction") - private static final String PDE_PLUGIN_NATURE = org.eclipse.pde.internal.core.natures.PDE.PLUGIN_NATURE; + private static final String PDE_PLUGIN_NATURE = IBundleProjectDescription.PLUGIN_NATURE; + private static final String PDE_FEATURE_NATURE = "org.eclipse.pde.FeatureNature"; private static AtomicBoolean isListeningForPluginModelChanges = new AtomicBoolean(false); @@ -115,8 +115,8 @@ static void configurePDEFeatureProject(IMavenProjectFacade projectFacade, IProgr if (project != null) { // see // org.eclipse.pde.internal.ui.wizards.feature.AbstractCreateFeatureOperation - if (!project.hasNature(PDE.FEATURE_NATURE)) { - AbstractProjectConfigurator.addNature(project, PDE.FEATURE_NATURE, monitor); + if (!project.hasNature(PDE_FEATURE_NATURE)) { + AbstractProjectConfigurator.addNature(project, PDE_FEATURE_NATURE, monitor); } } } diff --git a/org.eclipse.m2e.pde.feature/feature.xml b/org.eclipse.m2e.pde.feature/feature.xml index c355072fdd..886e57043b 100644 --- a/org.eclipse.m2e.pde.feature/feature.xml +++ b/org.eclipse.m2e.pde.feature/feature.xml @@ -2,7 +2,7 @@ - + diff --git a/org.eclipse.m2e.pde.target/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.pde.target/.settings/org.eclipse.jdt.core.prefs index 41ecaee8f2..5ddee747a8 100644 --- a/org.eclipse.m2e.pde.target/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.pde.target/.settings/org.eclipse.jdt.core.prefs @@ -10,8 +10,8 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.APILeak=warning org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning @@ -110,4 +110,4 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF b/org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF index 602ac21f2b..96f8d01c91 100644 --- a/org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: M2E PDE Integration Bundle-SymbolicName: org.eclipse.m2e.pde.target;singleton:=true -Bundle-Version: 2.0.501.qualifier +Bundle-Version: 2.1.0.qualifier Automatic-Module-Name: org.eclipse.m2e.pde.target -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)", org.eclipse.pde.core;bundle-version="3.14.0", org.eclipse.equinox.frameworkadmin;bundle-version="2.1.400", org.eclipse.m2e.maven.runtime;bundle-version="[3.8.0,4.0.0)", org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", org.eclipse.core.resources -Export-Package: org.eclipse.m2e.pde.target;x-friends:="org.eclipse.m2e.pde.ui", +Export-Package: org.eclipse.m2e.pde.target;x-friends:="org.eclipse.m2e.pde.ui,org.eclipse.m2e.swtbot.tests", org.eclipse.m2e.pde.target.shared;x-internal:=true Bundle-ActivationPolicy: lazy Import-Package: aQute.bnd.osgi;version="[5.5.0,8.0.0)", diff --git a/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetLocationFactory.java b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetLocationFactory.java index d56e52b331..41a1f55463 100644 --- a/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetLocationFactory.java +++ b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetLocationFactory.java @@ -30,7 +30,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Status; -import org.eclipse.pde.core.target.ITargetLocation; import org.eclipse.pde.core.target.ITargetLocationFactory; import org.eclipse.pde.internal.core.ifeature.IFeature; import org.w3c.dom.Document; @@ -44,7 +43,7 @@ public class MavenTargetLocationFactory implements ITargetLocationFactory { private static final String ATTRIBUTE_DEPENDENCY_SCOPE = "includeDependencyScope"; @Override - public ITargetLocation getTargetLocation(String type, String serializedXML) throws CoreException { + public MavenTargetLocation getTargetLocation(String type, String serializedXML) throws CoreException { try { Element location = parseXMLDocument(serializedXML).getDocumentElement(); diff --git a/org.eclipse.m2e.pde.ui/.classpath b/org.eclipse.m2e.pde.ui/.classpath index 3628e33687..35386b94bb 100644 --- a/org.eclipse.m2e.pde.ui/.classpath +++ b/org.eclipse.m2e.pde.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.pde.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.pde.ui/.settings/org.eclipse.jdt.core.prefs index d4540a53f9..3a79233b13 100644 --- a/org.eclipse.m2e.pde.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.pde.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF index f20dc023f9..bb09df6d00 100644 --- a/org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF @@ -2,9 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: M2E PDE Integration UI Bundle-SymbolicName: org.eclipse.m2e.pde.ui;singleton:=true -Bundle-Version: 2.0.402.qualifier +Bundle-Version: 2.1.0.qualifier +Export-Package: org.eclipse.m2e.pde.ui.target.editor;x-friends:="org.eclipse.m2e.swtbot.tests" Automatic-Module-Name: org.eclipse.m2e.pde.ui -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.19.0", org.eclipse.jface, org.eclipse.pde.ui;bundle-version="3.12.0", diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/provider/DependencyNodeLabelProvider.java b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/provider/DependencyNodeLabelProvider.java index 6ca4b9dd93..9941dc5f31 100644 --- a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/provider/DependencyNodeLabelProvider.java +++ b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/provider/DependencyNodeLabelProvider.java @@ -79,24 +79,24 @@ public Image getImage(Object element) { MavenTargetLocation location = getTargetLocation(node); if (location != null) { if (location.isExcluded(node.getArtifact())) { - return resourceManager.createImage(disabledDescriptor); + return resourceManager.create(disabledDescriptor); } else if (location.isIgnored(node.getArtifact())) { - return resourceManager.createImage(jarDescriptor); + return resourceManager.create(jarDescriptor); } else if (location.isFailed(node.getArtifact())) { - return resourceManager.createImage(errorDescriptor); + return resourceManager.create(errorDescriptor); } MavenTargetBundle targetBundle = location.getMavenTargetBundle(node.getArtifact()); if (targetBundle != null && targetBundle.isWrapped()) { BNDInstructions instructions = location.getInstructions(node.getArtifact()); if (instructions.isEmpty()) { - return resourceManager.createImage(inheritedJarDefaultDescriptor); + return resourceManager.create(inheritedJarDefaultDescriptor); } else { - return resourceManager.createImage(inheritedJarDescriptor); + return resourceManager.create(inheritedJarDescriptor); } } } - return resourceManager.createImage(inheritedDescriptor); + return resourceManager.create(inheritedDescriptor); } return null; } diff --git a/org.eclipse.m2e.profiles.core.tests/.classpath b/org.eclipse.m2e.profiles.core.tests/.classpath index 427e49b0d4..c9bfedfe9c 100644 --- a/org.eclipse.m2e.profiles.core.tests/.classpath +++ b/org.eclipse.m2e.profiles.core.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.profiles.core.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.profiles.core.tests/.settings/org.eclipse.jdt.core.prefs index d4540a53f9..3a79233b13 100644 --- a/org.eclipse.m2e.profiles.core.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.profiles.core.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.eclipse.m2e.profiles.core.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.profiles.core.tests/META-INF/MANIFEST.MF index deae4bfc36..17357177e5 100644 --- a/org.eclipse.m2e.profiles.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.profiles.core.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: M2E Maven Integration for Eclipse Profiles Core Tests Bundle-SymbolicName: org.eclipse.m2e.profiles.core.tests Bundle-Version: 2.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: Eclipse.org - m2e Require-Bundle: org.eclipse.m2e.tests.common, org.junit, diff --git a/org.eclipse.m2e.profiles.core/.classpath b/org.eclipse.m2e.profiles.core/.classpath index 3628e33687..35386b94bb 100644 --- a/org.eclipse.m2e.profiles.core/.classpath +++ b/org.eclipse.m2e.profiles.core/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.profiles.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.profiles.core/.settings/org.eclipse.jdt.core.prefs index ffbf9b784f..d485022b41 100644 --- a/org.eclipse.m2e.profiles.core/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.profiles.core/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -108,7 +108,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.profiles.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.profiles.core/META-INF/MANIFEST.MF index 3b4e3ce702..c1844ab8d8 100644 --- a/org.eclipse.m2e.profiles.core/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.profiles.core/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: M2E Maven Profiles Management Bundle-SymbolicName: org.eclipse.m2e.profiles.core;singleton:=true -Bundle-Version: 2.1.202.qualifier +Bundle-Version: 2.2.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.core.resources;bundle-version="3.6.0", org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: Eclipse.org - m2e Export-Package: org.eclipse.m2e.profiles.core.internal;x-friends:="org.eclipse.m2e.profiles.ui", org.eclipse.m2e.profiles.core.internal.management;x-internal:=true diff --git a/org.eclipse.m2e.profiles.ui/.classpath b/org.eclipse.m2e.profiles.ui/.classpath index 3628e33687..35386b94bb 100644 --- a/org.eclipse.m2e.profiles.ui/.classpath +++ b/org.eclipse.m2e.profiles.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.profiles.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.profiles.ui/.settings/org.eclipse.jdt.core.prefs index ffbf9b784f..d485022b41 100644 --- a/org.eclipse.m2e.profiles.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.profiles.ui/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -108,7 +108,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.profiles.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.profiles.ui/META-INF/MANIFEST.MF index 77d62a9fd9..5ff539a335 100644 --- a/org.eclipse.m2e.profiles.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.profiles.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.m2e.profiles.ui;singleton:=true -Bundle-Version: 2.0.302.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.e4.core.contexts;bundle-version="1.9.100", org.eclipse.e4.core.di;bundle-version="1.8.100" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.m2e.profiles.ui.internal;x-internal:=true, org.eclipse.m2e.profiles.ui.internal.actions;x-internal:=true, diff --git a/org.eclipse.m2e.rcptt.tests/.project b/org.eclipse.m2e.rcptt.tests/.project deleted file mode 100644 index be8e53a35c..0000000000 --- a/org.eclipse.m2e.rcptt.tests/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - org.eclipse.m2e.rcptt.tests - - - - - - org.eclipse.rcptt.core.builder.q7Builder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.rcptt.core.rcpttnature - - diff --git a/org.eclipse.m2e.rcptt.tests/pom.xml b/org.eclipse.m2e.rcptt.tests/pom.xml deleted file mode 100644 index 8f877c8dc9..0000000000 --- a/org.eclipse.m2e.rcptt.tests/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - 4.0.0 - - - org.eclipse.m2e - m2e-core - 2.1.0-SNAPSHOT - - - org.eclipse.m2e.rcptt.tests - rcpttTest - M2E - RCPTT Integration tests - - - - rcptt - Eclipse RCPTT repository - https://repo.eclipse.org/content/repositories/rcptt-releases/ - - - - - - - org.eclipse.rcptt - rcptt-maven-plugin - 2.5.5-M3 - true - - - ../products/m2e-ide/target/products/m2e-ide-[platform].tar.gz - - - - 1800 - - 300 - - - - - - diff --git a/org.eclipse.m2e.rcptt.tests/rcptt.properties b/org.eclipse.m2e.rcptt.tests/rcptt.properties deleted file mode 100644 index 2411fe50ba..0000000000 --- a/org.eclipse.m2e.rcptt.tests/rcptt.properties +++ /dev/null @@ -1,9 +0,0 @@ ---- RCPTT testcase --- -Format-Version: 1.0 -Element-Name: Project Settings -Element-Type: projectMetadata -Element-Version: 2.0 -Id: _A_5OgIe9Ee2DibE_7T1Sqw -Runtime-Version: 2.5.4.202210020716 -Save-Time: 12/29/22, 10:09 PM - diff --git a/org.eclipse.m2e.rcptt.tests/src/Tests/org.eclipse.m2e.pde.ui/DependencyEditorTest.test b/org.eclipse.m2e.rcptt.tests/src/Tests/org.eclipse.m2e.pde.ui/DependencyEditorTest.test deleted file mode 100644 index cc820b2a1e..0000000000 --- a/org.eclipse.m2e.rcptt.tests/src/Tests/org.eclipse.m2e.pde.ui/DependencyEditorTest.test +++ /dev/null @@ -1,296 +0,0 @@ ---- RCPTT testcase --- -Format-Version: 1.0 -Contexts: _mo5J8IfaEe2N1bfX2b9TRQ -Element-Name: DependencyEditorTest -Element-Type: testcase -Element-Version: 3.0 -External-Reference: -Id: _WA75MIfaEe2N1bfX2b9TRQ -Runtime-Version: 2.5.4.202210020716 -Save-Time: 2/3/23, 7:35 PM -Tags: org.eclipse.m2e.pde.ui -Testcase-Type: ecl -Verifications: _7el9kIfGEe2DibE_7T1Sqw - -------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac -Content-Type: text/ecl -Entry-Name: .content - -with [get-view "Project Explorer" | get-tree] { - select "target-platform" | double-click - select "target-platform/target-platform.target" | double-click -} - -with [get-editor "target-platform.target" | get-section Locations | get-tree] { - get-item -path "Maven Central.*" | click - select "Maven Central.*" | double-click -} - -with [get-window "Maven Artifact Target Entry - Maven Central"] { - // Check the initial button enablement. All buttons except Undo/Redo should be enabled. - get-button Add | get-property enablement | equals true | verify-true - get-button Remove | get-property enablement | equals true | verify-true - get-button Update | get-property enablement | equals true | verify-true - get-button Undo | get-property enablement | equals false | verify-true - get-button Redo | get-property enablement | equals false | verify-true - - // #################################################################### // - // // - // [I] Check behavior of the Add button with and without the clipboard // - // // - // #################################################################### // - - to-clipboard -input "" - - // Click add -> Create blank dependency - get-button Add | click -metaKeys "" - - // Invalid GAV -> Update & Finish button should be disabled - get-button Update | get-property enablement | equals false | verify-true - get-button Finish | get-property enablement | equals false | verify-true - - // Check error messages - get-editbox -after [get-label "Edit Maven Dependency"] | get-property text - | equals "The target location contains one or more incomplete Maven dependencies.\n" - + " Each dependency requires a group id, artifact id, version and type." | verify-true - - get-label "" -after [get-label "Edit Maven Dependency"] - | get-property "image.path" | equals "org.eclipse.jface/icons/full/message_error.png" | verify-true - - with [get-table | get-item -path ""] { - get-property "columns[0]" | equals "" | verify-true - get-property "columns[1]" | equals "" | verify-true - get-property "columns[2]" | equals "" | verify-true - } - - // Fill the row with meaningful data... - with [get-window "Maven Artifact Target Entry - Maven Central" | get-table] { - get-property "getItems().TableItem[19].getData().getClassifier()" | equals "" | verify-true - get-property "getItems().TableItem[19].getData().getType()" | equals jar | verify-true - get-property "getItems().TableItem[19].getData().getVersion()" | equals "" | verify-true - get-property "getItems().TableItem[19].getData().getGroupId()" | equals "" | verify-true - get-property "getItems().TableItem[19].getData().getArtifactId()" | equals "" | verify-true - // Check selection - get-property "getSelectionCount()" | equals 1 | verify-true - get-property "getSelection().TableItem[0].getData().getKey()" | equals "::jar:" | verify-true - // Set GAV to org.apache.commons:commons-lang3:3.12.0 - select "" | activate-cell-edit -type MouseClickSelection - get-editbox | set-text "org.apache.commons" - select "" | apply-cell-edit -deactivate - select "org.apache.commons" | activate-cell-edit -column 1 -type MouseClickSelection - get-editbox | set-text "commons-lang3" - select "org.apache.commons" | apply-cell-edit -deactivate - select "org.apache.commons" | activate-cell-edit -column 2 -type MouseClickSelection - get-editbox | set-text "3.12.0" - apply-cell-edit -deactivate - select "org.apache.commons" | activate-cell-edit -column 3 -type MouseClickSelection - } - - //Valid GAV -> Update & Finish button should now be enabled again - get-button Update | get-property enablement | equals true | verify-true - get-button Finish | get-property enablement | equals true | verify-true - - to-clipboard -input "\ - org.eclipse.platform\ - org.eclipse.core.runtime\ - 3.26.100\ - " - - // Click add -> Copy dependency from clipboard - get-button Add | click -metaKeys "" - - with [get-window "Maven Artifact Target Entry - Maven Central" | get-table] { - get-property "getItems().TableItem[20].getData().getClassifier()" | equals "" | verify-true - get-property "getItems().TableItem[20].getData().getType()" | equals jar | verify-true - get-property "getItems().TableItem[20].getData().getVersion()" | equals "3.26.100" | verify-true - get-property "getItems().TableItem[20].getData().getGroupId()" | equals "org.eclipse.platform" | verify-true - get-property "getItems().TableItem[20].getData().getArtifactId()" | equals "org.eclipse.core.runtime" - | verify-true - // Check selection - get-property "getSelectionCount()" | equals 1 | verify-true - get-property "getSelection().TableItem[0].getData().getKey()" - | equals "org.eclipse.platform:org.eclipse.core.runtime:jar:3.26.100" | verify-true - } - - // Check whether you can edit the remaining columns directly. I.e. whether SWT.FULL_SELECTION is enabled. - with [get-table] { - select "org.eclipse.jdt" | activate-cell-edit -type MouseClickSelection - get-editbox | set-text newGroupId - select "org.apache.commons" | apply-cell-edit -deactivate - select newGroupId | activate-cell-edit -column 1 -type MouseClickSelection - get-editbox | set-text newArtifactId - select "jakarta.xml.bind" | apply-cell-edit -deactivate - select "jakarta.xml.bind" | activate-cell-edit -column 2 -type MouseClickSelection - get-editbox | set-text newVersion - apply-cell-edit -deactivate - } - - // ############################################################################# // - // // - // [II] Check behavior of the Update button with one more more selected elements // - // // - // ############################################################################# // - - // Select org.jetbrains.kotlin:kotlin-stdlib-common -> Click Update - with [get-table] { - select "org.jetbrains.kotlin" | activate-cell-edit -type MouseClickSelection - get-editbox | click-text 1 21 - cancel-cell-edit - deactivate-cell-edit - } - - get-button Update | click -metaKeys "" - - with [get-table] { - get-property "getItems().TableItem[12].getData().getVersion()" | equals "1.7.22" | verify-false - } - - // Select org.jetbrains.kotlin:kotlin-stdlib-jdk7 to org.jetbrains.kotlin:kotlin-stdlib -> Click Update - with [get-table] { - select [get-item -path "org.jetbrains.kotlin" -index 1] | activate-cell-edit -type MouseClickSelection - get-editbox | click-text 1 21 - cancel-cell-edit - deactivate-cell-edit - select [get-item -path "org.jetbrains.kotlin" -index 3] [get-item -path "org.jetbrains.kotlin" - -index 2] [get-item -path "org.jetbrains.kotlin" -index 1] - } - - get-button Update | click -metaKeys "" - - with [get-table] { - get-property "getItems().TableItem[13].getData().getVersion()" | equals "1.7.22" | verify-false - get-property "getItems().TableItem[14].getData().getVersion()" | equals "1.7.22" | verify-false - get-property "getItems().TableItem[15].getData().getVersion()" | equals "1.7.22" | verify-false - } - - // ########################################################################## // - // // - // [III] Check behavior of the Remove button on one or more selected elements // - // // - // ########################################################################## // - - // Selected and remove com.fasterxml.jackson.core:jackson-annotations to com.fasterxml.jackson.core:jackson-databind - with [get-table] { - select "com.fasterxml.jackson.core" | activate-cell-edit -type MouseClickSelection - get-editbox | click-text 1 27 - cancel-cell-edit - deactivate-cell-edit - select [get-item -path "com.fasterxml.jackson.core" -index 2] [get-item -path "com.fasterxml.jackson.core" - -index 1] "com.fasterxml.jackson.core" - } - - get-button Remove | click -metaKeys "" - - // The selected elements should no longer be in the table, with com.github.ben-manes.caffeine:caffeine being the first element - with [get-table] { - get-property "getSelection().length" | equals 0 - get-property "getItemCount()" | equals 18 | verify-true - get-property "getItems().TableItem[0].getText()" | equals "com.github.ben-manes.caffeine" | verify-true - } - - get-button Undo | click -metaKeys "" - - // The artifacts com.fasterxml.jackson.core:jackson-annotations to com.fasterxml.jackson.core:jackson-databind are back and selected - with [get-table] { - get-property "getItemCount()" | equals 21 | verify-true - get-property "getSelection().length" | equals 3 | verify-true - get-property "getSelection().TableItem[0].getData().getKey()" - | equals "com.fasterxml.jackson.core:jackson-annotations:jar:2.14.1" | verify-true - get-property "getSelection().TableItem[1].getData().getKey()" - | equals "com.fasterxml.jackson.core:jackson-core:jar:2.14.1" | verify-true - get-property "getSelection().TableItem[2].getData().getKey()" - | equals "com.fasterxml.jackson.core:jackson-databind:jar:2.14.1" | verify-true - } - - // Select and remove com.squareup.okio:okio-jvm - with [get-table] { - select "com.squareup.okio" | activate-cell-edit -type MouseClickSelection - get-editbox | click-text 1 18 - cancel-cell-edit - deactivate-cell-edit - } - - get-button Remove | click -metaKeys "" - - // The artifact jakarta.activation:jakarta.activation-api should now be selected, because it now at the same position as the removed element - with [get-table] { - get-property "getSelection().length" | equals 1 | verify-true - get-property "getSelection().TableItem[0].getData().getKey()" - | equals "jakarta.activation:jakarta.activation-api:jar:1.2.2" | verify-true - } - - // ############################################ // - // // - // [IV] Check behavior when sorting by columns // - // // - // ############################################ // - - with [get-table] { - // Sort by Version -> jakarta.inject:jakarta.inject-api should be first element - get-column-header Version | click - get-property "getItems().TableItem[0].getData().getKey()" | equals "jakarta.inject:jakarta.inject-api:jar:1.0.5" - | verify-true - // Sort by Artifact Id -> com.github.ben-manes.caffeine:caffeine should be the first element - get-column-header "Artifact Id" | click - get-property "getItems().TableItem[0].getData().getKey()" - | equals "com.github.ben-manes.caffeine:caffeine:jar:3.1.2" | verify-true - // Sort by Group Id -> com.fasterxml.jackson.core:jackson-annotations should be the first element - get-column-header "Group Id" | click - get-property "getItems().TableItem[0].getData().getKey()" - | equals "com.fasterxml.jackson.core:jackson-annotations:jar:2.14.1" | verify-true - } - - // Check whether dependencies are inserted into the correct position when the table is sorted - to-clipboard -input "\ - com.fasterxml.jackson.core\ - jackson-databind\ - 2.14.0\ - " - - get-button Add | click -metaKeys "" - - with [get-table] { - get-property enablement | equals true | verify-true - get-property "getItems().TableItem[2].getData().getKey()" - | equals "com.fasterxml.jackson.core:jackson-databind:jar:2.14.0" | verify-true - } - - // ################################## // - // // - // [V] Check multi-selection behavior // - // // - // ################################## // - - // Make sure items don't get lost when selecting more than one element - with [get-table] { - // Forward selection - select "com.fasterxml.jackson.core" | activate-cell-edit -type MouseClickSelection - get-editbox | click-text 1 27 - cancel-cell-edit - deactivate-cell-edit - select "com.github.ben-manes.caffeine" [get-item -path "com.fasterxml.jackson.core" -index 3] [get-item - -path "com.fasterxml.jackson.core" -index 2] [get-item -path "com.fasterxml.jackson.core" - -index 1] "com.fasterxml.jackson.core" - - get-property "selection[0].path[0]" | equals "com.fasterxml.jackson.core" | verify-true - get-property "selection[1].path[0]" | equals "com.fasterxml.jackson.core%1%" | verify-true - get-property "selection[2].path[0]" | equals "com.fasterxml.jackson.core%2%" | verify-true - get-property "selection[3].path[0]" | equals "com.fasterxml.jackson.core%3%" | verify-true - get-property "selection[4].path[0]" | equals "com.github.ben-manes.caffeine" | verify-true - - // Backward selection - select [get-item -path "org.slf4j" -index 2] | activate-cell-edit -type MouseClickSelection - get-editbox | click-text 1 10 - cancel-cell-edit - deactivate-cell-edit - select [get-item -path "org.slf4j" -index 2] [get-item -path "org.slf4j" -index 1] "org.slf4j" [get-item - -path "org.jetbrains.kotlin" -index 3] [get-item -path "org.jetbrains.kotlin" -index 2] - - get-property "selection[0].path[0]" | equals "org.jetbrains.kotlin%2%" | verify-true - get-property "selection[1].path[0]" | equals "org.jetbrains.kotlin%3%" | verify-true - get-property "selection[2].path[0]" | equals "org.slf4j" | verify-true - get-property "selection[3].path[0]" | equals "org.slf4j%1%" | verify-true - get-property "selection[4].path[0]" | equals "org.slf4j%2%" | verify-true - } -} -------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac-- diff --git a/org.eclipse.m2e.rcptt.tests/src/Tests/org.eclipse.m2e.pde.ui/_Context/WorkspaceWithTargetPlatform.ctx b/org.eclipse.m2e.rcptt.tests/src/Tests/org.eclipse.m2e.pde.ui/_Context/WorkspaceWithTargetPlatform.ctx deleted file mode 100644 index bf7434a66a..0000000000 --- a/org.eclipse.m2e.rcptt.tests/src/Tests/org.eclipse.m2e.pde.ui/_Context/WorkspaceWithTargetPlatform.ctx +++ /dev/null @@ -1,60 +0,0 @@ ---- RCPTT testcase --- -Format-Version: 1.0 -Context-Type: org.eclipse.rcptt.ctx.workspace -Element-Name: WorkspaceWithTargetPlatform -Element-Type: context -Element-Version: 2.0 -Id: _mo5J8IfaEe2N1bfX2b9TRQ -Runtime-Version: 2.5.4.202210020716 -Save-Time: 12/30/22, 1:40 AM - -------=_contents/target-platform/target-platform.target-39adf134-5244-371e-a7da-2823002f1d57 -Content-Type: q7/binary -Entry-Name: contents/target-platform/target-platform.target - -UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAADdl8+OmzAQxs+bp0Dc -cUjYNjlAcmhVqYc9bfsAE3sgJsamtkmbt6+B/NnNSjXSiijdnGD4Bn+/kT1k0vWfSgR71IYrmYUzEocB -SqoYl0UW/vzxLVqGgbEgGQglMQulCterSbquGV7SErLsohZ0gTaQUDllfxPVAmyudBWuJoH7pUJRsC7L -rCYPrwIBl1Q0DL9ijZI5Ewd3ZbftkhLDt0+fqarRZCFVVc3FRfGsGk3b9XXjggI2KLLwCfYogy8orQYR -BhU3xhE+geQ5GpuFBUrUYF2CPdR41DvLD71HdlqVY+v7OnroYn2w0Kqpv7OVs0VyMBa1qzApge6MkoQq -jen0pLlkgbY8B2pd8CiNQEpl+1Kl0xfPL0nH+q/mZPZIZun0dH9RtDDuhTqddldn59Mr6zfA6aX/PwcD -Cxsu2Z2wFNxumw3ZoIwqkGgIhTxHLn04F9k/MRIyI/PxKcyvBjQ2NVG7rbV14jHfqzzWXfljEt/UO1de -41xF5b7yVn0+tvMSds4CEGeB77su493/1wkR1NwD4jbP2Nvn7OvcLoeCnBMGgSTk021AuCyR2oEQvXgQ -QHwrgN+GaDPQf6cdYN+1U/L5Nvbb70Lf4AcRnOSDIBKSjAuhdEGQCl4bJCXz7aIr9asz5CGZk0U8cotq -3ZVoNxq4NGSnrOC+s92LImOZ4Bv3l6OqvCgzsiDzkXvUu0lKtlt8EI7lB+C4EwQj8sfS16aoiJQzEh3F -nmMdj91lh/ruNIN66p1ZNryqhX/SeZ/rq1g/lfbB0zh9HLenL+Zt99JuJl/9BVBLBwjVgN3qVwIAAPYP -AABQSwECFAAUAAgICAAAACEA1YDd6lcCAAD2DwAACAAJAAAAAAAAAAAAAAAAAAAALmNvbnRlbnRVVAUA -AQAAAABQSwUGAAAAAAEAAQA/AAAAlgIAAAAA -------=_contents/target-platform/target-platform.target-39adf134-5244-371e-a7da-2823002f1d57-- -------=_contents/target-platform/.project-faabef30-8b6b-367d-9526-544b3980ac44 -Content-Type: q7/binary -Entry-Name: contents/target-platform/.project - -UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAABVjsEOwiAQRM/2Kxru -Fb15oPRi+gPqByBdGwwsZNkaP1+s2tjbm5mdzajuGXz9AMouYiv2252oAW0cHI6tuJz75iA6XalE8Q6W -j5AtucTlWFcbhSaAZkMjcJO84VukoOTsltTGEABZK/mjYn4f5TfLf3GdnB9OCeycrBQangg+lYWX9mrT -C1BLBwhlg0YFhgAAANAAAABQSwECFAAUAAgICAAAACEAZYNGBYYAAADQAAAACAAJAAAAAAAAAAAAAAAA -AAAALmNvbnRlbnRVVAUAAQAAAABQSwUGAAAAAAEAAQA/AAAAxQAAAAAA -------=_contents/target-platform/.project-faabef30-8b6b-367d-9526-544b3980ac44-- -------=_contents/target-platform/.settings/org.eclipse.core.resources.prefs-423fdf98-40c5-315c-9909-2031eed35758 -Content-Type: q7/binary -Entry-Name: contents/target-platform/.settings/org.eclipse.core.resources.prefs - -UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAABLTc7JLChO1SsoSk1L -LUrNS04t1itLLSrOzM+zNeQC8vNTMvPS9W0KivKzUpNL7GxDQ9x0LbgAUEsHCA3o3k03AAAANwAAAFBL -AQIUABQACAgIAAAAIQAN6N5NNwAAADcAAAAIAAkAAAAAAAAAAAAAAAAAAAAuY29udGVudFVUBQABAAAA -AFBLBQYAAAAAAQABAD8AAAB2AAAAAAA= -------=_contents/target-platform/.settings/org.eclipse.core.resources.prefs-423fdf98-40c5-315c-9909-2031eed35758-- -------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf -Content-Type: q7/binary -Entry-Name: .q7.content - -UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAACVkV1rgzAUhu/7K0Lu -m6zCoBO1F2MXHWxso9DeDRtPbDZNJDmd/vxFa0RKYewuH895Tt6TZNPVFfkB65TRKV2xO0pAC1MoXab0 -jHK5pptskRhbMhCVahwwKxpEJrBjrbHfrskFxPuwejQaoUPS1SqetFGv9Y20i/15Sk+ITcx527bM1CXz -cn542Qbkj15TeWD68oHjnuMTR4nOa09PT9srPO1yWwK+VTlKY2tKVJHSz9rcP6+3Mn+C6HV1lIfo+LD7 -eKfZgpBE9Hk09mu/a6z5AoFuVONgWzZBd6E8J1UFAWJjEeU3r68c7LKfw6Yq/CCDzQGi/xw3Nbvyzacn -jPUjBGfOVoDzDwHpZmY+qsdwPKQbgvMpecL/+/vZ4hdQSwcIDa6p8x0BAABYAgAAUEsBAhQAFAAICAgA -AAAhAA2uqfMdAQAAWAIAAAgACQAAAAAAAAAAAAAAAAAAAC5jb250ZW50VVQFAAEAAAAAUEsFBgAAAAAB -AAEAPwAAAFwBAAAAAA== -------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf-- diff --git a/org.eclipse.m2e.rcptt.tests/src/Verification/Empty Log Verification.verification b/org.eclipse.m2e.rcptt.tests/src/Verification/Empty Log Verification.verification deleted file mode 100644 index 56be463402..0000000000 --- a/org.eclipse.m2e.rcptt.tests/src/Verification/Empty Log Verification.verification +++ /dev/null @@ -1,25 +0,0 @@ ---- RCPTT verification --- -Format-Version: 1.0 -Element-Name: Empty Log Verification -Element-Type: verification -Element-Version: 2.0 -Id: _7el9kIfGEe2DibE_7T1Sqw -Runtime-Version: 2.5.4.202210020716 -Save-Time: 12/29/22, 11:33 PM -Verification-Type: org.eclipse.rcptt.verifications.log - -------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa -Content-Type: text/plain -Entry-Name: .description - -Validates that no error has been thrown during the test execution. -------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa-- -------=_.errorlog.verification-3ceb5b18-8b7c-3939-9191-416e6e78eb57 -Content-Type: text/errorlog-verification -Entry-Name: .errorlog.verification - -INCLUDE CONTEXTS: true -DENIED: -4 0 .* Message:.* - -------=_.errorlog.verification-3ceb5b18-8b7c-3939-9191-416e6e78eb57-- diff --git a/org.eclipse.m2e.refactoring/.classpath b/org.eclipse.m2e.refactoring/.classpath index 3628e33687..35386b94bb 100644 --- a/org.eclipse.m2e.refactoring/.classpath +++ b/org.eclipse.m2e.refactoring/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.refactoring/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.refactoring/.settings/org.eclipse.jdt.core.prefs index ef651b4aae..6e580e3f0c 100644 --- a/org.eclipse.m2e.refactoring/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.refactoring/.settings/org.eclipse.jdt.core.prefs @@ -28,9 +28,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -144,7 +144,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF b/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF index 5dd1faeaeb..e994f4c654 100644 --- a/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-SymbolicName: org.eclipse.m2e.refactoring;singleton:=true -Bundle-Version: 2.0.303.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Activator: org.eclipse.m2e.refactoring.internal.Activator Require-Bundle: org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)", @@ -22,6 +22,6 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", org.eclipse.ltk.ui.refactoring;visibility:=reexport, org.eclipse.m2e.core.ui;bundle-version="[2.0.0,3.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.eclipse.m2e.refactoring.exclude;x-internal:=true Automatic-Module-Name: org.eclipse.m2e.refactoring diff --git a/org.eclipse.m2e.repository/pom.xml b/org.eclipse.m2e.repository/pom.xml index 0bef926730..60836504e4 100644 --- a/org.eclipse.m2e.repository/pom.xml +++ b/org.eclipse.m2e.repository/pom.xml @@ -86,7 +86,9 @@ sign-p2-artifacts + bc true + 011C526F29B2CE79 diff --git a/org.eclipse.m2e.scm/.classpath b/org.eclipse.m2e.scm/.classpath index 3628e33687..35386b94bb 100644 --- a/org.eclipse.m2e.scm/.classpath +++ b/org.eclipse.m2e.scm/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.scm/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.scm/.settings/org.eclipse.jdt.core.prefs index ffbf9b784f..d485022b41 100644 --- a/org.eclipse.m2e.scm/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.scm/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -108,7 +108,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.scm/META-INF/MANIFEST.MF b/org.eclipse.m2e.scm/META-INF/MANIFEST.MF index b919a8fa6f..88f89ce79c 100644 --- a/org.eclipse.m2e.scm/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.scm/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.scm;singleton:=true -Bundle-Version: 2.0.202.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-Version: 2.1.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.m2e.sdk.feature/feature.xml b/org.eclipse.m2e.sdk.feature/feature.xml index c132f5a4ea..d18ed565a7 100644 --- a/org.eclipse.m2e.sdk.feature/feature.xml +++ b/org.eclipse.m2e.sdk.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.m2e.sourcelookup.ui/.classpath b/org.eclipse.m2e.sourcelookup.ui/.classpath index 3628e33687..35386b94bb 100644 --- a/org.eclipse.m2e.sourcelookup.ui/.classpath +++ b/org.eclipse.m2e.sourcelookup.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.sourcelookup.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.sourcelookup.ui/.settings/org.eclipse.jdt.core.prefs index 62ef3488cc..23fa13b170 100644 --- a/org.eclipse.m2e.sourcelookup.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.sourcelookup.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.eclipse.m2e.sourcelookup.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.sourcelookup.ui/META-INF/MANIFEST.MF index a787bba447..99565a123b 100644 --- a/org.eclipse.m2e.sourcelookup.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.sourcelookup.ui/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.sourcelookup.ui;singleton:=true -Bundle-Version: 2.0.401.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Vendor: Eclipse.org - m2e Bundle-Name: M2E Source Lookup UI Require-Bundle: org.eclipse.ui, @@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.m2e.binaryproject;bundle-version="[2.0.0,3.0.0)", org.eclipse.jdt.core;bundle-version="3.9.0", org.eclipse.jdt.launching;bundle-version="3.10.0" -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.m2e.sourcelookup.ui diff --git a/org.eclipse.m2e.sourcelookup/.classpath b/org.eclipse.m2e.sourcelookup/.classpath index 3628e33687..35386b94bb 100644 --- a/org.eclipse.m2e.sourcelookup/.classpath +++ b/org.eclipse.m2e.sourcelookup/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.sourcelookup/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.sourcelookup/.settings/org.eclipse.jdt.core.prefs index 62ef3488cc..23fa13b170 100644 --- a/org.eclipse.m2e.sourcelookup/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.sourcelookup/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF b/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF index 15a1d1a782..0241871918 100644 --- a/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.sourcelookup;singleton:=true -Bundle-Version: 2.0.301.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Vendor: Eclipse.org - m2e Bundle-Name: M2E Source Lookup Core Require-Bundle: org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", org.eclipse.jdt.launching;bundle-version="3.9.0", org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.debug.ui;bundle-version="3.10.0" -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Eclipse-BundleShape: dir Export-Package: org.eclipse.m2e.sourcelookup.internal.launch;x-friends:="org.eclipse.m2e.sourcelookup.ui,org.eclipse.m2e.binaryproject" diff --git a/org.eclipse.m2e.swtbot.tests/.classpath b/org.eclipse.m2e.swtbot.tests/.classpath new file mode 100644 index 0000000000..9479140d1b --- /dev/null +++ b/org.eclipse.m2e.swtbot.tests/.classpath @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.m2e.swtbot.tests/.project b/org.eclipse.m2e.swtbot.tests/.project new file mode 100644 index 0000000000..678256ff9a --- /dev/null +++ b/org.eclipse.m2e.swtbot.tests/.project @@ -0,0 +1,34 @@ + + + org.eclipse.m2e.swtbot.tests + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.PluginNature + + diff --git a/org.eclipse.m2e.rcptt.tests/.settings/org.eclipse.core.resources.prefs b/org.eclipse.m2e.swtbot.tests/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from org.eclipse.m2e.rcptt.tests/.settings/org.eclipse.core.resources.prefs rename to org.eclipse.m2e.swtbot.tests/.settings/org.eclipse.core.resources.prefs diff --git a/org.eclipse.m2e.swtbot.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.swtbot.tests/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..66dee60c5a --- /dev/null +++ b/org.eclipse.m2e.swtbot.tests/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,14 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=17 diff --git a/org.eclipse.m2e.swtbot.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.swtbot.tests/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..c2678674fe --- /dev/null +++ b/org.eclipse.m2e.swtbot.tests/META-INF/MANIFEST.MF @@ -0,0 +1,14 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: SWTBot Integration Tests +Bundle-SymbolicName: org.eclipse.m2e.swtbot.tests +Bundle-Version: 2.1.0.qualifier +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.31.100", + org.eclipse.m2e.pde.target, + org.eclipse.m2e.pde.ui, + org.eclipse.swt;bundle-version="3.127.0", + org.eclipse.swtbot.swt.finder;bundle-version="4.2.1", + org.eclipse.ui;bundle-version="3.206.100", + org.junit;bundle-version="4.13.2" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Automatic-Module-Name: org.eclipse.m2e.rcptt.tests diff --git a/org.eclipse.m2e.swtbot.tests/build.properties b/org.eclipse.m2e.swtbot.tests/build.properties new file mode 100644 index 0000000000..34d2e4d2da --- /dev/null +++ b/org.eclipse.m2e.swtbot.tests/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/org.eclipse.m2e.swtbot.tests/pom.xml b/org.eclipse.m2e.swtbot.tests/pom.xml new file mode 100644 index 0000000000..84516854bf --- /dev/null +++ b/org.eclipse.m2e.swtbot.tests/pom.xml @@ -0,0 +1,48 @@ + + 4.0.0 + + + org.eclipse.m2e + m2e-core + 2.1.0-SNAPSHOT + + + org.eclipse.m2e.swtbot.tests + eclipse-test-plugin + M2E - SWTBot Integration tests + + + + + + org.eclipse.tycho + tycho-surefire-plugin + + false + + + + org.eclipse.tycho + target-platform-configuration + + + + + org.eclipse.pde + eclipse-feature + 0.0.0 + + + org.eclipse.m2e.pde.feature + eclipse-feature + 0.0.0 + + + + + + + + + diff --git a/org.eclipse.m2e.swtbot.tests/src/org/eclipse/m2e/pde/ui/MavenTargetDependencyEditorTest.java b/org.eclipse.m2e.swtbot.tests/src/org/eclipse/m2e/pde/ui/MavenTargetDependencyEditorTest.java new file mode 100644 index 0000000000..6cbf0252a7 --- /dev/null +++ b/org.eclipse.m2e.swtbot.tests/src/org/eclipse/m2e/pde/ui/MavenTargetDependencyEditorTest.java @@ -0,0 +1,449 @@ +package org.eclipse.m2e.pde.ui; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.m2e.pde.target.MavenTargetLocation; +import org.eclipse.m2e.pde.target.MavenTargetLocationFactory; +import org.eclipse.m2e.pde.ui.target.editor.MavenTargetLocationWizard; +import org.eclipse.swt.dnd.Clipboard; +import org.eclipse.swt.dnd.TextTransfer; +import org.eclipse.swt.dnd.Transfer; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.utils.TableCollection; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.PlatformUI; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +/** + * Integration tests for {@code MavenTargetDependencyEditor} using SWTBot. + */ +public class MavenTargetDependencyEditorTest { + private static final String MAVEN_LOCATION_XML = """ + + + + com.fasterxml.jackson.core + jackson-annotations + 2.14.1 + jar + + + com.fasterxml.jackson.core + jackson-core + 2.14.1 + jar + + + com.fasterxml.jackson.core + jackson-databind + 2.14.1 + jar + + + com.github.ben-manes.caffeine + caffeine + 3.1.2 + jar + + + com.squareup.okhttp3 + okhttp + 4.10.0 + jar + + + com.squareup.okio + okio-jvm + 3.2.0 + jar + + + jakarta.activation + jakarta.activation-api + 1.2.2 + jar + + + jakarta.annotation + jakarta.annotation-api + 1.3.5 + jar + + + jakarta.inject + jakarta.inject-api + 1.0.5 + jar + + + jakarta.ws.rs + jakarta.ws.rs-api + 2.1.6 + jar + + + jakarta.xml.bind + jakarta.xml.bind-api + 2.3.3 + jar + + + org.eclipse.jdt + org.eclipse.jdt.annotation + 2.2.700 + jar + + + org.jetbrains.kotlin + kotlin-stdlib-common + 1.7.22 + jar + + + org.jetbrains.kotlin + kotlin-stdlib-jdk7 + 1.7.22 + jar + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + 1.7.22 + jar + + + org.jetbrains.kotlin + kotlin-stdlib + 1.7.22 + jar + + + org.slf4j + jcl-over-slf4j + 2.0.6 + jar + + + org.slf4j + slf4j-api + 2.0.6 + jar + + + org.slf4j + slf4j-simple + 2.0.6 + jar + + + + """; + private WizardDialog wizardDialog; + private IWorkbench workbench; + private SWTBot robot; + + @Before + public void setUp() throws Exception { + if (Display.getCurrent() != null) { + fail(""" + SWTBot test needs to run in a non-UI thread. + Make sure that "Run in UI thread" is unchecked in your launch configuration or that useUIThread is set to false in the pom.xml + """); + } + + workbench = PlatformUI.getWorkbench(); + wizardDialog = workbench.getDisplay().syncCall(() -> { + Shell shell = new Shell(workbench.getActiveWorkbenchWindow().getShell()); + MavenTargetLocation location = new MavenTargetLocationFactory().getTargetLocation("maven", MAVEN_LOCATION_XML); + MavenTargetLocationWizard wizard = new MavenTargetLocationWizard(location); + WizardDialog wizardDialog = new WizardDialog(shell, wizard); + wizardDialog.setBlockOnOpen(false); + wizardDialog.open(); + return wizardDialog; + }); + robot = new SWTBot().shell("Maven Artifact Target Entry - Maven Central").bot(); + } + + @After + public void tearDown() throws Exception { + if (wizardDialog != null) { + workbench.getDisplay().syncExec(wizardDialog::close); + } + } + + private void readAndDispatch() { + Display display = workbench.getDisplay(); + display.syncExec(display::readAndDispatch); + } + + /** + * Checks whether the initial "enablement" state of all buttons in the Maven + * dependency editor is set correctly. + */ + @Test + public void testInitialButtonState() throws Exception { + assertTrue(robot.button("Add").isEnabled()); + assertTrue(robot.button("Remove").isEnabled()); + assertTrue(robot.button("Update").isEnabled()); + assertFalse(robot.button("Undo").isEnabled()); + assertFalse(robot.button("Redo").isEnabled()); + } + + /** + * Checks whether new Maven coordinates can be added and edited. + */ + @Test + public void testAddMavenLocation() throws Exception { + workbench.getDisplay().syncExec(() -> { + Clipboard clipboard = new Clipboard(workbench.getDisplay()); + clipboard.setContents(new Object[] { + """ + + """ + }, new Transfer[] { TextTransfer.getInstance() }); + clipboard.dispose(); + }); + robot.button("Add").click(); + + SWTBotTable table = robot.table(); + assertEquals(table.cell(19, 0), ""); + assertEquals(table.cell(19, 1), ""); + assertEquals(table.cell(19, 2), ""); + assertEquals(table.cell(19, 3), ""); + assertEquals(table.cell(19, 4), "jar"); + + assertFalse(robot.button("Update").isEnabled()); + assertFalse(robot.button("Finish").isEnabled()); + // There is no elegant way to select the cell editor, + // but we know that opening it focuses the text widget + table.click(19, 0); + robot.text(0).setText("org.apache.commons"); + table.click(19, 1); + robot.text(0).setText("commons-lang3"); + table.click(19, 2); + robot.text(0).setText("3.12.0"); + table.click(19, 3); // Close cell editor + + assertTrue(robot.button("Update").isEnabled()); + assertTrue(robot.button("Finish").isEnabled()); + + assertEquals(table.cell(19, 0), "org.apache.commons"); + assertEquals(table.cell(19, 1), "commons-lang3"); + assertEquals(table.cell(19, 2), "3.12.0"); + assertEquals(table.cell(19, 3), ""); + assertEquals(table.cell(19, 4), "jar"); + } + + /** + * Checks whether adding Maven dependencies from the clipboard is supported. + */ + @Test + public void testAddMavenLocationWithClipboard() throws Exception { + workbench.getDisplay().syncExec(() -> { + Clipboard clipboard = new Clipboard(workbench.getDisplay()); + clipboard.setContents(new Object[] { + """ + + org.eclipse.platform + org.eclipse.core.runtime + 3.26.100 + " + """ + }, new Transfer[] { TextTransfer.getInstance() }); + clipboard.dispose(); + }); + robot.button("Add").click(); + + SWTBotTable table = robot.table(); + assertEquals(table.cell(19, 0), "org.eclipse.platform"); + assertEquals(table.cell(19, 1), "org.eclipse.core.runtime"); + assertEquals(table.cell(19, 2), "3.26.100"); + assertEquals(table.cell(19, 3), ""); + assertEquals(table.cell(19, 4), "jar"); + } + + /** + * Tests whether the cells can be edited directly without first having to select + * the row (only possible with SWT.FULL_SELECTION). + */ + @Test + public void testEditCellsDirectly() throws Exception { + SWTBotTable table = robot.table(); + table.click(0, 0); + robot.text("com.fasterxml.jackson.core").setText("a"); + table.click(1, 1); + robot.text("jackson-core").setText("b"); + table.click(2, 2); + robot.text("2.14.1").setText("c"); + table.click(0, 0); // Close cell editor + + assertEquals(table.cell(0, 0), "a"); + assertEquals(table.cell(1, 1), "b"); + assertEquals(table.cell(2, 2), "c"); + } + + /** + * Tests whether the version of one or more dependencies can be updated. + */ + @Test + public void testUpdateMavenArtifactVersion() throws Exception { + SWTBotTable table = robot.table(); + // Update single artifact + assertEquals(table.cell(12, 1), "kotlin-stdlib-common"); + assertEquals(table.cell(12, 2), "1.7.22"); + + table.select(12); + robot.button("Update").click(); + readAndDispatch(); + + assertEquals(table.cell(12, 1), "kotlin-stdlib-common"); + assertNotEquals(table.cell(12, 2), "1.7.22"); + + // Update multiple artifacts + assertEquals(table.cell(13, 1), "kotlin-stdlib-jdk7"); + assertEquals(table.cell(13, 2), "1.7.22"); + assertEquals(table.cell(15, 1), "kotlin-stdlib"); + assertEquals(table.cell(15, 2), "1.7.22"); + + table.select(13, 15); + robot.button("Update").click(); + readAndDispatch(); + + assertEquals(table.cell(13, 1), "kotlin-stdlib-jdk7"); + assertNotEquals(table.cell(13, 2), "1.7.22"); + assertEquals(table.cell(15, 1), "kotlin-stdlib"); + assertNotEquals(table.cell(15, 2), "1.7.22"); + } + + /** + * Tests whether one or more artifacts can be deleted and whether the selection + * is updated correctly. + */ + @Test + public void testRemoveArtifacts() throws Exception { + // Removing multiple elements clears the selection + SWTBotTable table = robot.table(); + assertEquals(table.cell(0, 1), "jackson-annotations"); + assertEquals(table.cell(1, 1), "jackson-core"); + assertEquals(table.cell(2, 1), "jackson-databind"); + table.select(0, 1, 2); + + robot.button("Remove").click(); + assertEquals(table.cell(0, 1), "caffeine"); + assertEquals(table.selectionCount(), 0); + + // Removing a single element selects the next element + assertEquals(table.cell(3, 1), "jakarta.activation-api"); + table.select(3); + + robot.button("Remove").click(); + assertEquals(table.cell(3, 1), "jakarta.annotation-api"); + assertEquals(table.selectionCount(), 1); + assertEquals(table.selection().get(0, 1), "jakarta.annotation-api"); + } + + /** + * Tests whether changes to the artifacts can be tracked via undo/redo. + */ + @Test + public void testUndoRedo() throws Exception { + SWTBotTable table = robot.table(); + assertEquals(table.cell(6, 1), "jakarta.activation-api"); + + // Tests undo/redo on removal + table.select(6); + robot.button("Remove").click(); + assertEquals(table.cell(6, 1), "jakarta.annotation-api"); + + robot.button("Undo").click(); + assertEquals(table.cell(6, 1), "jakarta.activation-api"); + + robot.button("Redo").click(); + assertEquals(table.cell(6, 1), "jakarta.annotation-api"); + + // Tests undo/redo on editing + table.click(6, 1); + robot.text("jakarta.annotation-api").setText("foo"); + table.click(6, 2); // Close cell editor + assertEquals(table.cell(6, 1), "foo"); + + robot.button("Undo").click(); + assertEquals(table.cell(6, 1), "jakarta.annotation-api"); + + robot.button("Redo").click(); + assertEquals(table.cell(6, 1), "foo"); + } + + /** + * Tests whether artifacts are correctly sorted by the selected columns and + * whether items are inserted at the correct location. + */ + @Test + public void testColumnSorting() throws Exception { + SWTBotTable table = robot.table(); + + // Sort by Version + table.header("Version").click(); + assertEquals(table.cell(0, 1), "jakarta.inject-api"); + + // Sort by Artifact Id + table.header("Artifact Id").click(); + assertEquals(table.cell(0, 1), "caffeine"); + + // Sort by Artifact Id + table.header("Group Id").click(); + assertEquals(table.cell(0, 1), "jackson-annotations"); + + workbench.getDisplay().syncExec(() -> { + Clipboard clipboard = new Clipboard(workbench.getDisplay()); + clipboard.setContents(new Object[] { + """ + + com.fasterxml.jackson.core + jackson-databind + 2.14.0 + " + """ + }, new Transfer[] { TextTransfer.getInstance() }); + clipboard.dispose(); + }); + robot.button("Add").click(); + assertEquals(table.cell(2, 1), "jackson-databind"); + } + + /** + * Tests whether items are preserved when selecting more than one element. + */ + @Test + public void testMultiSelection() throws Exception { + SWTBotTable table = robot.table(); + + // Forward selection + table.select(0, 1, 2, 3); + TableCollection selection = table.selection(); + assertEquals(selection.rowCount(), 4); + assertEquals(selection.get(0, 1), "jackson-annotations"); + assertEquals(selection.get(1, 1), "jackson-core"); + assertEquals(selection.get(2, 1), "jackson-databind"); + assertEquals(selection.get(3, 1), "caffeine"); + + // Backward selection + table.select(16, 15, 14, 13); + selection = table.selection(); + assertEquals(selection.rowCount(), 4); + assertEquals(selection.get(0, 1), "kotlin-stdlib-jdk7"); + assertEquals(selection.get(1, 1), "kotlin-stdlib-jdk8"); + assertEquals(selection.get(2, 1), "kotlin-stdlib"); + assertEquals(selection.get(3, 1), "jcl-over-slf4j"); + } +} diff --git a/org.eclipse.m2e.tests.common/.classpath b/org.eclipse.m2e.tests.common/.classpath index 427e49b0d4..c9bfedfe9c 100644 --- a/org.eclipse.m2e.tests.common/.classpath +++ b/org.eclipse.m2e.tests.common/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.m2e.tests.common/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.tests.common/.settings/org.eclipse.jdt.core.prefs index 552f7d6594..04e853bea9 100644 --- a/org.eclipse.m2e.tests.common/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.tests.common/.settings/org.eclipse.jdt.core.prefs @@ -27,9 +27,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -143,7 +143,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF b/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF index f02dc6f5a7..fc56f920e8 100644 --- a/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: M2E Testing Helpers Bundle-SymbolicName: org.eclipse.m2e.tests.common;singleton:=true -Bundle-Version: 2.0.7.qualifier +Bundle-Version: 2.1.0.qualifier Require-Bundle: org.junit;bundle-version="4.0.0", org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)", @@ -17,7 +17,7 @@ Require-Bundle: org.junit;bundle-version="4.0.0", org.eclipse.swt;bundle-version="3.119.0", org.eclipse.m2e.core.ui Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: Eclipse.org - m2e MavenArtifact-GroupId: org.eclipse.m2e MavenArtifact-ArtifactId: org.eclipse.m2e.tests.common diff --git a/pom.xml b/pom.xml index af61929dca..a4930719f5 100644 --- a/pom.xml +++ b/pom.xml @@ -90,12 +90,8 @@ org.eclipse.m2e.apt.tests org.eclipse.m2e.pde.connector.tests org.eclipse.m2e.pde.target.tests - - - products - - org.eclipse.m2e.rcptt.tests + org.eclipse.m2e.swtbot.tests @@ -160,29 +156,6 @@ org.eclipse.tycho tycho-p2-director-plugin ${tycho-version} - - - materialize-products - - materialize-products - - package - - - archive-products - - archive-products - - verify - - - tar.gz - tar.gz - tar.gz - - - - org.eclipse.tycho diff --git a/target-platform/target-platform.target b/target-platform/target-platform.target index d8c6037c7e..96f134caac 100644 --- a/target-platform/target-platform.target +++ b/target-platform/target-platform.target @@ -4,7 +4,7 @@ - + @@ -18,22 +18,22 @@ - + - + - + - + @@ -45,12 +45,16 @@ + + + + ch.qos.logback logback-classic - 1.5.7 + 1.5.8 jar @@ -78,7 +82,7 @@ com.google.guava guava - 33.3.0-jre + 33.3.1-jre jar @@ -96,7 +100,7 @@ org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 jar