update for 4.26

UrsZeidler · Nov 9, 2023 · 49adf2f · 49adf2f
1 parent fe0d4e6
commit 49adf2f
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 219 deletions.
diff --git a/de.urszeidler.emf.commons.ui/META-INF/MANIFEST.MF b/de.urszeidler.emf.commons.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Automatic-Module-Name: de.urszeidler.emf.commons.ui
 Bundle-Name: EMF Commons ui
 Bundle-SymbolicName: de.urszeidler.emf.commons.ui
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Urs Zeidler
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.emf.edit.ui;visibility:=reexport,

diff --git a/de.urszeidler.shr5.feature/feature.xml b/de.urszeidler.shr5.feature/feature.xml
@@ -37,7 +37,7 @@
       <import plugin="org.eclipse.core.databinding.beans" version="1.2.200" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.databinding.property" version="1.4.200" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jface.databinding" version="1.6.200" match="greaterOrEqual"/>
-      <import plugin="de.urszeidler.emf.commons.ui" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="de.urszeidler.emf.commons.ui" version="1.1.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.filesystem" version="1.4.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.nebula.paperclips.core" version="2.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.nebula.paperclips.widgets" version="2.0.0" match="greaterOrEqual"/>
@@ -76,8 +76,6 @@
       <import plugin="org.eclipse.jetty.server"/>
       <import plugin="org.eclipse.jetty.servlet"/>
       <import plugin="org.eclipse.jetty.util"/>
-      <import plugin="org.mortbay.jetty.server"/>
-      <import plugin="org.mortbay.jetty.util"/>
       <import plugin="org.eclipse.osgi.services"/>
       <import plugin="org.eclipse.equinox.jsp.jasper"/>
       <import plugin="org.eclipse.equinox.jsp.jasper.registry"/>
@@ -86,6 +84,7 @@
       <import plugin="com.ibm.icu"/>
       <import plugin="org.eclipse.emf.common"/>
       <import plugin="com.google.guava" version="15.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.help.base"/>
    </requires>
 
    <plugin
@@ -213,4 +212,11 @@
          version="0.3.0.qualifier"
          unpack="false"/>
 
+   <plugin
+         id="de.urszeidler.emf.commons.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/de.urszeidler.shr5.help/META-INF/MANIFEST.MF b/de.urszeidler.shr5.help/META-INF/MANIFEST.MF
@@ -7,8 +7,10 @@ Bundle-Activator: de.urszeidler.shr5.help.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.ui.intro,
- de.urszeidler.shr5.ecp
+ org.eclipse.ui.intro;bundle-version="3.6.600",
+ org.eclipse.core.expressions;bundle-version="3.8.200",
+ de.urszeidler.shr5.ecp,
+ org.eclipse.ui.forms;bundle-version="3.11.500"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: de.urszeidler.shr5.help
diff --git a/de.urszeidler.shr5.model.edit/META-INF/MANIFEST.MF b/de.urszeidler.shr5.model.edit/META-INF/MANIFEST.MF
@@ -13,6 +13,6 @@ Export-Package: de.urszeidler.eclipse.shr5.provider,
  de.urszeidler.shr5.model.edit.preferences
 Require-Bundle: org.eclipse.core.runtime,
  de.urszeidler.shr5.model;visibility:=reexport,
- de.urszeidler.emf.commons.ui;bundle-version="1.0.0";visibility:=reexport
+ de.urszeidler.emf.commons.ui;bundle-version="2.0.0";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: de.urszeidler.shr5.model.edit
diff --git a/de.urszeidler.shr5.product.build/shadowrun.product b/de.urszeidler.shr5.product.build/shadowrun.product
@@ -59,7 +59,6 @@ and apache fop (http://xmlgraphics.apache.org/fop/).
    <vm>
    </vm>
 
-
    <plugins>
       <plugin id="com.google.guava"/>
       <plugin id="com.ibm.icu"/>
@@ -87,29 +86,17 @@ and apache fop (http://xmlgraphics.apache.org/fop/).
       <plugin id="javax.el"/>
       <plugin id="javax.inject"/>
       <plugin id="javax.servlet"/>
-      <plugin id="javax.servlet.jsp"/>
+      <plugin id="javax.servlet.jsp-api"/>
       <plugin id="javax.xml"/>
       <plugin id="lpg.runtime.java"/>
-      <plugin id="org.apache.batik.bridge"/>
       <plugin id="org.apache.batik.css"/>
-      <plugin id="org.apache.batik.dom"/>
-      <plugin id="org.apache.batik.dom.svg"/>
-      <plugin id="org.apache.batik.ext.awt"/>
-      <plugin id="org.apache.batik.parser"/>
-      <plugin id="org.apache.batik.svggen"/>
-      <plugin id="org.apache.batik.transcoder"/>
       <plugin id="org.apache.batik.util"/>
-      <plugin id="org.apache.batik.util.gui"/>
-      <plugin id="org.apache.batik.xml"/>
       <plugin id="org.apache.commons.codec"/>
       <plugin id="org.apache.commons.io"/>
       <plugin id="org.apache.commons.jxpath"/>
       <plugin id="org.apache.commons.logging"/>
       <plugin id="org.apache.felix.scr"/>
       <plugin id="org.apache.jasper.glassfish"/>
-      <plugin id="org.apache.xerces"/>
-      <plugin id="org.apache.xml.resolver"/>
-      <plugin id="org.apache.xml.serializer"/>
       <plugin id="org.eclipse.acceleo.common"/>
       <plugin id="org.eclipse.acceleo.engine"/>
       <plugin id="org.eclipse.acceleo.model"/>
@@ -319,6 +306,7 @@ and apache fop (http://xmlgraphics.apache.org/fop/).
       <plugin id="org.eclipse.equinox.servletbridge"/>
       <plugin id="org.eclipse.equinox.transforms.hook" fragment="true"/>
       <plugin id="org.eclipse.help"/>
+      <plugin id="org.eclipse.help.base"/>
       <plugin id="org.eclipse.help.nl_de" fragment="true"/>
       <plugin id="org.eclipse.jetty.http"/>
       <plugin id="org.eclipse.jetty.io"/>
@@ -363,8 +351,6 @@ and apache fop (http://xmlgraphics.apache.org/fop/).
       <plugin id="org.eclipse.ui.workbench.nl_de" fragment="true"/>
       <plugin id="org.eclipse.zest.core"/>
       <plugin id="org.eclipse.zest.layouts"/>
-      <plugin id="org.mortbay.jetty.server"/>
-      <plugin id="org.mortbay.jetty.util"/>
       <plugin id="org.tukaani.xz"/>
       <plugin id="org.w3c.css.sac"/>
       <plugin id="org.w3c.dom.events"/>

diff --git a/de.urszeidler.shr5.product.feature/feature.xml b/de.urszeidler.shr5.product.feature/feature.xml
@@ -354,68 +354,7 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.batik.svggen"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.batik.transcoder"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.xerces"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.xml.resolver"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 
-   <plugin
-         id="org.apache.xml.serializer"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.batik.bridge"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.batik.dom"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.batik.dom.svg"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.batik.ext.awt"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 
    <plugin
          id="org.apache.batik.util"
@@ -424,27 +363,13 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.batik.xml"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.w3c.dom.svg"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.batik.parser"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.ui.intro"
          download-size="0"
@@ -494,13 +419,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.jetty.continuation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.jetty.http"
          download-size="0"
@@ -564,20 +482,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.mortbay.jetty.server"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.mortbay.jetty.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.equinox.servletbridge"
          download-size="0"
@@ -586,7 +490,7 @@
          unpack="false"/>
 
    <plugin
-         id="javax.servlet.jsp"
+         id="javax.servlet.jsp-api"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -648,14 +552,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.ecf.provider.filetransfer.httpclient4.ssl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.ecf.provider.filetransfer.ssl"
          download-size="0"
@@ -814,16 +710,6 @@
          fragment="true"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.equinox.security.win32.x86"
-         os="win32"
-         arch="x86"
-         download-size="22"
-         install-size="47"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.equinox.security.win32.x86_64"
          os="win32"
@@ -884,48 +770,48 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.ecf.provider.filetransfer.httpclient4"
+         id="org.eclipse.ui.cheatsheets"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.apache.httpcomponents.httpclient"
+         id="org.eclipse.jdt.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.apache.httpcomponents.httpcore"
+         id="org.eclipse.ui.themes"
          download-size="0"
          install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
-         id="org.eclipse.ui.cheatsheets"
+         id="org.tukaani.xz"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.jdt.core"
+         id="org.eclipse.ecf.provider.filetransfer.httpclient5"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.ui.themes"
+         id="org.apache.httpcomponents.client5.httpclient5"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
-         id="org.tukaani.xz"
+         id="org.apache.httpcomponents.core5.httpcore5"
          download-size="0"
          install-size="0"
          version="0.0.0"

diff --git a/de.urszeidler.shr5.product.simple/shadowrun.product b/de.urszeidler.shr5.product.simple/shadowrun.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="RCP schadowrun simple" uid="de.urszeidler.shr5.rcp.product.simple" id="de.urszeidler.shr5.product.shr5" application="de.urszeidler.shr5.product.app" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="RCP schadowrun simple" uid="de.urszeidler.shr5.rcp.product.simple" id="de.urszeidler.shr5.product.shr5" application="de.urszeidler.shr5.product.app" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true">
 
    <aboutInfo>
       <image path="icons/shrImage_6_250.png"/>
@@ -65,7 +65,6 @@ and apache fop (http://xmlgraphics.apache.org/fop/).
    <features>
       <feature id="de.urszeidler.shr5.dependecies.feature" installMode="root"/>
       <feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/>
-      <feature id="de.urszeidler.emf.commons.feature"/>
       <feature id="de.urszeidler.shr5.feature"/>
       <feature id="de.urszeidler.shr5.localization.feature"/>
    </features>