From 59ed176c0c9c50e11d70e062806e23d7be31028c Mon Sep 17 00:00:00 2001 From: Ed Merks Date: Wed, 3 Jul 2024 11:58:02 +0200 Subject: [PATCH] Provide an Oomph setup and update dependencies to the latest versions https://github.com/eclipse-nattable/nattable/issues/95 --- .gitignore | 4 + .mvn/extensions.xml | 2 +- .../feature.xml | 8 +- ...ebula.widgets.nattable.examples.e4.product | 12 +- .../feature.xml | 57 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 2 +- .../feature.xml | 2 +- .../feature.xml | 2 +- .../META-INF/MANIFEST.MF | 8 +- pom.xml | 4 +- setup/NatTable.setup | 1538 +++++++++++++++++ setup/NatTableConfiguration.setup | 45 + target-platform/target-platform.target | 89 +- 14 files changed, 1637 insertions(+), 139 deletions(-) create mode 100644 setup/NatTable.setup create mode 100644 setup/NatTableConfiguration.setup diff --git a/.gitignore b/.gitignore index 4d127e422..40913e709 100644 --- 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 index 5db983b31..54d396717 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -3,6 +3,6 @@ org.eclipse.tycho tycho-build - 4.0.7 + 4.0.8 \ No newline at end of file diff --git a/org.eclipse.nebula.widgets.nattable.examples.e4.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.examples.e4.feature/feature.xml index efaf1b1b2..84ee23a58 100644 --- 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.] - - - - - - - - - + + + + + + + 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 index 2246d3d2f..7d233e0c9 100644 --- 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 @@ + unpack="false"/>u - - - - - - - - - - - - - - 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 index fee5ccd60..86567f698 100644 --- 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 index da394ea63..8d0d4a8a1 100644 --- 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 index 2d4a180bb..c3d9d2201 100644 --- 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"/> - 4.0.7 + 4.0.8 1.3.4 ${project.version} @@ -168,7 +168,7 @@ honor - JavaSE-11 + JavaSE-17 win32 diff --git a/setup/NatTable.setup b/setup/NatTable.setup new file mode 100644 index 000000000..d40f42e20 --- /dev/null +++ b/setup/NatTable.setup @@ -0,0 +1,1538 @@ + + + + + + + + + record + + + record + + + record + + + record + + + + + + + + + + + + + + + + + Define the JRE needed to compile and run the Java projects of ${scope.project.label} + + + Set the heap space needed to work with the projects of ${scope.project.label} + + + + + + + + Initialize JDT's package explorer to show working sets as its root objects + + <?xml version="1.0" encoding="UTF-8"?> + <section name="Workbench"> + <section name="org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart"> + <item value="true" key="group_libraries"/> + <item value="false" key="linkWithEditor"/> + <item value="2" key="layout"/> + <item value="2" key="rootMode"/> + <item value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#x0D;&#x0A;&lt;packageExplorer configured=&quot;true&quot; group_libraries=&quot;1&quot; layout=&quot;2&quot; linkWithEditor=&quot;0&quot; rootMode=&quot;2&quot; sortWorkingSets=&quot;false&quot; workingSetName=&quot;&quot;&gt;&#x0D;&#x0A;&lt;localWorkingSetManager&gt;&#x0D;&#x0A;&lt;workingSet editPageId=&quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1382792884467_1&quot; label=&quot;Other Projects&quot; name=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;/localWorkingSetManager&gt;&#x0D;&#x0A;&lt;activeWorkingSet workingSetName=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;allWorkingSets workingSetName=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;/packageExplorer&gt;" key="memento"/> + </section> + </section> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Choose the compatibility level of the target platform for the modular API baseline + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Install the tools needed in the IDE to work with the source code for ${scope.project.label} + + + + + github.remoteURIs + + + ${scope.project.label} Github repository + + + remoteURI + + + + + + ${scope.project.label} + + + + + <?xml version="1.0" encoding="UTF-8"?> + <projectDescription> + <name>org.eclipse.nebula.widgets.nattable.root</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + </buildSpec> + <natures> + </natures> + <filteredResources> + <filter> + <id>1719991262481</id> + <name></name> + <type>30</type> + <matcher> + <id>org.eclipse.ui.ide.multiFilter</id> + <arguments>1.0-projectRelativePath-matches-false-true-org.eclipse.nebula[^/]+/.*|target-platform/.*</arguments> + </matcher> + </filter> + </filteredResources> + </projectDescription> + + + + + + eclipse.preferences.version=1 + encoding/<project>=UTF-8 + + + + + + Choose the compatibility level of the target platform + + + + + + + + + + ${git.clone.location}/target-platform/target-platform-gen.target + + + org.eclipse.equinox.executable.feature.group,slf4j.simple,org.eclipse.osgi.services + + + false + + + false + + + false + + + true + + + false + + + false + + + false + + + jakarta\..* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + The dynamic working sets for ${scope.project.label} + + + + NatTable + diff --git a/setup/NatTableConfiguration.setup b/setup/NatTableConfiguration.setup new file mode 100644 index 000000000..cb46c8da8 --- /dev/null +++ b/setup/NatTableConfiguration.setup @@ -0,0 +1,45 @@ + + + + + https://eclipse.dev/nebula/images/nebula_logo_main_300.png + + + NatTable + + + + + The NatTable installation provides the tools needed to work with the set of projects from <a href="https://github.com/eclipse-nattable/nattable">NatTable's GitHub repository</a>. + + + + The NatTable workspace provides the set of projects from <a href="https://github.com/eclipse-nattable/nattable">NatTable's GitHub repository</a>. + + + <p> + The NatTable configuration provisions a dedicated development environment for working with the set of projects from <a href="https://github.com/eclipse-nattable/nattable">NatTable's GitHub repository</a>. + </p> + <p> + The installation is based on the latest EPP Committers package, + the workspace consists of the projects from NatTable's GitHub repository, + and the PDE target platform is minimal. + <p> + </p> + Please <a href="https://wiki.eclipse.org/Eclipse_Platform_SDK_Provisioning">read the tutorial instructions</a> for more details about how to use a configuration. + </p> + + diff --git a/target-platform/target-platform.target b/target-platform/target-platform.target index 5b8e0aed4..04781afc3 100644 --- a/target-platform/target-platform.target +++ b/target-platform/target-platform.target @@ -1,72 +1,35 @@ - - + + - - - - - - + + + + + - - - - - - - - - - - - - - + + + - - - - - + + + - - - + + + + - - - + + + + + + + + + - - - - org.junit.jupiter - junit-jupiter-engine - 5.10.0 - jar - - - - - - - org.junit.platform - junit-platform-launcher - 1.10.0 - jar - - - - - - - org.junit.jupiter - junit-jupiter-params - 5.10.0 - jar - - - \ No newline at end of file