Skip to content

Commit 66acc70

Browse files
committed
FISH-6552 Fixes plugin installation error in Eclipse IDE 2022-09
1 parent 0568868 commit 66acc70

4 files changed

Lines changed: 5 additions & 11 deletions

File tree

features/org.eclipse.payara.tools/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<import feature="org.eclipse.sapphire.platform" version="9.1" match="compatible"/>
3232
<import feature="org.eclipse.sapphire.ui" version="9.1" match="compatible"/>
3333
<import feature="org.eclipse.sapphire.ui.swt.xml.editor" version="9.1" match="compatible"/>
34-
<import feature="org.eclipse.m2e.feature" version="1.15" match="compatible"/>
34+
<import feature="org.eclipse.m2e.feature" version="1.15" match="greaterOrEqual"/>
3535
<import plugin="org.apache.xerces"/>
3636
<import plugin="org.apache.ant"/>
3737
<import plugin="org.eclipse.core.externaltools"/>

plugins/org.eclipse.payara.tools/META-INF/MANIFEST.MF

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,8 @@ Require-Bundle:
4141
org.eclipse.jem.util,
4242
org.eclipse.m2e.core,
4343
org.junit,
44-
org.junit.platform.commons,
45-
org.junit.platform.engine,
46-
org.junit.platform.launcher,
47-
org.junit.platform.runner,
48-
org.junit.platform.suite.api,
4944
org.hamcrest.core,
50-
org.opentest4j,
51-
org.apiguardian
45+
org.opentest4j
5246
Bundle-ActivationPolicy: lazy
5347
Export-Package: org.eclipse.payara.tools;
5448
uses:="org.eclipse.debug.core,

releng/corundum-src/macros/build-repository.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@
8585
<create-inventory eclipse="${.target}" dest="${build.dir}/repository/temp/max-platform-inventory.txt"/>
8686
</with-target>
8787

88-
<set-bundle-version-constraints
88+
<!-- <set-bundle-version-constraints
8989
minPlatformInventory="${build.dir}/repository/temp/min-platform-inventory.txt"
9090
targetPlatformInventory="${build.dir}/repository/temp/max-platform-inventory.txt"
9191
pluginsDirectory="${build.dir}/repository/temp"
9292
excludes="${require.bundle.version.constraint.excludes}"
93-
rules="${require.bundle.version.constraint.rules}"/>
93+
rules="${require.bundle.version.constraint.rules}"/>-->
9494

9595
<!-- Stage 5 -->
9696

releng/corundum-src/resources/m2e.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ org.eclipse.m2e.sdk.feature.feature.group
1414

1515
rep.eclipse.m2e-1.8 = https://download.eclipse.org/technology/m2e/releases/1.8/
1616
rep.eclipse.m2e-1.8.0 = https://download.eclipse.org/technology/m2e/releases/1.8/1.8.0.20170516-2043/
17-
rep.eclipse.m2e-1.15 = https://download.eclipse.org/technology/m2e/releases/1.15/1.15.0.20200310-1746/
17+
rep.eclipse.m2e-1.15 = https://raw.githubusercontent.com/payara/ecosystem-eclipse-plugin/release-artifacts/repository/libs/m2e/1.15/
1818

1919
rep.eclipse.m2e-latest = ${rep.eclipse.m2e-1.15}

0 commit comments

Comments
 (0)