Merge pull request #54 from jGauravGupta/FISH-6552-2-3

FISH-6552 Fixes plugin installation error in Eclipse IDE 2022-09
payara · Sep 27, 2022 · 4009270 · 4009270
2 parents 0568868 + eaa8a6f
commit 4009270
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 17 deletions.
diff --git a/features/org.eclipse.payara.tools.everything/feature.xml b/features/org.eclipse.payara.tools.everything/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<feature id="org.eclipse.payara.tools.everything" label="Payara Tools Build Wrapper" provider-name="Eclipse.org - Payara Tools" version="1.4.2.qualifier">
+<feature id="org.eclipse.payara.tools.everything" label="Payara Tools Build Wrapper" provider-name="Eclipse.org - Payara Tools" version="1.4.3.qualifier">
 
    <includes id="org.eclipse.payara.tools" version="0.0.0"/>
    <includes id="org.eclipse.payara.tools.source" version="0.0.0"/>

diff --git a/features/org.eclipse.payara.tools.source/feature.xml b/features/org.eclipse.payara.tools.source/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<feature id="org.eclipse.payara.tools.source" label="%featureName" provider-name="%providerName" version="1.4.2.qualifier">
+<feature id="org.eclipse.payara.tools.source" label="%featureName" provider-name="%providerName" version="1.4.3.qualifier">
 
    <description>
       %featureDescription

diff --git a/features/org.eclipse.payara.tools/feature.xml b/features/org.eclipse.payara.tools/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.payara.tools"
       label="%featureName"
-      version="1.4.2.qualifier"
+      version="1.4.3.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.payara.tools">
 
@@ -31,7 +31,7 @@
       <import feature="org.eclipse.sapphire.platform" version="9.1" match="compatible"/>
       <import feature="org.eclipse.sapphire.ui" version="9.1" match="compatible"/>
       <import feature="org.eclipse.sapphire.ui.swt.xml.editor" version="9.1" match="compatible"/>
-      <import feature="org.eclipse.m2e.feature" version="1.15" match="compatible"/>
+      <import feature="org.eclipse.m2e.feature" version="1.15" match="greaterOrEqual"/>
       <import plugin="org.apache.xerces"/>
       <import plugin="org.apache.ant"/>
       <import plugin="org.eclipse.core.externaltools"/>

diff --git a/plugins/org.eclipse.payara.tools.jver/META-INF/MANIFEST.MF b/plugins/org.eclipse.payara.tools.jver/META-INF/MANIFEST.MF
@@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %BundleName
 Bundle-Vendor: %BundleVendor
 Bundle-SymbolicName: org.eclipse.payara.tools.jver
-Bundle-Version: 1.4.2.qualifier
+Bundle-Version: 1.4.3.qualifier
 Bundle-Localization: bundle
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.payara.tools.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.payara.tools.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.payara.tools.ui;singleton:=true
-Bundle-Version: 1.4.2.qualifier
+Bundle-Version: 1.4.3.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin

diff --git a/plugins/org.eclipse.payara.tools/META-INF/MANIFEST.MF b/plugins/org.eclipse.payara.tools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.payara.tools;singleton:=true
-Bundle-Version: 1.4.2.qualifier
+Bundle-Version: 1.4.3.qualifier
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.payara.tools.PayaraToolsPlugin
 Bundle-Vendor: %providerName
@@ -41,14 +41,8 @@ Require-Bundle:
  org.eclipse.jem.util,
  org.eclipse.m2e.core,
  org.junit,
- org.junit.platform.commons,
- org.junit.platform.engine,
- org.junit.platform.launcher,
- org.junit.platform.runner,
- org.junit.platform.suite.api,
  org.hamcrest.core,
- org.opentest4j,
- org.apiguardian
+ org.opentest4j
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.payara.tools;
   uses:="org.eclipse.debug.core,

diff --git a/releng/corundum-src/macros/build-repository.xml b/releng/corundum-src/macros/build-repository.xml
@@ -85,12 +85,12 @@
             <create-inventory eclipse="${.target}" dest="${build.dir}/repository/temp/max-platform-inventory.txt"/>
           </with-target>
 
-          <set-bundle-version-constraints
+<!--          <set-bundle-version-constraints
             minPlatformInventory="${build.dir}/repository/temp/min-platform-inventory.txt"
             targetPlatformInventory="${build.dir}/repository/temp/max-platform-inventory.txt"
             pluginsDirectory="${build.dir}/repository/temp"
             excludes="${require.bundle.version.constraint.excludes}"
-            rules="${require.bundle.version.constraint.rules}"/>
+            rules="${require.bundle.version.constraint.rules}"/>-->
 
           <!-- Stage 5 -->
 

diff --git a/releng/corundum-src/resources/m2e.properties b/releng/corundum-src/resources/m2e.properties
@@ -14,6 +14,6 @@ org.eclipse.m2e.sdk.feature.feature.group
 
 rep.eclipse.m2e-1.8 = https://download.eclipse.org/technology/m2e/releases/1.8/
 rep.eclipse.m2e-1.8.0 = https://download.eclipse.org/technology/m2e/releases/1.8/1.8.0.20170516-2043/
-rep.eclipse.m2e-1.15 = https://download.eclipse.org/technology/m2e/releases/1.15/1.15.0.20200310-1746/
+rep.eclipse.m2e-1.15 = https://raw.githubusercontent.com/payara/ecosystem-eclipse-plugin/release-artifacts/repository/libs/m2e/1.15/
 
 rep.eclipse.m2e-latest = ${rep.eclipse.m2e-1.15}