Provide an Oomph setup and update dependencies to the latest versions

eclipse-nattable#95
merks · Jul 3, 2024 · b509fe1 · b509fe1
1 parent b8ee902
commit b509fe1
Show file tree

Hide file tree

Showing 13 changed files with 440 additions and 140 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,7 @@ org.eclipse.nebula.widgets.nattable.examples/src/examples.index
 org.eclipse.nebula.widgets.nattable.examples/src/**/Issue*.java
 
 .polyglot*
+
+.settings
+.project
+target-platform/target-platform-gen.target
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -3,6 +3,6 @@
   <extension>
     <groupId>org.eclipse.tycho</groupId>
     <artifactId>tycho-build</artifactId>
-    <version>4.0.7</version>
+    <version>4.0.8</version>
   </extension>
 </extensions>
diff --git a/org.eclipse.nebula.widgets.nattable.examples.e4.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.examples.e4.feature/feature.xml
@@ -19,10 +19,6 @@
       [Enter License Description here.]
    </license>
 
-   <requires>
-      <import plugin="org.slf4j.api"/>
-   </requires>
-
    <plugin
          id="org.eclipse.nebula.widgets.nattable.examples.e4"
          download-size="0"
@@ -45,15 +41,15 @@
          unpack="false"/>
 
    <plugin
-         id="org.slf4j.binding.simple"
+         id="slf4j.simple"
          download-size="0"
          install-size="0"
          version="0.0.0"
          fragment="true"
          unpack="false"/>
 
    <plugin
-         id="org.slf4j.api"
+         id="slf4j.api"
          download-size="0"
          install-size="0"
          version="0.0.0"

diff --git a/...gets.nattable.examples.e4.product/org.eclipse.nebula.widgets.nattable.examples.e4.product b/...gets.nattable.examples.e4.product/org.eclipse.nebula.widgets.nattable.examples.e4.product
@@ -324,11 +324,13 @@ version(s), and exceptions or additional permissions here}.&quot;
    </features>
 
    <configurations>
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2"/>
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2"/>
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4"/>
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2"/>
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2"/>
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1"/>
+      <plugin id="slf4j.simple" autoStart="true" startLevel="2"/>
    </configurations>
 
    <preferencesInfo>

diff --git a/org.eclipse.nebula.widgets.nattable.examples.e4.rcp.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.examples.e4.rcp.feature/feature.xml
@@ -25,14 +25,14 @@
    </requires>
 
    <plugin
-         id="javax.annotation"
+         id="jakarta.annotation-api"
          download-size="28"
          install-size="58"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="javax.inject"
+         id="jakarta.inject.jakarta.inject-api"
          download-size="16"
          install-size="28"
          version="0.0.0"
@@ -43,7 +43,7 @@
          download-size="347"
          install-size="720"
          version="0.0.0"
-         unpack="false"/>
+         unpack="false"/>u
 
    <plugin
          id="org.apache.batik.util"
@@ -302,13 +302,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.equinox.ds"
-         download-size="192"
-         install-size="394"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.equinox.event"
          download-size="33"
@@ -374,13 +367,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.equinox.util"
-         download-size="75"
-         install-size="139"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.jface"
          download-size="1061"
@@ -457,34 +443,6 @@
          fragment="true"
          unpack="false"/>
 
-   <plugin
-         id="org.w3c.css.sac"
-         download-size="37"
-         install-size="65"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.w3c.dom.events"
-         download-size="17"
-         install-size="26"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.w3c.dom.smil"
-         download-size="19"
-         install-size="37"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.w3c.dom.svg"
-         download-size="95"
-         install-size="140"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.apache.felix.scr"
          download-size="0"
@@ -521,7 +479,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.apache.commons.io"
+         id="org.apache.commons.commons-io"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -548,11 +506,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.ibm.icu.base"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/org.eclipse.nebula.widgets.nattable.examples.e4/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.examples.e4/META-INF/MANIFEST.MF
@@ -3,8 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: NatTable Eclipse 4 Examples
 Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.examples.e4;singleton:=true
 Bundle-Version: 2.4.0.qualifier
-Require-Bundle: javax.inject;bundle-version="0.0.0",
- org.eclipse.core.runtime;bundle-version="0.0.0",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
  org.eclipse.swt;bundle-version="0.0.0",
  org.eclipse.e4.ui.model.workbench;bundle-version="0.0.0",
  org.eclipse.jface;bundle-version="0.0.0",

diff --git a/org.eclipse.nebula.widgets.nattable.examples/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.examples/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: ca.odell.glazedlists,
  org.eclipse.nebula.widgets.nattable.extension.poi,
  org.eclipse.nebula.widgets.richtext,
  org.apache.commons.math3,
- org.apache.commons.collections4
+ org.apache.commons.commons-collections4
 Bundle-Vendor: Eclipse Nebula NatTable
 Export-Package: org.eclipse.nebula.widgets.nattable.examples,
  org.eclipse.nebula.widgets.nattable.examples.runner

diff --git a/org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature/feature.xml
@@ -27,7 +27,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.apache.commons.codec"
+         id="org.apache.commons.commons-codec"
          download-size="0"
          install-size="0"
          version="0.0.0"

diff --git a/org.eclipse.nebula.widgets.nattable.extension.poi.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.extension.poi.feature/feature.xml
@@ -41,7 +41,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.apache.commons.collections4"
+         id="org.apache.commons.commons-collections4"
          download-size="0"
          install-size="0"
          version="0.0.0"

diff --git a/org.eclipse.nebula.widgets.nattable.extension.poi/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.extension.poi/META-INF/MANIFEST.MF
@@ -5,10 +5,10 @@ Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.extension.poi
 Bundle-Version: 2.4.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.nebula.widgets.nattable.extension.poi;version="2.4.0"
-Import-Package: org.apache.poi.hssf.usermodel;version="[4.1.1,5.0.0)",
- org.apache.poi.ss.usermodel;version="[4.1.1,5.0.0)",
- org.apache.poi.ss.util;version="[4.1.1,5.0.0)",
- org.apache.poi.util;version="[4.1.1,5.0.0)",
+Import-Package: org.apache.poi.hssf.usermodel;version="[5.0.0,6.0.0)",
+ org.apache.poi.ss.usermodel;version="[5.0.0,6.0.0)",
+ org.apache.poi.ss.util;version="[5.0.0,6.0.0)",
+ org.apache.poi.util;version="[5.0.0,6.0.0)",
  org.eclipse.nebula.widgets.nattable.config;version="[2.4.0,3.0.0)",
  org.eclipse.nebula.widgets.nattable.export;version="[2.4.0,3.0.0)",
  org.eclipse.nebula.widgets.nattable.formula;version="[2.4.0,3.0.0)",

diff --git a/pom.xml b/pom.xml
@@ -65,7 +65,7 @@
 	</modules>
 
 	<properties>
-		<tycho-version>4.0.7</tycho-version>
+		<tycho-version>4.0.8</tycho-version>
         <cbi-version>1.3.4</cbi-version>
         <nattable-version>${project.version}</nattable-version>
 
@@ -168,7 +168,7 @@
 						</artifact>
 					</target>
 					<targetDefinitionIncludeSource>honor</targetDefinitionIncludeSource>
-					<executionEnvironment>JavaSE-11</executionEnvironment>
+					<executionEnvironment>JavaSE-17</executionEnvironment>
 					<environments>
 						<environment>
 							<os>win32</os>