From 1154ef779cd8027729cbc5540c58ed40c6335d70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 11:39:53 +0000 Subject: [PATCH 01/45] Bump actions/setup-java from 4.2.2 to 4.3.0 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.2.2 to 4.3.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/6a0805fcefea3d4657a47ac4c165951e33482018...2dfa2011c5b2a0f1489bf9e433881c92c1631f88) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 9e2e5f579..1bd0e5a0d 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -24,7 +24,7 @@ jobs: with: fetch-depth: 0 submodules: true - - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2 + - uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0 with: java-version: | 17 From df0dd8ce108972d9d5994293f416e536e926b9ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:33:39 +0000 Subject: [PATCH 02/45] Bump actions/setup-java from 4.3.0 to 4.4.0 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.3.0 to 4.4.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/2dfa2011c5b2a0f1489bf9e433881c92c1631f88...b36c23c0d998641eff861008f374ee103c25ac73) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 1bd0e5a0d..a706b87b2 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -24,7 +24,7 @@ jobs: with: fetch-depth: 0 submodules: true - - uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0 + - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0 with: java-version: | 17 From 0b4b6557c240346d6e1b927d9358b0daa278a6ae Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Wed, 28 Aug 2024 00:27:48 +0200 Subject: [PATCH 03/45] Build with Maven 3.9.9 on Jenkins and in GH workflow --- .github/workflows/maven.yml | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index a706b87b2..39a7b7c7b 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -33,7 +33,7 @@ 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 with: diff --git a/Jenkinsfile b/Jenkinsfile index dd865e89d..aab497fbd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { label "centos-latest" } tools { - maven 'apache-maven-3.9.6' + maven 'apache-maven-3.9.9' jdk 'openjdk-jdk21-latest' } stages { From 3d1eb825697bd0e92905198eaeec96e4dec3d054 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Wed, 25 Sep 2024 19:14:33 +0200 Subject: [PATCH 04/45] [Build] Run Jenkins pipeline on 'ubuntu-latest' agents 'centos-latest' is deprecated as per: https://github.com/eclipse-cbi/jiro-agents/blob/f1b7779628b9185fec084ebfa1d04d1d009fe518/README.md --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index aab497fbd..c294fa443 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { timestamps() } agent { - label "centos-latest" + label "ubuntu-latest" } tools { maven 'apache-maven-3.9.9' From 3e9d4ea2b618beb032d96b13340c4780a3799962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Thu, 26 Sep 2024 10:10:39 +0300 Subject: [PATCH 05/45] Remove not needed casts --- .../m2e/core/ui/internal/components/WorkingSetGroup.java | 2 +- .../org/eclipse/m2e/internal/discovery/MavenDiscovery.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 e59c5b291..bd56f962a 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.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscovery.java b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscovery.java index 312222217..c678a32ec 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); From 36741e4c349ae47bed56bba777c6a41f89b5da63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Thu, 26 Sep 2024 10:11:12 +0300 Subject: [PATCH 06/45] Remove not thrown exception --- .../core/internal/project/registry/ProjectRegistryManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5e2ad4fa4..bad2ec7a6 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)); } From e5218fc7e98d4f0289d1651875635269033869e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Thu, 26 Sep 2024 10:13:39 +0300 Subject: [PATCH 07/45] Move away of deprecated createImage method --- .../target/provider/DependencyNodeLabelProvider.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 6ca4b9dd9..9941dc5f3 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; } From 70d22cada587d34c3d32f5ef674423e51e603a99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Thu, 26 Sep 2024 10:17:36 +0300 Subject: [PATCH 08/45] Version bumps for new stream --- org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.core/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.core/pom.xml | 2 +- org.eclipse.m2e.discovery/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.feature/feature.xml | 2 +- org.eclipse.m2e.pde.feature/feature.xml | 2 +- org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF index bb2fea3f0..9cb75c20f 100644 --- a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.core.ui;singleton:=true -Bundle-Version: 2.0.801.qualifier +Bundle-Version: 2.0.802.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF index aead1fa93..030685fd1 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.6.2.qualifier Bundle-Activator: org.eclipse.m2e.core.internal.MavenPluginActivator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.m2e.core/pom.xml b/org.eclipse.m2e.core/pom.xml index fc9ab355b..51f1ea291 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.6.2-SNAPSHOT eclipse-plugin Maven Integration for Eclipse Core Plug-in diff --git a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF index be2eba0db..649f4ad81 100644 --- a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ 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-Version: 2.0.203.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.m2e.feature/feature.xml b/org.eclipse.m2e.feature/feature.xml index 123886e33..fbd562bdb 100644 --- a/org.eclipse.m2e.feature/feature.xml +++ b/org.eclipse.m2e.feature/feature.xml @@ -2,7 +2,7 @@ Date: Thu, 26 Sep 2024 11:44:55 +0000 Subject: [PATCH 09/45] Bump actions/checkout from 4.1.7 to 4.2.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.7 to 4.2.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/692973e3d937129bcbf40652eb9f2f61becf3332...d632683dd7b4114ad314bca15554477dd762a938) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 39a7b7c7b..c46837087 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -20,7 +20,7 @@ jobs: timeout-minutes: 45 steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: fetch-depth: 0 submodules: true From a34b2966c982daf52b650a20a30ca49f4c4b8753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Thu, 26 Sep 2024 12:27:21 +0300 Subject: [PATCH 10/45] Build against Eclipse SDK 4.33 Adjust to internals changes. Adapt to ECJ no longer supporting targets below 1.8. --- m2e-core-tests | 2 +- .../projects/argumentMap/pom.xml | 5 ++--- .../projects/nonjar_plugin_deps/pom.xml | 5 ++--- org.eclipse.m2e.apt.tests/projects/p1/pom.xml | 8 +++++--- org.eclipse.m2e.apt.tests/projects/p11/pom.xml | 5 ++--- org.eclipse.m2e.apt.tests/projects/p12/new-pom.xml | 5 ++--- org.eclipse.m2e.apt.tests/projects/p12/pom.xml | 5 ++--- .../projects/p1_test_classpath_disabled/pom.xml | 5 ++--- org.eclipse.m2e.apt.tests/projects/p2/pom.xml | 5 ++--- org.eclipse.m2e.apt.tests/projects/p3/pom.xml | 5 ++--- org.eclipse.m2e.apt.tests/projects/p8/pom.xml | 5 ++--- .../apt/tests/M2eAptProjectconfiguratorTest.java | 2 +- .../projects/compilerWarnings/pom.xml | 2 +- org.eclipse.m2e.jdt/META-INF/MANIFEST.MF | 2 +- .../internal/AbstractJavaProjectConfigurator.java | 7 ++----- .../internal/JavaProjectConversionParticipant.java | 4 ++-- .../pde/connector/tests/TychoConnectorTest.java | 14 ++++++++------ org.eclipse.m2e.pde.connector/META-INF/MANIFEST.MF | 4 ++-- .../m2e/pde/connector/PDEProjectHelper.java | 10 +++++----- target-platform/target-platform.target | 2 +- 20 files changed, 47 insertions(+), 55 deletions(-) diff --git a/m2e-core-tests b/m2e-core-tests index 813942ef2..70483dd46 160000 --- a/m2e-core-tests +++ b/m2e-core-tests @@ -1 +1 @@ -Subproject commit 813942ef2fbc42c989f2104d59d213aa70340d12 +Subproject commit 70483dd46ae206dba8b07407155fb8c79ef553fa diff --git a/org.eclipse.m2e.apt.tests/projects/argumentMap/pom.xml b/org.eclipse.m2e.apt.tests/projects/argumentMap/pom.xml index 4bd112074..fc0213c33 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 781f6eb5b..9c657efae 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 bc5e33099..b4e9e1201 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 1048b13f4..6afaed860 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 6a60780d5..2aa3db8f7 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 f3ae105c0..669d5086d 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 d936c4eaa..5efd031e4 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 c9bc69835..1f6a30082 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 9d49c2927..50e1068bf 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 30a35c2c0..07d6b8889 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 7f741d5e8..35dc437f6 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.jdt.tests/projects/compilerWarnings/pom.xml b/org.eclipse.m2e.jdt.tests/projects/compilerWarnings/pom.xml index 19df808f8..44d4e1320 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/META-INF/MANIFEST.MF b/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF index 2cc4f1970..750959bea 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.3.601.qualifier Bundle-Localization: plugin Export-Package: org.eclipse.m2e.jdt, org.eclipse.m2e.jdt.internal;x-friends:="org.eclipse.m2e.jdt.ui", 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 0356efdd1..c52709a09 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 01639b4e2..aa9022512 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.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 05108c727..3d54a9647 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/META-INF/MANIFEST.MF b/org.eclipse.m2e.pde.connector/META-INF/MANIFEST.MF index a9ffc04c1..5e4e19edd 100644 --- a/org.eclipse.m2e.pde.connector/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.pde.connector/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ 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.1.602.qualifier Automatic-Module-Name: org.eclipse.m2e.pde.connector Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: Eclipse.org - m2e @@ -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 c802757b7..acef8003b 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; +import org.eclipse.pde.internal.core.natures.FeatureProject; 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 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(FeatureProject.NATURE)) { + AbstractProjectConfigurator.addNature(project, FeatureProject.NATURE, monitor); } } } diff --git a/target-platform/target-platform.target b/target-platform/target-platform.target index d8c6037c7..dc580da72 100644 --- a/target-platform/target-platform.target +++ b/target-platform/target-platform.target @@ -4,7 +4,7 @@ - + From c81cc3cca571217dc5daa45af456c10f7fdcbf99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Fri, 27 Sep 2024 13:21:28 +0300 Subject: [PATCH 11/45] Update target platform to 2024-09 content --- target-platform/target-platform.target | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/target-platform/target-platform.target b/target-platform/target-platform.target index dc580da72..4f8d9476d 100644 --- a/target-platform/target-platform.target +++ b/target-platform/target-platform.target @@ -18,22 +18,22 @@ - + - + - + - + @@ -50,7 +50,7 @@ ch.qos.logback logback-classic - 1.5.7 + 1.5.8 jar @@ -78,7 +78,7 @@ com.google.guava guava - 33.3.0-jre + 33.3.1-jre jar @@ -96,7 +96,7 @@ org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 jar From 3b9e368b708d0414bcb9c948dff5ac260cd7cdc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Fri, 27 Sep 2024 13:16:09 +0300 Subject: [PATCH 12/45] Update tycho to 4.0.9 --- .mvn/maven.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/maven.config b/.mvn/maven.config index 4bb387474..fa967a055 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 From edc3710558d119a8a9c7010e551b4429e67df00d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Fri, 27 Sep 2024 13:32:55 +0300 Subject: [PATCH 13/45] Version bumps Due to new tycho using new ecj thus new bytecode produced. --- org.eclipse.m2e.apt.core/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.apt.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.editor/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.launching/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.logback.feature/feature.xml | 2 +- org.eclipse.m2e.logback/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.mavenarchiver/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.model.edit/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.profiles.core/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.profiles.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.scm/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.sourcelookup.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/org.eclipse.m2e.apt.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.apt.core/META-INF/MANIFEST.MF index f617b24e9..be0fe4531 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.2.203.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)", org.eclipse.core.resources, diff --git a/org.eclipse.m2e.apt.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.apt.ui/META-INF/MANIFEST.MF index 7f46de820..d28489f65 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.403.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF index 539404dfe..0996ba6ff 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.0.402.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, diff --git a/org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF index f9e72ff4e..b8670fc8a 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.0.402.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, diff --git a/org.eclipse.m2e.launching/META-INF/MANIFEST.MF b/org.eclipse.m2e.launching/META-INF/MANIFEST.MF index 9d3d8c579..06bbbcccd 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.0.603.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)", org.eclipse.core.variables, diff --git a/org.eclipse.m2e.logback.feature/feature.xml b/org.eclipse.m2e.logback.feature/feature.xml index b8731afe8..4b970744c 100644 --- a/org.eclipse.m2e.logback.feature/feature.xml +++ b/org.eclipse.m2e.logback.feature/feature.xml @@ -2,7 +2,7 @@ Date: Fri, 27 Sep 2024 15:05:25 +0300 Subject: [PATCH 14/45] Update lemminx integration to Java 21 BREE As WWD requires Java 21 the only way to make tests work is if they are run with Java 21 too. Makes licensecheck GHA runs with Java 21 too now. --- .github/workflows/licensecheck.yml | 1 + org.eclipse.m2e.editor.lemminx.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.editor.lemminx.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.editor.lemminx/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF | 2 +- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/licensecheck.yml b/.github/workflows/licensecheck.yml index 993efbf48..322b7baf6 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/org.eclipse.m2e.editor.lemminx.tests/.classpath b/org.eclipse.m2e.editor.lemminx.tests/.classpath index 427e49b0d..c9bfedfe9 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 62ef3488c..23fa13b17 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 f2b6fc536..4e9ab741b 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/.classpath b/org.eclipse.m2e.editor.lemminx/.classpath index 3628e3368..35386b94b 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 d4540a53f..3a79233b1 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 c689eb647..2a1752d0f 100644 --- a/org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF @@ -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 From 4ff328ae2afdcca7ab44cf4ad546dae3316b40d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Fri, 27 Sep 2024 15:24:08 +0300 Subject: [PATCH 15/45] Version bumps for new stream --- org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.editor.lemminx/pom.xml | 2 +- org.eclipse.m2e.lemminx.feature/feature.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF index 2a1752d0f..bfbe0b565 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.601.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", diff --git a/org.eclipse.m2e.editor.lemminx/pom.xml b/org.eclipse.m2e.editor.lemminx/pom.xml index 7f3a98fc7..b92dd5e46 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.601-SNAPSHOT diff --git a/org.eclipse.m2e.lemminx.feature/feature.xml b/org.eclipse.m2e.lemminx.feature/feature.xml index bc00abb85..b08aa91ec 100644 --- a/org.eclipse.m2e.lemminx.feature/feature.xml +++ b/org.eclipse.m2e.lemminx.feature/feature.xml @@ -2,7 +2,7 @@ From ca976ab480bab0d31c0af7aa3297fcf99eccb711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Fri, 27 Sep 2024 16:35:26 +0300 Subject: [PATCH 16/45] Simplify pgp sign --- Jenkinsfile | 25 +++---------------------- org.eclipse.m2e.repository/pom.xml | 1 + 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c294fa443..d1d41e37f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { } tools { maven 'apache-maven-3.9.9' - jdk 'openjdk-jdk21-latest' + jdk 'temurin-jdk21-latest' } stages { stage('get m2e-core-tests') { @@ -18,33 +18,14 @@ 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" 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 -DDtycho.pgp.signer.bc.secretKeys="${KEYRING}" -Dgpg.passphrase="${KEYRING_PASSPHRASE}" -Dgpg.keyname="011C526F29B2CE79" else # Clear KEYRING_PASSPHRASE environment variable export KEYRING_PASSPHRASE='EMPTY' diff --git a/org.eclipse.m2e.repository/pom.xml b/org.eclipse.m2e.repository/pom.xml index 0bef92673..ec9c69b9a 100644 --- a/org.eclipse.m2e.repository/pom.xml +++ b/org.eclipse.m2e.repository/pom.xml @@ -86,6 +86,7 @@ sign-p2-artifacts + bc true From 1dd211b9fba841e0c54744f6a0850bd320ee6a68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Fri, 27 Sep 2024 17:13:09 +0300 Subject: [PATCH 17/45] Fix pgp sign Previous commit didn't make it work. --- Jenkinsfile | 2 +- org.eclipse.m2e.repository/pom.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d1d41e37f..4bcb9ab80 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,7 +25,7 @@ pipeline { sh ''' mavenArgs="clean verify --batch-mode -Dmaven.test.error.ignore=true -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 -DDtycho.pgp.signer.bc.secretKeys="${KEYRING}" -Dgpg.passphrase="${KEYRING_PASSPHRASE}" -Dgpg.keyname="011C526F29B2CE79" + mvn ${mavenArgs} -Peclipse-sign,its -DDtycho.pgp.signer.bc.secretKeys="${KEYRING}" -Dgpg.passphrase="${KEYRING_PASSPHRASE}" else # Clear KEYRING_PASSPHRASE environment variable export KEYRING_PASSPHRASE='EMPTY' diff --git a/org.eclipse.m2e.repository/pom.xml b/org.eclipse.m2e.repository/pom.xml index ec9c69b9a..60836504e 100644 --- a/org.eclipse.m2e.repository/pom.xml +++ b/org.eclipse.m2e.repository/pom.xml @@ -88,6 +88,7 @@ bc true + 011C526F29B2CE79 From 40e9417c843720018f21726eacb7dbc63555fc58 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Fri, 27 Sep 2024 19:07:33 +0200 Subject: [PATCH 18/45] [Build] Secure simplified PGP signing in PR verification builds --- Jenkinsfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4bcb9ab80..0a9042469 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,14 +20,18 @@ pipeline { } stage('Build') { steps { - withCredentials([file(credentialsId: 'secret-subkeys.asc', variable: 'KEYRING'),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" if [[ ${BRANCH_NAME} == master ]] || [[ ${BRANCH_NAME} =~ m2e-[0-9]+\\.[0-9]+\\.x ]]; then mvn ${mavenArgs} -Peclipse-sign,its -DDtycho.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 From 3d646b5e23a49522ce3d45d727b82dd628c47661 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Fri, 27 Sep 2024 19:02:42 +0200 Subject: [PATCH 19/45] [PDE] Reduce usage of PDE internals in production code --- .../src/org/eclipse/m2e/pde/connector/PDEProjectHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 acef8003b..fab51920c 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 @@ -46,11 +46,11 @@ import org.eclipse.pde.core.plugin.IPluginModelBase; import org.eclipse.pde.core.plugin.PluginRegistry; import org.eclipse.pde.core.project.IBundleProjectDescription; -import org.eclipse.pde.internal.core.natures.FeatureProject; public class PDEProjectHelper { 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(FeatureProject.NATURE)) { - AbstractProjectConfigurator.addNature(project, FeatureProject.NATURE, monitor); + if (!project.hasNature(PDE_FEATURE_NATURE)) { + AbstractProjectConfigurator.addNature(project, PDE_FEATURE_NATURE, monitor); } } } From 1d431b1374e5e0ae061847344a388e898017c38a Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Fri, 27 Sep 2024 19:16:58 +0200 Subject: [PATCH 20/45] Update submodule 'm2e-core-tests' --- m2e-core-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m2e-core-tests b/m2e-core-tests index 70483dd46..e38d0746d 160000 --- a/m2e-core-tests +++ b/m2e-core-tests @@ -1 +1 @@ -Subproject commit 70483dd46ae206dba8b07407155fb8c79ef553fa +Subproject commit e38d0746d741a8eb9253d18fa97396d222c63395 From 0e602d27fb5f2632ecd0147c6a04e99cc5644856 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Fri, 27 Sep 2024 19:48:52 +0200 Subject: [PATCH 21/45] Use the +100 service version bump schema --- org.eclipse.m2e.apt.core/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.apt.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.core/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.core/pom.xml | 2 +- org.eclipse.m2e.discovery/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.editor.lemminx/pom.xml | 2 +- org.eclipse.m2e.editor/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.feature/feature.xml | 2 +- org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.jdt/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.launching/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.lemminx.feature/feature.xml | 2 +- org.eclipse.m2e.logback.feature/feature.xml | 2 +- org.eclipse.m2e.logback/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.mavenarchiver/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.model.edit/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.pde.connector/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.pde.feature/feature.xml | 2 +- org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.profiles.core/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.profiles.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.scm/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.sourcelookup.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/org.eclipse.m2e.apt.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.apt.core/META-INF/MANIFEST.MF index be0fe4531..54b5aaa53 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.203.qualifier +Bundle-Version: 2.2.300.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)", org.eclipse.core.resources, diff --git a/org.eclipse.m2e.apt.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.apt.ui/META-INF/MANIFEST.MF index d28489f65..538d75d48 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.403.qualifier +Bundle-Version: 2.0.500.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF index 9cb75c20f..bb13a5be1 100644 --- a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.core.ui;singleton:=true -Bundle-Version: 2.0.802.qualifier +Bundle-Version: 2.0.900.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF index 030685fd1..bb2a43089 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.2.qualifier +Bundle-Version: 2.6.100.qualifier Bundle-Activator: org.eclipse.m2e.core.internal.MavenPluginActivator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.m2e.core/pom.xml b/org.eclipse.m2e.core/pom.xml index 51f1ea291..c047a2a5a 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.2-SNAPSHOT + 2.6.100-SNAPSHOT eclipse-plugin Maven Integration for Eclipse Core Plug-in diff --git a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF index 649f4ad81..b047e7d3d 100644 --- a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.m2e.discovery;singleton:=true -Bundle-Version: 2.0.203.qualifier +Bundle-Version: 2.0.300.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF index bfbe0b565..41a95b8d7 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.601.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", diff --git a/org.eclipse.m2e.editor.lemminx/pom.xml b/org.eclipse.m2e.editor.lemminx/pom.xml index b92dd5e46..21b5a7f73 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.601-SNAPSHOT + 2.0.700-SNAPSHOT diff --git a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF index 0996ba6ff..3de21aab8 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.402.qualifier +Bundle-Version: 2.0.500.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, diff --git a/org.eclipse.m2e.feature/feature.xml b/org.eclipse.m2e.feature/feature.xml index fbd562bdb..965d58350 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.logback.feature/feature.xml b/org.eclipse.m2e.logback.feature/feature.xml index 4b970744c..12360826a 100644 --- a/org.eclipse.m2e.logback.feature/feature.xml +++ b/org.eclipse.m2e.logback.feature/feature.xml @@ -2,7 +2,7 @@ Date: Fri, 27 Sep 2024 18:13:01 +0200 Subject: [PATCH 22/45] Reduce number of retained builds and retained builds with artifacts In order to save disk space, the number of builds to keep with artifacts is be limited to 1 for verification builds and 5 for the master branch. For all branches the number of retained builds is limited to 5. --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0a9042469..a755cabc3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ 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() } From 2a342a2993eddd797d7e2fd58248d1d98c51483c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Tue, 1 Oct 2024 14:08:30 +0300 Subject: [PATCH 23/45] Require Java 21 --- m2e-core-tests | 2 +- org.eclipse.m2e.apt.core/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.apt.core/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.apt.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.apt.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.apt.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.apt.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.binaryproject.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.binaryproject.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.binaryproject.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.binaryproject.ui/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.binaryproject/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.binaryproject/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.core.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 9 +++++++++ org.eclipse.m2e.core.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.core.ui.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.core.ui.tests/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.core.ui.tests/pom.xml | 2 +- .../simple.tests/.settings/org.eclipse.m2e.core.prefs | 4 ++++ org.eclipse.m2e.core.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.core/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.core/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.core/pom.xml | 2 +- org.eclipse.m2e.discovery/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.discovery/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.editor.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.editor.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.editor/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.editor/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.feature/feature.xml | 2 +- org.eclipse.m2e.jdt.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.jdt.tests/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.jdt.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.jdt/.classpath | 2 +- org.eclipse.m2e.jdt/.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.jdt/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.launching/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.launching/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.logback.feature/feature.xml | 2 +- org.eclipse.m2e.logback/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.logback/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.mavenarchiver/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.mavenarchiver/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.pde.connector.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.pde.connector.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.pde.connector/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.pde.connector/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.pde.target/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.pde.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.profiles.core.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.profiles.core.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.profiles.core/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.profiles.core/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.profiles.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.profiles.ui/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.refactoring/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.scm/.classpath | 2 +- org.eclipse.m2e.scm/.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.scm/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.sdk.feature/feature.xml | 2 +- org.eclipse.m2e.sourcelookup.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.sourcelookup.ui/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.sourcelookup/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.tests.common/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF | 4 ++-- 100 files changed, 195 insertions(+), 182 deletions(-) create mode 100644 org.eclipse.m2e.core.tests/.settings/org.eclipse.jdt.core.prefs create mode 100644 org.eclipse.m2e.core.ui.tests/resources/projects/simple-tycho/simple.tests/.settings/org.eclipse.m2e.core.prefs diff --git a/m2e-core-tests b/m2e-core-tests index e38d0746d..5e95de034 160000 --- a/m2e-core-tests +++ b/m2e-core-tests @@ -1 +1 @@ -Subproject commit e38d0746d741a8eb9253d18fa97396d222c63395 +Subproject commit 5e95de034029ec17c2cac2a4914757f80428d544 diff --git a/org.eclipse.m2e.apt.core/.classpath b/org.eclipse.m2e.apt.core/.classpath index 3628e3368..35386b94b 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 8489dba2d..cde898ab7 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 54b5aaa53..ebd0c0d3f 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.300.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 427e49b0d..c9bfedfe9 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 c79abff38..e07a4dd8f 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 a6086b96f..76686f910 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.ui/.classpath b/org.eclipse.m2e.apt.ui/.classpath index 3628e3368..35386b94b 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 e43bdaafc..173fa831e 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 538d75d48..0cff75ed5 100644 --- a/org.eclipse.m2e.apt.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.apt.ui/META-INF/MANIFEST.MF @@ -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 427e49b0d..c9bfedfe9 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 d4540a53f..3a79233b1 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 7379da827..2be653996 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 3628e3368..35386b94b 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 d4540a53f..3a79233b1 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 18abdc946..2bb7fa182 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 3628e3368..35386b94b 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 d4540a53f..3a79233b1 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 dac548a82..bda4209c2 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 427e49b0d..c9bfedfe9 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 000000000..23fa13b17 --- /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 60603f825..b571372e9 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 427e49b0d..c9bfedfe9 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 9478cb165..1e0cb16bb 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 924420503..9d96befc9 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 e792445f5..7e1fe4815 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 000000000..f897a7f1c --- /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 3628e3368..35386b94b 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 70cb33567..05bc5a22d 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 bb13a5be1..5f6107505 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.900.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/.classpath b/org.eclipse.m2e.core/.classpath index 50c3b9e44..da5b3991f 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 696a7c3b8..017ef28aa 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 bb2a43089..83c8bd7a0 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.100.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 c047a2a5a..ecba17472 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.100-SNAPSHOT + 2.7.0-SNAPSHOT eclipse-plugin Maven Integration for Eclipse Core Plug-in diff --git a/org.eclipse.m2e.discovery/.classpath b/org.eclipse.m2e.discovery/.classpath index 3628e3368..35386b94b 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 ffbf9b784..d485022b4 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 b047e7d3d..5b836941a 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.300.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.editor.tests/.classpath b/org.eclipse.m2e.editor.tests/.classpath index 427e49b0d..c9bfedfe9 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 00a1fd4d0..4fca80c6d 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 cb5c18513..b08500ed8 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 3628e3368..35386b94b 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 70cb33567..05bc5a22d 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 3de21aab8..3218de22a 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.500.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 965d58350..e9de8bf70 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 62ef3488c..23fa13b17 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 a01493a3c..90c8c457e 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.ui/.classpath b/org.eclipse.m2e.jdt.ui/.classpath index 3628e3368..35386b94b 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 ffbf9b784..d485022b4 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 effb3034a..6156a3920 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.500.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 3628e3368..35386b94b 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 11358cf62..500c99ee8 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 b3df66588..cacf40da9 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.700.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.launching/.classpath b/org.eclipse.m2e.launching/.classpath index 3628e3368..35386b94b 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 ffbf9b784..d485022b4 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 893dc7948..47ebfe88a 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.700.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.logback.feature/feature.xml b/org.eclipse.m2e.logback.feature/feature.xml index 12360826a..067c7852c 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 ffbf9b784..d485022b4 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 55050e698..2c576a213 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.200.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 3628e3368..35386b94b 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 9478cb165..1e0cb16bb 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 07496e778..5bf8b5cf2 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.600.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.pde.connector.tests/.classpath b/org.eclipse.m2e.pde.connector.tests/.classpath index 427e49b0d..c9bfedfe9 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 62ef3488c..23fa13b17 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 6590357ea..00a679983 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/.classpath b/org.eclipse.m2e.pde.connector/.classpath index 3628e3368..35386b94b 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 d4540a53f..3a79233b1 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 b11a785ba..09e44d986 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.700.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)", diff --git a/org.eclipse.m2e.pde.target/.classpath b/org.eclipse.m2e.pde.target/.classpath index 3628e3368..35386b94b 100644 --- a/org.eclipse.m2e.pde.target/.classpath +++ b/org.eclipse.m2e.pde.target/.classpath @@ -1,6 +1,6 @@ - + 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 41ecaee8f..5ddee747a 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 3b25ea985..877345cab 100644 --- a/org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ 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.600.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", diff --git a/org.eclipse.m2e.pde.ui/.classpath b/org.eclipse.m2e.pde.ui/.classpath index 3628e3368..35386b94b 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 d4540a53f..3a79233b1 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 7e4bcf7fc..75caf154f 100644 --- a/org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ 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.500.qualifier +Bundle-Version: 2.1.0.qualifier 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.profiles.core.tests/.classpath b/org.eclipse.m2e.profiles.core.tests/.classpath index 427e49b0d..c9bfedfe9 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 d4540a53f..3a79233b1 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 deae4bfc3..17357177e 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 3628e3368..35386b94b 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 ffbf9b784..d485022b4 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 821f37ca6..c1844ab8d 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.300.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 3628e3368..35386b94b 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 ffbf9b784..d485022b4 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 0334eeb56..5ff539a33 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.400.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.refactoring/.classpath b/org.eclipse.m2e.refactoring/.classpath index 3628e3368..35386b94b 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 ef651b4aa..6e580e3f0 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 4987f3643..e994f4c65 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.400.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.scm/.classpath b/org.eclipse.m2e.scm/.classpath index 3628e3368..35386b94b 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 ffbf9b784..d485022b4 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 41d55808c..88f89ce79 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.300.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 c132f5a4e..d18ed565a 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 3628e3368..35386b94b 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 62ef3488c..23fa13b17 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 daa15347b..99565a123 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.500.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 3628e3368..35386b94b 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 62ef3488c..23fa13b17 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 15a1d1a78..024187191 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.tests.common/.classpath b/org.eclipse.m2e.tests.common/.classpath index 427e49b0d..c9bfedfe9 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 552f7d659..04e853bea 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 4955de6e3..fc56f920e 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.800.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 From aa4f8258870daaaa070dfc5e337a1f1e4020c06b Mon Sep 17 00:00:00 2001 From: Thomas Reinhardt Date: Mon, 30 Sep 2024 08:57:28 +0200 Subject: [PATCH 24/45] Import Maven Projects wizard does not sort projects --- .../ui/internal/wizards/MavenImportWizardPage.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) 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 dffd36df0..a4e5e6fca 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; From 7c195df69383cc2798775df0fd4e169e3e843de5 Mon Sep 17 00:00:00 2001 From: Patrick Ziegler Date: Tue, 27 Aug 2024 21:26:10 +0200 Subject: [PATCH 25/45] Migrate RCPTT test for MavenTargetDependencyEditor to SWTBot In the long run, using RCPTT is probably causing more trouble than it's worth. It therefore makes sense to switch to a more lightweight solution like SWTBot for testing. --- .../META-INF/MANIFEST.MF | 2 +- .../target/MavenTargetLocationFactory.java | 3 +- org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF | 1 + org.eclipse.m2e.rcptt.tests/.project | 23 - org.eclipse.m2e.rcptt.tests/pom.xml | 44 -- org.eclipse.m2e.rcptt.tests/rcptt.properties | 9 - .../DependencyEditorTest.test | 296 ------------ .../_Context/WorkspaceWithTargetPlatform.ctx | 60 --- .../Empty Log Verification.verification | 25 - org.eclipse.m2e.swtbot.tests/.classpath | 21 + org.eclipse.m2e.swtbot.tests/.project | 34 ++ .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 14 + .../META-INF/MANIFEST.MF | 14 + org.eclipse.m2e.swtbot.tests/build.properties | 4 + org.eclipse.m2e.swtbot.tests/pom.xml | 48 ++ .../ui/MavenTargetDependencyEditorTest.java | 449 ++++++++++++++++++ pom.xml | 2 +- target-platform/target-platform.target | 4 + 19 files changed, 592 insertions(+), 461 deletions(-) delete mode 100644 org.eclipse.m2e.rcptt.tests/.project delete mode 100644 org.eclipse.m2e.rcptt.tests/pom.xml delete mode 100644 org.eclipse.m2e.rcptt.tests/rcptt.properties delete mode 100644 org.eclipse.m2e.rcptt.tests/src/Tests/org.eclipse.m2e.pde.ui/DependencyEditorTest.test delete mode 100644 org.eclipse.m2e.rcptt.tests/src/Tests/org.eclipse.m2e.pde.ui/_Context/WorkspaceWithTargetPlatform.ctx delete mode 100644 org.eclipse.m2e.rcptt.tests/src/Verification/Empty Log Verification.verification create mode 100644 org.eclipse.m2e.swtbot.tests/.classpath create mode 100644 org.eclipse.m2e.swtbot.tests/.project rename {org.eclipse.m2e.rcptt.tests => org.eclipse.m2e.swtbot.tests}/.settings/org.eclipse.core.resources.prefs (100%) create mode 100644 org.eclipse.m2e.swtbot.tests/.settings/org.eclipse.jdt.core.prefs create mode 100644 org.eclipse.m2e.swtbot.tests/META-INF/MANIFEST.MF create mode 100644 org.eclipse.m2e.swtbot.tests/build.properties create mode 100644 org.eclipse.m2e.swtbot.tests/pom.xml create mode 100644 org.eclipse.m2e.swtbot.tests/src/org/eclipse/m2e/pde/ui/MavenTargetDependencyEditorTest.java diff --git a/org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF b/org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF index 877345cab..96f8d01c9 100644 --- a/org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)", 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 d56e52b33..41a1f5546 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/META-INF/MANIFEST.MF b/org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF index 75caf154f..bb09df6d0 100644 --- a/org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF @@ -3,6 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: M2E PDE Integration UI Bundle-SymbolicName: org.eclipse.m2e.pde.ui;singleton:=true 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-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.19.0", diff --git a/org.eclipse.m2e.rcptt.tests/.project b/org.eclipse.m2e.rcptt.tests/.project deleted file mode 100644 index be8e53a35..000000000 --- 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 8f877c8dc..000000000 --- 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 2411fe50b..000000000 --- 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 cc820b2a1..000000000 --- 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 bf7434a66..000000000 --- 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 56be46340..000000000 --- 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.swtbot.tests/.classpath b/org.eclipse.m2e.swtbot.tests/.classpath new file mode 100644 index 000000000..9479140d1 --- /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 000000000..678256ff9 --- /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 000000000..66dee60c5 --- /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 000000000..c2678674f --- /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 000000000..34d2e4d2d --- /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 000000000..84516854b --- /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 000000000..6cbf0252a --- /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/pom.xml b/pom.xml index af61929dc..7fd9a8ab3 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ products - org.eclipse.m2e.rcptt.tests + org.eclipse.m2e.swtbot.tests diff --git a/target-platform/target-platform.target b/target-platform/target-platform.target index 4f8d9476d..96f134caa 100644 --- a/target-platform/target-platform.target +++ b/target-platform/target-platform.target @@ -45,6 +45,10 @@ + + + + From bbb10c778473cf7f485034d0e396a93e402b84df Mon Sep 17 00:00:00 2001 From: Patrick Ziegler Date: Sat, 31 Aug 2024 17:21:33 +0200 Subject: [PATCH 26/45] Remove obsolete packaging format in the p2-director-plugin The "tar.gz" archive format for Windows was only needed for RCPTT. With migrating to SWTBot, the default settings can be used. --- pom.xml | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/pom.xml b/pom.xml index 7fd9a8ab3..34d6fef79 100644 --- a/pom.xml +++ b/pom.xml @@ -160,29 +160,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 From 6e92f5991fe9c95462eb163defb31bfdba9781a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Thu, 3 Oct 2024 09:01:45 +0300 Subject: [PATCH 27/45] Stop building products No longer needed for tests --- Jenkinsfile | 1 - pom.xml | 4 ---- 2 files changed, 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a755cabc3..046761974 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,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' } } diff --git a/pom.xml b/pom.xml index 34d6fef79..a4930719f 100644 --- a/pom.xml +++ b/pom.xml @@ -90,10 +90,6 @@ org.eclipse.m2e.apt.tests org.eclipse.m2e.pde.connector.tests org.eclipse.m2e.pde.target.tests - - - products - org.eclipse.m2e.swtbot.tests From f0082f5b8799144011d81fbe3553a664de4b4639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Thu, 3 Oct 2024 10:15:36 +0300 Subject: [PATCH 28/45] Fix syntax error in shell script for deploy Ubuntu uses dash as default shell thus explicitly call bash. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 046761974..f5fc5ff42 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -55,6 +55,7 @@ pipeline { steps { sshagent ( ['projects-storage.eclipse.org-bot-ssh']) { sh ''' + #!/bin/bash deployM2ERepository() { echo Deploy m2e repo to ${1} From 966b76d1c4fa4cacdb1e5f736db8ecf7613b0fe8 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Thu, 3 Oct 2024 11:17:19 +0200 Subject: [PATCH 29/45] [Build] Fix specification of bash as shell for deployment The shebang has to be placed at the very first line of an sh-script in order to have an effect. Additionally improve formatting of the Jenkinsfile. --- Jenkinsfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f5fc5ff42..c5d9c29dd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { timestamps() } agent { - label "ubuntu-latest" + label 'ubuntu-latest' } tools { maven 'apache-maven-3.9.9' @@ -53,9 +53,8 @@ pipeline { branch 'master' } steps { - sshagent ( ['projects-storage.eclipse.org-bot-ssh']) { - sh ''' - #!/bin/bash + sshagent(['projects-storage.eclipse.org-bot-ssh']) { + sh '''#!/bin/bash deployM2ERepository() { echo Deploy m2e repo to ${1} From 28ae2156a9279cf858f1893d6930662ca1c8feb2 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Thu, 3 Oct 2024 14:46:00 +0200 Subject: [PATCH 30/45] [Build] Use bash explicitly in first build step to fix signing See https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/5061 --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c5d9c29dd..ca30d6ba2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,7 +25,7 @@ pipeline { string(credentialsId: 'gpg-passphrase', variable: 'KEYRING_PASSPHRASE') ]) { xvnc(useXauthority: true) { - sh ''' + sh '''#!/bin/bash -x mavenArgs="clean verify --batch-mode -Dmaven.test.error.ignore=true -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 -DDtycho.pgp.signer.bc.secretKeys="${KEYRING}" -Dgpg.passphrase="${KEYRING_PASSPHRASE}" @@ -54,7 +54,7 @@ pipeline { } steps { sshagent(['projects-storage.eclipse.org-bot-ssh']) { - sh '''#!/bin/bash + sh '''#!/bin/bash -x deployM2ERepository() { echo Deploy m2e repo to ${1} From 4e83fd311f6d64928c7a15f0c0e8472601f2f37f Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Thu, 3 Oct 2024 12:31:23 +0200 Subject: [PATCH 31/45] [Build] Remove irrelevant propertys and build in parallel at GH --- .github/workflows/maven.yml | 4 ++-- Jenkinsfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index c46837087..eba2570b1 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -46,9 +46,9 @@ 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 diff --git a/Jenkinsfile b/Jenkinsfile index ca30d6ba2..ace6a374e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,7 +26,7 @@ pipeline { ]) { xvnc(useXauthority: true) { sh '''#!/bin/bash -x - mavenArgs="clean verify --batch-mode -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true -Dtycho.p2.baselineMode=failCommon" + 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 -DDtycho.pgp.signer.bc.secretKeys="${KEYRING}" -Dgpg.passphrase="${KEYRING_PASSPHRASE}" else From 44c00e7c612e4147abc6d20019409674cc39321f Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Thu, 3 Oct 2024 18:25:26 +0200 Subject: [PATCH 32/45] [Build] Fix definition of pgp-secretKeys property to fix pgp signing --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ace6a374e..3428f1036 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,7 +28,7 @@ pipeline { 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 -DDtycho.pgp.signer.bc.secretKeys="${KEYRING}" -Dgpg.passphrase="${KEYRING_PASSPHRASE}" + mvn ${mavenArgs} -Peclipse-sign,its -Dtycho.pgp.signer.bc.secretKeys="${KEYRING}" -Dgpg.passphrase="${KEYRING_PASSPHRASE}" else # Clear signing environment variables for PRs export KEYRING='EMPTY' From 13511d165cb17309afce337af7f7f9a17b6f8c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Fri, 4 Oct 2024 08:25:04 +0300 Subject: [PATCH 33/45] Move TycohConnectorTest project to Java 21 Effort to stabilize tests on MacOS. --- .../tycho/pde.tycho.plugin.with.ds/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 46fe6ebda..ccdd464df 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 From 40cae5e905bc4eea6e9000baf833345d6db5761a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Fri, 4 Oct 2024 08:26:37 +0300 Subject: [PATCH 34/45] Update m2e-core-tests to latest --- m2e-core-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m2e-core-tests b/m2e-core-tests index 5e95de034..c153faa8a 160000 --- a/m2e-core-tests +++ b/m2e-core-tests @@ -1 +1 @@ -Subproject commit 5e95de034029ec17c2cac2a4914757f80428d544 +Subproject commit c153faa8aa9286f51fa35b7123718a96fc3a7bd5 From 8bd12b6811f33311e4293c34a48690ed736fb43c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Fri, 4 Oct 2024 13:24:43 +0300 Subject: [PATCH 35/45] Stabilize EditorTest Query completions via LSContentAssistProcessor rather than complicated (and unstable ) way through opened shells. --- .../m2e/editor/lemminx/tests/EditorTest.java | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) 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 e0dce907a..76e239851 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; + } + } From 12f6bec449cfa29fa0aaa9302e8102821fba9362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Fri, 4 Oct 2024 15:19:27 +0300 Subject: [PATCH 36/45] TychoConnectorTest move to Java 21 GH builder for MacOS fails with "M2EClasspath Container not found! (org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17[CPE_CONTAINER][K_SOURCE][isExported:false], org.eclipse.pde.core.requiredPlugins[CPE_CONTAINER][K_SOURCE][isExported:false], /pde.tycho.plugin/src/[CPE_SOURCE][K_SOURCE][isExported:false]". Move up to get more stable tests. --- .../projects/tycho/.mvn/extensions.xml | 2 +- .../projects/tycho/pde.tycho.plugin/META-INF/MANIFEST.MF | 2 +- .../tycho/pde.tycho.pomless.plugin/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.pde.connector.tests/projects/tycho/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 6235ae1bc..568530568 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/META-INF/MANIFEST.MF b/org.eclipse.m2e.pde.connector.tests/projects/tycho/pde.tycho.plugin/META-INF/MANIFEST.MF index b5aa3a293..d9354ef6d 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 622fb739e..2d278c48e 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 44c19b785..bcbddfb4d 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 From 6b94b54d1601dc07cfd71cbd2e4b0563afdf06f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Fri, 4 Oct 2024 14:53:28 +0300 Subject: [PATCH 37/45] Stop jarsigning PGP sign is enough, simrel no longer requires jarsigning and build becomes faster and more stable without the network roadtrips caused by eclipse-jarsigner. --- m2e-parent/pom.xml | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/m2e-parent/pom.xml b/m2e-parent/pom.xml index 8f4705fcf..b698432b3 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 From 6c4073b2d4098112fcaeb79754715eb5b16900b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 11:38:27 +0000 Subject: [PATCH 38/45] Bump actions/cache from 4.0.2 to 4.1.0 Bumps [actions/cache](https://github.com/actions/cache) from 4.0.2 to 4.1.0. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/0c45773b623bea8c8e75f6c82b208c3cf94ea4f9...2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index eba2570b1..7d84e3346 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,7 +35,7 @@ jobs: with: maven-version: 3.9.9 - name: Cache local Maven repository - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 + uses: actions/cache@2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2 # v4.1.0 with: path: ~/.m2/repository # re-cache on changes in the pom and target files From b62f64a718b776c90bb57b9733a9b0223da54d57 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 11:49:06 +0000 Subject: [PATCH 39/45] Bump actions/checkout from 4.2.0 to 4.2.1 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.0 to 4.2.1. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/d632683dd7b4114ad314bca15554477dd762a938...eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 7d84e3346..706bb6273 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -20,7 +20,7 @@ jobs: timeout-minutes: 45 steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: fetch-depth: 0 submodules: true From cd265cd4b80fe413b4e1c5b278d5c1fac8f00f49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 11:49:02 +0000 Subject: [PATCH 40/45] Bump actions/upload-artifact from 4.4.0 to 4.4.1 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.4.0 to 4.4.1. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/50769540e7f4bd5e21e526ee35c689e35e0d6874...604373da6381bf24206979c74d06a550515601b9) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 706bb6273..2ca7884e8 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -51,7 +51,7 @@ jobs: -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@604373da6381bf24206979c74d06a550515601b9 # v4.4.1 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@604373da6381bf24206979c74d06a550515601b9 # v4.4.1 with: name: Event File path: ${{ github.event_path }} From 526721b29fa4cd4c1e4283c67612ba0d8c3af6fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 12:02:42 +0000 Subject: [PATCH 41/45] Bump actions/cache from 4.1.0 to 4.1.1 Bumps [actions/cache](https://github.com/actions/cache) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2...3624ceb22c1c5a301c8db4169662070a689d9ea8) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 2ca7884e8..1834191ab 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,7 +35,7 @@ jobs: with: maven-version: 3.9.9 - name: Cache local Maven repository - uses: actions/cache@2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2 # v4.1.0 + uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1 with: path: ~/.m2/repository # re-cache on changes in the pom and target files From 3db2e23dd30914a6c4d2a50e4c5e7e0dd08aee01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 12:02:40 +0000 Subject: [PATCH 42/45] Bump actions/upload-artifact from 4.4.1 to 4.4.2 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.4.1 to 4.4.2. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/604373da6381bf24206979c74d06a550515601b9...84480863f228bb9747b473957fcc9e309aa96097) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 1834191ab..6ad068ea4 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -51,7 +51,7 @@ jobs: -Dmaven.test.failure.ignore=true -Dtycho.surefire.deleteWorkDir=true - name: Upload Test Results - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4.4.1 + uses: actions/upload-artifact@84480863f228bb9747b473957fcc9e309aa96097 # v4.4.2 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@604373da6381bf24206979c74d06a550515601b9 # v4.4.1 + uses: actions/upload-artifact@84480863f228bb9747b473957fcc9e309aa96097 # v4.4.2 with: name: Event File path: ${{ github.event_path }} From 51c902cd34c20d6b5ca4378323973db9ac26bd03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 11:59:50 +0000 Subject: [PATCH 43/45] Bump actions/upload-artifact from 4.4.2 to 4.4.3 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.4.2 to 4.4.3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/84480863f228bb9747b473957fcc9e309aa96097...b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 6ad068ea4..3a98273e7 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -51,7 +51,7 @@ jobs: -Dmaven.test.failure.ignore=true -Dtycho.surefire.deleteWorkDir=true - name: Upload Test Results - uses: actions/upload-artifact@84480863f228bb9747b473957fcc9e309aa96097 # v4.4.2 + 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@84480863f228bb9747b473957fcc9e309aa96097 # v4.4.2 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 with: name: Event File path: ${{ github.event_path }} From 99d6e7eca30bdd03f002081d54ac06993f36ac21 Mon Sep 17 00:00:00 2001 From: Ed Merks Date: Thu, 10 Oct 2024 14:59:39 +0200 Subject: [PATCH 44/45] Provide improved support for long property values - Make the MavenPropertyDialog resizeable and provide dialog settings to remember the size. - Use a table layout for the property table of the MavenLaunchMainTab. --- .../internal/dialogs/MavenPropertyDialog.java | 25 ++++++++++++++++++- .../internal/launch/MavenLaunchMainTab.java | 12 +++++++-- 2 files changed, 34 insertions(+), 3 deletions(-) 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 15067fc76..79256e8b6 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.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 3d1f40a46..19bb3b9f7 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); From ac92e4ae7da7933d744e2c4400fba4247e79c5d9 Mon Sep 17 00:00:00 2001 From: Ed Merks Date: Fri, 11 Oct 2024 08:42:45 +0200 Subject: [PATCH 45/45] Avoid grabbing focus when creating the launch configuration main tab - Normally one can, in the Run Configurations dialog, use the keyboard in the left control to navigate each of the launch configurations but that does work for m2e because the configuration control grabs away the focus. --- .../org/eclipse/m2e/ui/internal/launch/MavenLaunchMainTab.java | 2 -- 1 file changed, 2 deletions(-) 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 19bb3b9f7..6f03c80eb 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 @@ -412,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() {