diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index a16b019d7..43a580d2a 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -3,6 +3,6 @@ org.eclipse.tycho tycho-build - 4.0.12 + 4.0.13 \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 810e06643..8dccd6319 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,8 +9,8 @@ NatTable is a subproject of the Nebula Project, the home of further supplemental The project details can be found [here](https://projects.eclipse.org/projects/technology.nebula.nattable). -This project uses [GitHub Issues](https://github.com/eclipse-nebula-nattable/nattable/issues) to track ongoing development and issues. -Be sure to search for existing bugs before you create another one. Remember that ontributions are always welcome! +This project uses [GitHub Issues](https://github.com/eclipse-nattable/nattable/issues) to track ongoing development and issues. +Be sure to search for existing bugs before you create another one. Remember that contributions are always welcome! Previously this project used Bugzilla. Until the Eclipse Foundation is not shutting down Bugzilla, you can find solved issues there: * [Search for issues](https://bugs.eclipse.org/bugs/buglist.cgi?product=NatTable) @@ -45,7 +45,7 @@ The development tools with minimum versions that are used by the NatTable team a * JDK 21 * Eclipse 4.32 (2024-06) -* Maven 3.9.8 with Tycho 4.0.8 +* Maven 3.9.8 with Tycho 4.0.13 * Git * JUnit5 @@ -60,9 +60,9 @@ The NatTable source is divided into the following main projects: * org.eclipse.nebula.widgets.nattable.extension.glazedlists.test - NatTable extensions for GlazedLists tests * org.eclipse.nebula.widgets.nattable.extension.nebula - NatTable extensions for Nebula * org.eclipse.nebula.widgets.nattable.extension.poi - NatTable extensions for Apache POI -* org.eclipse.nebula.widgets.examples - NatTable example application containing several examples -* org.eclipse.nebula.widgets.examples.e4 - NatTable examples for Eclipse 4 -* org.eclipse.nebula.widgets.examples.e4.product - NatTable examples application as Eclipse 4 application +* org.eclipse.nebula.widgets.nattable.examples - NatTable example application containing several examples +* org.eclipse.nebula.widgets.nattable.examples.e4 - NatTable examples for Eclipse 4 +* org.eclipse.nebula.widgets.nattable.examples.e4.product - NatTable examples application as Eclipse 4 application In addition there are also various feature projects necessary for release engineering. All of these projects are packaged as Eclipse plugins/OSGi bundles. diff --git a/NOTICE.md b/NOTICE.md index d85082944..317ae7988 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -22,14 +22,14 @@ SPDX-License-Identifier: EPL-2.0 The project maintains the following source code repository: -* https://git.eclipse.org/c/nattable/org.eclipse.nebula.widgets.nattable.git/ +* https://github.com/eclipse-nattable/nattable ## Third-party Content The following list contains the third-party-content that is explicitly added additionally to the Eclipse Platform dependencies in the [Target Definition](target-platform/target-platform.target). A detailed dependency list is available in [DEPENDENCIES](DEPENDENCIES). -Eclipse Collections 10.4 +Eclipse Collections 12.0.0 * License: EPL-1.0 OR BSD-3-Clause * Project: https://www.eclipse.org/collections/ @@ -41,19 +41,19 @@ GlazedLists 1.11 * Project: http://www.glazedlists.com/ * Source: https://github.com/glazedlists/glazedlists/ -Eclipse Nebula 3.0.0 (CWT 1.1.0, CDateTime 1.5.0, RichText 1.5.1) +Eclipse Nebula 3.1.1 (CWT 1.1.0, CDateTime 1.5.0, RichText 1.5.1) * License: EPL-2.0 * Project: https://www.eclipse.org/nebula/ * Source: https://github.com/eclipse/nebula -Apache Commons Collections 4.4.0 +Apache Commons Collections 4.5.0 * License: Apache-2.0 * Project: https://commons.apache.org/proper/commons-collections/ * Source: https://github.com/apache/commons-collections -Apache Commons Codec 1.14.0 +Apache Commons Codec 1.18.0 * License: Apache-2.0 * Project: https://commons.apache.org/proper/commons-codec/ @@ -64,12 +64,12 @@ Apache Commons Math 3.6.1 * License: Apache-2.0 AND BSD-3-Clause AND BSD-2-Clause * Project: https://commons.apache.org/proper/commons-math/ -Apache POI 4.1.1 +Apache POI 5.4.1 * License: Apache-2.0 AND MIT AND BSD-3-Clause AND EPL-1.0 * Project: https://poi.apache.org/ -SLF4J API 1.7.30 +SLF4J API 2.0.17 * License: MIT * Project: https://www.slf4j.org/ \ No newline at end of file diff --git a/org.eclipse.nebula.widgets.nattable.core.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.core.feature/feature.xml index 50b25ad8c..99946b389 100644 --- a/org.eclipse.nebula.widgets.nattable.core.feature/feature.xml +++ b/org.eclipse.nebula.widgets.nattable.core.feature/feature.xml @@ -21,16 +21,6 @@ - - + version="0.0.0"/> diff --git a/org.eclipse.nebula.widgets.nattable.core.test/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.core.test/META-INF/MANIFEST.MF index bafde74b7..6067602fa 100644 --- a/org.eclipse.nebula.widgets.nattable.core.test/META-INF/MANIFEST.MF +++ b/org.eclipse.nebula.widgets.nattable.core.test/META-INF/MANIFEST.MF @@ -14,7 +14,8 @@ Import-Package: org.eclipse.core.commands.common, Require-Bundle: junit-jupiter-api;bundle-version="5.10.0", junit-jupiter-engine;bundle-version="5.10.0", junit-platform-commons;bundle-version="1.10.0", - org.opentest4j;bundle-version="1.3.0" + org.opentest4j;bundle-version="1.3.0", + org.eclipse.collections.impl;bundle-version="12.0.0" Export-Package: org.eclipse.nebula.widgets.nattable.test.fixture, org.eclipse.nebula.widgets.nattable.test.fixture.command, org.eclipse.nebula.widgets.nattable.test.fixture.data, diff --git a/org.eclipse.nebula.widgets.nattable.core/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.core/META-INF/MANIFEST.MF index 622d1db21..b789bf379 100644 --- a/org.eclipse.nebula.widgets.nattable.core/META-INF/MANIFEST.MF +++ b/org.eclipse.nebula.widgets.nattable.core/META-INF/MANIFEST.MF @@ -182,29 +182,29 @@ Export-Package: org.eclipse.nebula.widgets.nattable;version="2.6.0", org.eclipse.nebula.widgets.nattable.viewport.command;version="2.6.0", org.eclipse.nebula.widgets.nattable.viewport.event;version="2.6.0", org.eclipse.nebula.widgets.nattable.widget;version="2.6.0" -Import-Package: org.eclipse.collections.api;version="10.1.0", - org.eclipse.collections.api.block;version="10.1.0", - org.eclipse.collections.api.block.function;version="10.1.0", - org.eclipse.collections.api.block.function.primitive;version="10.1.0", - org.eclipse.collections.api.block.predicate;version="10.1.0", - org.eclipse.collections.api.block.predicate.primitive;version="10.1.0", - org.eclipse.collections.api.block.procedure;version="10.1.0", - org.eclipse.collections.api.block.procedure.primitive;version="10.1.0", - org.eclipse.collections.api.collection.primitive;version="10.1.0", - org.eclipse.collections.api.factory;version="10.1.0", - org.eclipse.collections.api.factory.list.primitive;version="10.1.0", - org.eclipse.collections.api.factory.map;version="10.1.0", - org.eclipse.collections.api.factory.map.primitive;version="10.1.0", +Import-Package: org.eclipse.collections.api;version="11.1.0", + org.eclipse.collections.api.block;version="11.1.0", + org.eclipse.collections.api.block.function;version="11.1.0", + org.eclipse.collections.api.block.function.primitive;version="11.1.0", + org.eclipse.collections.api.block.predicate;version="11.1.0", + org.eclipse.collections.api.block.predicate.primitive;version="11.1.0", + org.eclipse.collections.api.block.procedure;version="11.1.0", + org.eclipse.collections.api.block.procedure.primitive;version="11.1.0", + org.eclipse.collections.api.collection.primitive;version="11.1.0", + org.eclipse.collections.api.factory;version="11.1.0", + org.eclipse.collections.api.factory.list.primitive;version="11.1.0", + org.eclipse.collections.api.factory.map;version="11.1.0", + org.eclipse.collections.api.factory.map.primitive;version="11.1.0", + org.eclipse.collections.api.factory.primitive;version="11.1.0", org.eclipse.collections.api.factory.set;version="10.4.0", - org.eclipse.collections.api.factory.set.primitive;version="10.1.0", - org.eclipse.collections.api.iterator;version="10.1.0", - org.eclipse.collections.api.list;version="10.1.0", - org.eclipse.collections.api.list.primitive;version="10.1.0", - org.eclipse.collections.api.map;version="10.1.0", - org.eclipse.collections.api.map.primitive;version="10.1.0", - org.eclipse.collections.api.set.primitive;version="10.1.0", - org.eclipse.collections.api.tuple.primitive;version="10.1.0", - org.eclipse.collections.impl.factory.primitive;version="10.1.0", + org.eclipse.collections.api.factory.set.primitive;version="11.1.0", + org.eclipse.collections.api.iterator;version="11.1.0", + org.eclipse.collections.api.list;version="11.1.0", + org.eclipse.collections.api.list.primitive;version="11.1.0", + org.eclipse.collections.api.map;version="11.1.0", + org.eclipse.collections.api.map.primitive;version="11.1.0", + org.eclipse.collections.api.set.primitive;version="11.1.0", + org.eclipse.collections.api.tuple.primitive;version="11.1.0", org.eclipse.core.commands.common, org.eclipse.jface.action, org.eclipse.jface.bindings.keys, diff --git a/org.eclipse.nebula.widgets.nattable.core/pom.xml b/org.eclipse.nebula.widgets.nattable.core/pom.xml index 35da80496..4605a0519 100644 --- a/org.eclipse.nebula.widgets.nattable.core/pom.xml +++ b/org.eclipse.nebula.widgets.nattable.core/pom.xml @@ -42,37 +42,37 @@ org.eclipse.collections eclipse-collections-api - 11.1.0 + 12.0.0 org.eclipse.collections eclipse-collections - 11.1.0 + 12.0.0 org.eclipse.platform org.eclipse.jface - 3.20.0 + 3.26.0 org.eclipse.platform org.eclipse.swt - 3.114.100 + 3.120.0 org.eclipse.platform org.eclipse.equinox.common - 3.12.0 + 3.16.100 org.eclipse.platform org.eclipse.core.commands - 3.9.700 + 3.10.200 org.slf4j slf4j-api - 1.7.30 + 2.0.17 \ No newline at end of file diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/ColumnGroupExpandCollapseLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/ColumnGroupExpandCollapseLayer.java index 3c46445ac..d3a123a68 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/ColumnGroupExpandCollapseLayer.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/ColumnGroupExpandCollapseLayer.java @@ -14,8 +14,8 @@ import java.util.Collection; +import org.eclipse.collections.api.factory.primitive.IntSets; import org.eclipse.collections.api.set.primitive.MutableIntSet; -import org.eclipse.collections.impl.factory.primitive.IntSets; import org.eclipse.nebula.widgets.nattable.group.ColumnGroupModel.ColumnGroup; import org.eclipse.nebula.widgets.nattable.group.command.ColumnGroupExpandCollapseCommandHandler; import org.eclipse.nebula.widgets.nattable.hideshow.AbstractColumnHideShowLayer; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/ColumnGroupUtils.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/ColumnGroupUtils.java index a53e1cd2e..6026f1aa7 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/ColumnGroupUtils.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/ColumnGroupUtils.java @@ -17,8 +17,8 @@ import java.util.Collections; import java.util.List; +import org.eclipse.collections.api.factory.primitive.IntLists; import org.eclipse.collections.api.list.primitive.MutableIntList; -import org.eclipse.collections.impl.factory.primitive.IntLists; import org.eclipse.nebula.widgets.nattable.coordinate.PositionUtil; import org.eclipse.nebula.widgets.nattable.group.ColumnGroupModel.ColumnGroup; import org.eclipse.nebula.widgets.nattable.group.performance.ColumnGroupHeaderLayer; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/RowGroupExpandCollapseLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/RowGroupExpandCollapseLayer.java index e6d9e645b..f60b131f0 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/RowGroupExpandCollapseLayer.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/RowGroupExpandCollapseLayer.java @@ -14,8 +14,8 @@ import java.util.Collection; +import org.eclipse.collections.api.factory.primitive.IntSets; import org.eclipse.collections.api.set.primitive.MutableIntSet; -import org.eclipse.collections.impl.factory.primitive.IntSets; import org.eclipse.nebula.widgets.nattable.group.command.RowGroupExpandCollapseCommandHandler; import org.eclipse.nebula.widgets.nattable.group.model.IRowGroup; import org.eclipse.nebula.widgets.nattable.group.model.IRowGroupModel; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/RowGroupUtils.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/RowGroupUtils.java index d1dc7b561..bdec44117 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/RowGroupUtils.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/RowGroupUtils.java @@ -18,8 +18,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.eclipse.collections.api.factory.primitive.IntLists; import org.eclipse.collections.api.list.primitive.MutableIntList; -import org.eclipse.collections.impl.factory.primitive.IntLists; import org.eclipse.nebula.widgets.nattable.coordinate.PositionUtil; import org.eclipse.nebula.widgets.nattable.group.model.IRowGroup; import org.eclipse.nebula.widgets.nattable.group.model.IRowGroupModel; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/ColumnGroupExpandCollapseLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/ColumnGroupExpandCollapseLayer.java index e42a65e68..ef5e8a571 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/ColumnGroupExpandCollapseLayer.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/ColumnGroupExpandCollapseLayer.java @@ -17,11 +17,11 @@ import java.util.List; import org.eclipse.collections.api.factory.Maps; +import org.eclipse.collections.api.factory.primitive.IntLists; +import org.eclipse.collections.api.factory.primitive.IntSets; import org.eclipse.collections.api.list.primitive.MutableIntList; import org.eclipse.collections.api.map.MutableMap; import org.eclipse.collections.api.set.primitive.MutableIntSet; -import org.eclipse.collections.impl.factory.primitive.IntLists; -import org.eclipse.collections.impl.factory.primitive.IntSets; import org.eclipse.nebula.widgets.nattable.command.ILayerCommand; import org.eclipse.nebula.widgets.nattable.group.performance.GroupModel.Group; import org.eclipse.nebula.widgets.nattable.group.performance.command.ColumnGroupCollapseCommand; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/ColumnGroupHeaderLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/ColumnGroupHeaderLayer.java index bfd4102dc..b4a076a84 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/ColumnGroupHeaderLayer.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/ColumnGroupHeaderLayer.java @@ -20,8 +20,8 @@ import java.util.Map; import java.util.Properties; +import org.eclipse.collections.api.factory.primitive.IntLists; import org.eclipse.collections.api.list.primitive.MutableIntList; -import org.eclipse.collections.impl.factory.primitive.IntLists; import org.eclipse.nebula.widgets.nattable.NatTable; import org.eclipse.nebula.widgets.nattable.command.ILayerCommand; import org.eclipse.nebula.widgets.nattable.coordinate.PositionUtil; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/GroupModel.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/GroupModel.java index da40f61ea..aa6ac330a 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/GroupModel.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/GroupModel.java @@ -22,11 +22,11 @@ import java.util.Set; import java.util.StringTokenizer; +import org.eclipse.collections.api.factory.primitive.IntLists; +import org.eclipse.collections.api.factory.primitive.IntSets; import org.eclipse.collections.api.list.primitive.MutableIntList; import org.eclipse.collections.api.set.primitive.IntSet; import org.eclipse.collections.api.set.primitive.MutableIntSet; -import org.eclipse.collections.impl.factory.primitive.IntLists; -import org.eclipse.collections.impl.factory.primitive.IntSets; import org.eclipse.nebula.widgets.nattable.coordinate.PositionUtil; import org.eclipse.nebula.widgets.nattable.layer.IUniqueIndexLayer; import org.eclipse.nebula.widgets.nattable.persistence.IPersistable; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/RowGroupExpandCollapseLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/RowGroupExpandCollapseLayer.java index f632d8ff6..c74b5f2e1 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/RowGroupExpandCollapseLayer.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/RowGroupExpandCollapseLayer.java @@ -17,11 +17,11 @@ import java.util.List; import org.eclipse.collections.api.factory.Maps; +import org.eclipse.collections.api.factory.primitive.IntLists; +import org.eclipse.collections.api.factory.primitive.IntSets; import org.eclipse.collections.api.list.primitive.MutableIntList; import org.eclipse.collections.api.map.MutableMap; import org.eclipse.collections.api.set.primitive.MutableIntSet; -import org.eclipse.collections.impl.factory.primitive.IntLists; -import org.eclipse.collections.impl.factory.primitive.IntSets; import org.eclipse.nebula.widgets.nattable.command.ILayerCommand; import org.eclipse.nebula.widgets.nattable.group.RowGroupHeaderLayer; import org.eclipse.nebula.widgets.nattable.group.performance.GroupModel.Group; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/RowGroupHeaderLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/RowGroupHeaderLayer.java index 7b816a1ec..31307e613 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/RowGroupHeaderLayer.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/RowGroupHeaderLayer.java @@ -20,8 +20,8 @@ import java.util.Map; import java.util.Properties; +import org.eclipse.collections.api.factory.primitive.IntLists; import org.eclipse.collections.api.list.primitive.MutableIntList; -import org.eclipse.collections.impl.factory.primitive.IntLists; import org.eclipse.nebula.widgets.nattable.NatTable; import org.eclipse.nebula.widgets.nattable.command.ILayerCommand; import org.eclipse.nebula.widgets.nattable.coordinate.PositionUtil; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/command/ColumnGroupsCommandHandler.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/command/ColumnGroupsCommandHandler.java index add062915..136d65122 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/command/ColumnGroupsCommandHandler.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/command/ColumnGroupsCommandHandler.java @@ -15,9 +15,9 @@ import java.util.HashMap; import java.util.HashSet; +import org.eclipse.collections.api.factory.primitive.IntLists; import org.eclipse.collections.api.iterator.MutableIntIterator; import org.eclipse.collections.api.list.primitive.MutableIntList; -import org.eclipse.collections.impl.factory.primitive.IntLists; import org.eclipse.nebula.widgets.nattable.Messages; import org.eclipse.nebula.widgets.nattable.command.AbstractLayerCommandHandler; import org.eclipse.nebula.widgets.nattable.group.command.CreateColumnGroupCommand; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/command/RowGroupsCommandHandler.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/command/RowGroupsCommandHandler.java index 27c89fb3a..95864dbf3 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/command/RowGroupsCommandHandler.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/command/RowGroupsCommandHandler.java @@ -15,9 +15,9 @@ import java.util.HashMap; import java.util.HashSet; +import org.eclipse.collections.api.factory.primitive.IntLists; import org.eclipse.collections.api.iterator.MutableIntIterator; import org.eclipse.collections.api.list.primitive.MutableIntList; -import org.eclipse.collections.impl.factory.primitive.IntLists; import org.eclipse.nebula.widgets.nattable.Messages; import org.eclipse.nebula.widgets.nattable.command.AbstractLayerCommandHandler; import org.eclipse.nebula.widgets.nattable.group.command.CreateRowGroupCommand; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/command/UpdateColumnGroupCollapseCommand.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/command/UpdateColumnGroupCollapseCommand.java index a00e081cf..171a645e7 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/command/UpdateColumnGroupCollapseCommand.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/command/UpdateColumnGroupCollapseCommand.java @@ -12,8 +12,8 @@ ******************************************************************************/ package org.eclipse.nebula.widgets.nattable.group.performance.command; +import org.eclipse.collections.api.factory.primitive.IntSets; import org.eclipse.collections.api.set.primitive.MutableIntSet; -import org.eclipse.collections.impl.factory.primitive.IntSets; import org.eclipse.nebula.widgets.nattable.command.AbstractContextFreeCommand; import org.eclipse.nebula.widgets.nattable.group.performance.GroupModel; import org.eclipse.nebula.widgets.nattable.group.performance.GroupModel.Group; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/command/UpdateRowGroupCollapseCommand.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/command/UpdateRowGroupCollapseCommand.java index 5c723c187..08095002b 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/command/UpdateRowGroupCollapseCommand.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/command/UpdateRowGroupCollapseCommand.java @@ -12,8 +12,8 @@ ******************************************************************************/ package org.eclipse.nebula.widgets.nattable.group.performance.command; +import org.eclipse.collections.api.factory.primitive.IntSets; import org.eclipse.collections.api.set.primitive.MutableIntSet; -import org.eclipse.collections.impl.factory.primitive.IntSets; import org.eclipse.nebula.widgets.nattable.command.AbstractContextFreeCommand; import org.eclipse.nebula.widgets.nattable.group.performance.GroupModel; import org.eclipse.nebula.widgets.nattable.group.performance.GroupModel.Group; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/AbstractColumnHideShowLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/AbstractColumnHideShowLayer.java index 00cb8736e..4da0edb6d 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/AbstractColumnHideShowLayer.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/AbstractColumnHideShowLayer.java @@ -17,9 +17,9 @@ import java.util.Collection; import java.util.HashSet; +import org.eclipse.collections.api.factory.primitive.IntIntMaps; import org.eclipse.collections.api.map.primitive.IntIntMap; import org.eclipse.collections.api.map.primitive.MutableIntIntMap; -import org.eclipse.collections.impl.factory.primitive.IntIntMaps; import org.eclipse.nebula.widgets.nattable.command.ILayerCommand; import org.eclipse.nebula.widgets.nattable.coordinate.PositionUtil; import org.eclipse.nebula.widgets.nattable.coordinate.Range; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/AbstractRowHideShowLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/AbstractRowHideShowLayer.java index 9359f8e90..5b3995a4c 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/AbstractRowHideShowLayer.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/AbstractRowHideShowLayer.java @@ -17,9 +17,9 @@ import java.util.Collection; import java.util.HashSet; +import org.eclipse.collections.api.factory.primitive.IntIntMaps; import org.eclipse.collections.api.map.primitive.IntIntMap; import org.eclipse.collections.api.map.primitive.MutableIntIntMap; -import org.eclipse.collections.impl.factory.primitive.IntIntMaps; import org.eclipse.nebula.widgets.nattable.command.ILayerCommand; import org.eclipse.nebula.widgets.nattable.coordinate.PositionUtil; import org.eclipse.nebula.widgets.nattable.coordinate.Range; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/ColumnHideShowLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/ColumnHideShowLayer.java index bc8c3e404..d607e0b16 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/ColumnHideShowLayer.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/ColumnHideShowLayer.java @@ -17,10 +17,10 @@ import java.util.Properties; import java.util.StringTokenizer; +import org.eclipse.collections.api.factory.primitive.IntLists; +import org.eclipse.collections.api.factory.primitive.IntSets; import org.eclipse.collections.api.list.primitive.MutableIntList; import org.eclipse.collections.api.set.primitive.MutableIntSet; -import org.eclipse.collections.impl.factory.primitive.IntLists; -import org.eclipse.collections.impl.factory.primitive.IntSets; import org.eclipse.nebula.widgets.nattable.hideshow.command.ColumnHideCommandHandler; import org.eclipse.nebula.widgets.nattable.hideshow.command.ColumnShowCommandHandler; import org.eclipse.nebula.widgets.nattable.hideshow.command.HideColumnByIndexCommandHandler; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/ResizeColumnHideShowLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/ResizeColumnHideShowLayer.java index c75302bc4..954e524ff 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/ResizeColumnHideShowLayer.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/ResizeColumnHideShowLayer.java @@ -18,11 +18,11 @@ import java.util.Properties; import java.util.StringTokenizer; +import org.eclipse.collections.api.factory.primitive.IntLists; +import org.eclipse.collections.api.factory.primitive.IntObjectMaps; import org.eclipse.collections.api.list.primitive.MutableIntList; import org.eclipse.collections.api.map.primitive.MutableIntObjectMap; import org.eclipse.collections.api.tuple.primitive.IntObjectPair; -import org.eclipse.collections.impl.factory.primitive.IntLists; -import org.eclipse.collections.impl.factory.primitive.IntObjectMaps; import org.eclipse.nebula.widgets.nattable.coordinate.PositionUtil; import org.eclipse.nebula.widgets.nattable.coordinate.Range; import org.eclipse.nebula.widgets.nattable.hideshow.command.ColumnHideCommandHandler; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/RowHideShowLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/RowHideShowLayer.java index a6d9a5eba..36944eac8 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/RowHideShowLayer.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/RowHideShowLayer.java @@ -17,10 +17,10 @@ import java.util.Properties; import java.util.StringTokenizer; +import org.eclipse.collections.api.factory.primitive.IntLists; +import org.eclipse.collections.api.factory.primitive.IntSets; import org.eclipse.collections.api.list.primitive.MutableIntList; import org.eclipse.collections.api.set.primitive.MutableIntSet; -import org.eclipse.collections.impl.factory.primitive.IntLists; -import org.eclipse.collections.impl.factory.primitive.IntSets; import org.eclipse.nebula.widgets.nattable.hideshow.command.HideRowByIndexCommandHandler; import org.eclipse.nebula.widgets.nattable.hideshow.command.MultiRowHideCommandHandler; import org.eclipse.nebula.widgets.nattable.hideshow.command.MultiRowShowCommandHandler; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/RowIdHideShowLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/RowIdHideShowLayer.java index 43dbafc89..ef81885ff 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/RowIdHideShowLayer.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hideshow/RowIdHideShowLayer.java @@ -23,8 +23,8 @@ import java.util.TreeMap; import java.util.stream.Collectors; +import org.eclipse.collections.api.factory.primitive.IntSets; import org.eclipse.collections.api.set.primitive.MutableIntSet; -import org.eclipse.collections.impl.factory.primitive.IntSets; import org.eclipse.nebula.widgets.nattable.command.ILayerCommand; import org.eclipse.nebula.widgets.nattable.data.IRowDataProvider; import org.eclipse.nebula.widgets.nattable.data.IRowIdAccessor; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hierarchical/HierarchicalTreeLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hierarchical/HierarchicalTreeLayer.java index e98dd06e2..1cb759d30 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hierarchical/HierarchicalTreeLayer.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/hierarchical/HierarchicalTreeLayer.java @@ -22,10 +22,10 @@ import java.util.Map; import java.util.Set; +import org.eclipse.collections.api.factory.primitive.IntLists; +import org.eclipse.collections.api.factory.primitive.IntSets; import org.eclipse.collections.api.list.primitive.MutableIntList; import org.eclipse.collections.api.set.primitive.MutableIntSet; -import org.eclipse.collections.impl.factory.primitive.IntLists; -import org.eclipse.collections.impl.factory.primitive.IntSets; import org.eclipse.nebula.widgets.nattable.command.ILayerCommand; import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry; import org.eclipse.nebula.widgets.nattable.coordinate.PositionCoordinate; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/layer/SizeConfig.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/layer/SizeConfig.java index 8a86360c0..c473ffdb9 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/layer/SizeConfig.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/layer/SizeConfig.java @@ -18,6 +18,10 @@ import java.util.Properties; import java.util.StringTokenizer; +import org.eclipse.collections.api.factory.primitive.IntBooleanMaps; +import org.eclipse.collections.api.factory.primitive.IntDoubleMaps; +import org.eclipse.collections.api.factory.primitive.IntIntMaps; +import org.eclipse.collections.api.factory.primitive.IntLists; import org.eclipse.collections.api.iterator.MutableIntIterator; import org.eclipse.collections.api.list.primitive.MutableIntList; import org.eclipse.collections.api.map.primitive.MutableIntBooleanMap; @@ -26,10 +30,6 @@ import org.eclipse.collections.api.tuple.primitive.IntBooleanPair; import org.eclipse.collections.api.tuple.primitive.IntDoublePair; import org.eclipse.collections.api.tuple.primitive.IntIntPair; -import org.eclipse.collections.impl.factory.primitive.IntBooleanMaps; -import org.eclipse.collections.impl.factory.primitive.IntDoubleMaps; -import org.eclipse.collections.impl.factory.primitive.IntIntMaps; -import org.eclipse.collections.impl.factory.primitive.IntLists; import org.eclipse.nebula.widgets.nattable.persistence.IPersistable; /** diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/layer/event/StructuralChangeEventHelper.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/layer/event/StructuralChangeEventHelper.java index 189097222..b4339cfc4 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/layer/event/StructuralChangeEventHelper.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/layer/event/StructuralChangeEventHelper.java @@ -16,8 +16,8 @@ import java.util.Collection; import org.eclipse.collections.api.collection.primitive.MutableIntCollection; +import org.eclipse.collections.api.factory.primitive.IntLists; import org.eclipse.collections.api.list.primitive.MutableIntList; -import org.eclipse.collections.impl.factory.primitive.IntLists; import org.eclipse.nebula.widgets.nattable.coordinate.Range; import org.eclipse.nebula.widgets.nattable.layer.ILayer; import org.eclipse.nebula.widgets.nattable.layer.event.StructuralDiff.DiffTypeEnum; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/reorder/ColumnReorderLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/reorder/ColumnReorderLayer.java index 7410e1825..df77a6229 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/reorder/ColumnReorderLayer.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/reorder/ColumnReorderLayer.java @@ -18,10 +18,10 @@ import java.util.Properties; import java.util.StringTokenizer; +import org.eclipse.collections.api.factory.primitive.IntIntMaps; +import org.eclipse.collections.api.factory.primitive.IntLists; import org.eclipse.collections.api.list.primitive.MutableIntList; import org.eclipse.collections.api.map.primitive.MutableIntIntMap; -import org.eclipse.collections.impl.factory.primitive.IntIntMaps; -import org.eclipse.collections.impl.factory.primitive.IntLists; import org.eclipse.nebula.widgets.nattable.command.ILayerCommand; import org.eclipse.nebula.widgets.nattable.coordinate.PositionUtil; import org.eclipse.nebula.widgets.nattable.coordinate.Range; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/reorder/RowReorderLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/reorder/RowReorderLayer.java index cda85a90d..ad109c681 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/reorder/RowReorderLayer.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/reorder/RowReorderLayer.java @@ -18,10 +18,10 @@ import java.util.Properties; import java.util.StringTokenizer; +import org.eclipse.collections.api.factory.primitive.IntIntMaps; +import org.eclipse.collections.api.factory.primitive.IntLists; import org.eclipse.collections.api.list.primitive.MutableIntList; import org.eclipse.collections.api.map.primitive.MutableIntIntMap; -import org.eclipse.collections.impl.factory.primitive.IntIntMaps; -import org.eclipse.collections.impl.factory.primitive.IntLists; import org.eclipse.nebula.widgets.nattable.command.ILayerCommand; import org.eclipse.nebula.widgets.nattable.coordinate.PositionUtil; import org.eclipse.nebula.widgets.nattable.coordinate.Range; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/reorder/event/ColumnReorderEvent.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/reorder/event/ColumnReorderEvent.java index 8afe6d62f..9c189a891 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/reorder/event/ColumnReorderEvent.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/reorder/event/ColumnReorderEvent.java @@ -16,8 +16,8 @@ import java.util.Collection; import java.util.List; +import org.eclipse.collections.api.factory.primitive.IntLists; import org.eclipse.collections.api.list.primitive.MutableIntList; -import org.eclipse.collections.impl.factory.primitive.IntLists; import org.eclipse.nebula.widgets.nattable.coordinate.PositionUtil; import org.eclipse.nebula.widgets.nattable.coordinate.Range; import org.eclipse.nebula.widgets.nattable.layer.ILayer; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/reorder/event/RowReorderEvent.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/reorder/event/RowReorderEvent.java index 3576e952b..251096ca5 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/reorder/event/RowReorderEvent.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/reorder/event/RowReorderEvent.java @@ -16,8 +16,8 @@ import java.util.Collection; import java.util.List; +import org.eclipse.collections.api.factory.primitive.IntLists; import org.eclipse.collections.api.list.primitive.MutableIntList; -import org.eclipse.collections.impl.factory.primitive.IntLists; import org.eclipse.nebula.widgets.nattable.coordinate.PositionUtil; import org.eclipse.nebula.widgets.nattable.coordinate.Range; import org.eclipse.nebula.widgets.nattable.layer.ILayer; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/selection/SelectionLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/selection/SelectionLayer.java index e6a84e9a3..408b4c4c7 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/selection/SelectionLayer.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/selection/SelectionLayer.java @@ -25,8 +25,8 @@ import java.util.Set; import java.util.stream.IntStream; +import org.eclipse.collections.api.factory.primitive.IntLists; import org.eclipse.collections.api.list.primitive.MutableIntList; -import org.eclipse.collections.impl.factory.primitive.IntLists; import org.eclipse.nebula.widgets.nattable.command.ILayerCommand; import org.eclipse.nebula.widgets.nattable.coordinate.PositionCoordinate; import org.eclipse.nebula.widgets.nattable.coordinate.PositionCoordinateComparator; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/selection/preserve/Selections.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/selection/preserve/Selections.java index bf52d64f2..6483fec7c 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/selection/preserve/Selections.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/selection/preserve/Selections.java @@ -22,11 +22,11 @@ import java.util.HashSet; import java.util.Map; +import org.eclipse.collections.api.factory.primitive.IntObjectMaps; +import org.eclipse.collections.api.factory.primitive.IntSets; import org.eclipse.collections.api.map.primitive.MutableIntObjectMap; import org.eclipse.collections.api.set.primitive.MutableIntSet; import org.eclipse.collections.api.tuple.primitive.IntObjectPair; -import org.eclipse.collections.impl.factory.primitive.IntObjectMaps; -import org.eclipse.collections.impl.factory.primitive.IntSets; /** * The selected cells of columns and rows diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/tree/TreeLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/tree/TreeLayer.java index 8d5101b0e..3babfb712 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/tree/TreeLayer.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/tree/TreeLayer.java @@ -18,8 +18,8 @@ import java.util.Collection; import java.util.List; +import org.eclipse.collections.api.factory.primitive.IntSets; import org.eclipse.collections.api.set.primitive.MutableIntSet; -import org.eclipse.collections.impl.factory.primitive.IntSets; import org.eclipse.nebula.widgets.nattable.command.ILayerCommand; import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry; import org.eclipse.nebula.widgets.nattable.hideshow.AbstractRowHideShowLayer; diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/widget/NatCombo.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/widget/NatCombo.java index 69b98b351..30146ec32 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/widget/NatCombo.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/widget/NatCombo.java @@ -21,10 +21,10 @@ import java.util.Map; import java.util.stream.Collectors; +import org.eclipse.collections.api.factory.primitive.IntSets; +import org.eclipse.collections.api.factory.primitive.ObjectIntMaps; import org.eclipse.collections.api.map.primitive.MutableObjectIntMap; import org.eclipse.collections.api.set.primitive.IntSet; -import org.eclipse.collections.impl.factory.primitive.IntSets; -import org.eclipse.collections.impl.factory.primitive.ObjectIntMaps; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.TableViewer; diff --git a/org.eclipse.nebula.widgets.nattable.examples.e4.product/org.eclipse.nebula.widgets.nattable.examples.e4.product b/org.eclipse.nebula.widgets.nattable.examples.e4.product/org.eclipse.nebula.widgets.nattable.examples.e4.product index e490db013..2c4b79043 100644 --- a/org.eclipse.nebula.widgets.nattable.examples.e4.product/org.eclipse.nebula.widgets.nattable.examples.e4.product +++ b/org.eclipse.nebula.widgets.nattable.examples.e4.product/org.eclipse.nebula.widgets.nattable.examples.e4.product @@ -314,7 +314,6 @@ version(s), and exceptions or additional permissions here}." - diff --git a/org.eclipse.nebula.widgets.nattable.examples/build-examples.xml b/org.eclipse.nebula.widgets.nattable.examples/build-examples.xml index 4202681a6..e1a3dc77a 100644 --- a/org.eclipse.nebula.widgets.nattable.examples/build-examples.xml +++ b/org.eclipse.nebula.widgets.nattable.examples/build-examples.xml @@ -22,24 +22,27 @@ + + src="lib/org.apache.commons.commons-codec_1.18.0.jar"/> + src="lib/org.apache.commons.commons-collections4_4.5.0.jar"/> + src="lib/org.apache.commons.commons-compress_1.27.1.jar"/> + src="lib/org.apache.commons.commons-io_2.19.0.jar"/> + src="lib/org.apache.commons.lang3_3.17.0.jar"/> @@ -48,28 +51,31 @@ src="lib/org.apache.commons.math3_3.6.1.jar"/> + src="lib/org.apache.commons.text_1.13.1.jar"/> + src="lib/org.apache.logging.log4j.api_2.25.0.jar"/> + src="lib/org.apache.logging.log4j.to.slf4j_2.25.0.jar"/> + src="lib/org.apache.poi_5.4.1.v20250407-1000.jar"/> + src="lib/org.apache.poi.ooxml_5.4.1.v20250407-1000.jar"/> + src="lib/org.apache.poi.ooxml.schemas_5.4.1.v20250407-1000.jar"/> + src="lib/org.apache.xmlbeans_5.3.0.v20241214-0800.jar"/> + src="lib/org.eclipse.collections.api_12.0.0.jar"/> + @@ -80,7 +86,7 @@ excludes="about_files/*,META-INF/*.SF,META-INF/*.inf,META-INF/*.RSA,*" src="lib/org.eclipse.equinox.common_3.16.100.v20220315-2327.jar"/> + src="lib/slf4j.api_2.0.17.jar"/> + src="lib/slf4j.simple_2.0.17.jar"/> diff --git a/org.eclipse.nebula.widgets.nattable.examples/lib/com.github.virtuald.curvesapi_1.8.0.v20230927-1624.jar b/org.eclipse.nebula.widgets.nattable.examples/lib/com.github.virtuald.curvesapi_1.8.0.v20230927-1624.jar new file mode 100644 index 000000000..4d90543ba Binary files /dev/null and b/org.eclipse.nebula.widgets.nattable.examples/lib/com.github.virtuald.curvesapi_1.8.0.v20230927-1624.jar differ diff --git a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-codec_1.17.1.jar b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-codec_1.17.1.jar deleted file mode 100644 index 5023670d7..000000000 Binary files a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-codec_1.17.1.jar and /dev/null differ diff --git a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-codec_1.18.0.jar b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-codec_1.18.0.jar new file mode 100644 index 000000000..9cb58515b Binary files /dev/null and b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-codec_1.18.0.jar differ diff --git a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-collections4_4.4.0.jar b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-collections4_4.4.0.jar deleted file mode 100644 index da06c3e4b..000000000 Binary files a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-collections4_4.4.0.jar and /dev/null differ diff --git a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-collections4_4.5.0.jar b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-collections4_4.5.0.jar new file mode 100644 index 000000000..aa1c4ef2b Binary files /dev/null and b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-collections4_4.5.0.jar differ diff --git a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-compress_1.26.2.jar b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-compress_1.27.1.jar similarity index 60% rename from org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-compress_1.26.2.jar rename to org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-compress_1.27.1.jar index 94d7acd8f..1bea2d9ca 100644 Binary files a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-compress_1.26.2.jar and b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-compress_1.27.1.jar differ diff --git a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-io_2.17.0.jar b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-io_2.17.0.jar deleted file mode 100644 index ad00ddc40..000000000 Binary files a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-io_2.17.0.jar and /dev/null differ diff --git a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-io_2.19.0.jar b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-io_2.19.0.jar new file mode 100644 index 000000000..38e7fd20a Binary files /dev/null and b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.commons-io_2.19.0.jar differ diff --git a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.lang3_3.15.0.jar b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.lang3_3.17.0.jar similarity index 65% rename from org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.lang3_3.15.0.jar rename to org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.lang3_3.17.0.jar index 6695c7f63..f6486b4d7 100644 Binary files a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.lang3_3.15.0.jar and b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.lang3_3.17.0.jar differ diff --git a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.text_1.12.0.jar b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.text_1.12.0.jar deleted file mode 100644 index a2daab148..000000000 Binary files a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.text_1.12.0.jar and /dev/null differ diff --git a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.text_1.13.1.jar b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.text_1.13.1.jar new file mode 100644 index 000000000..ddba18d10 Binary files /dev/null and b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.commons.text_1.13.1.jar differ diff --git a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.logging.log4j.api_2.24.1.jar b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.logging.log4j.api_2.24.1.jar deleted file mode 100644 index f9d5b43cd..000000000 Binary files a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.logging.log4j.api_2.24.1.jar and /dev/null differ diff --git a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.logging.log4j.api_2.25.0.jar b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.logging.log4j.api_2.25.0.jar new file mode 100644 index 000000000..848f393a4 Binary files /dev/null and b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.logging.log4j.api_2.25.0.jar differ diff --git a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.logging.log4j.to.slf4j_2.24.1.jar b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.logging.log4j.to.slf4j_2.25.0.jar similarity index 63% rename from org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.logging.log4j.to.slf4j_2.24.1.jar rename to org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.logging.log4j.to.slf4j_2.25.0.jar index f70d6cfd4..a228b4311 100644 Binary files a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.logging.log4j.to.slf4j_2.24.1.jar and b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.logging.log4j.to.slf4j_2.25.0.jar differ diff --git a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.poi.ooxml.schemas_5.3.0.v20240703-1000.jar b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.poi.ooxml.schemas_5.4.1.v20250407-1000.jar similarity index 87% rename from org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.poi.ooxml.schemas_5.3.0.v20240703-1000.jar rename to org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.poi.ooxml.schemas_5.4.1.v20250407-1000.jar index 7203c9386..2091feb59 100644 Binary files a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.poi.ooxml.schemas_5.3.0.v20240703-1000.jar and b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.poi.ooxml.schemas_5.4.1.v20250407-1000.jar differ diff --git a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.poi.ooxml_5.3.0.v20240703-1000.jar b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.poi.ooxml_5.4.1.v20250407-1000.jar similarity index 67% rename from org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.poi.ooxml_5.3.0.v20240703-1000.jar rename to org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.poi.ooxml_5.4.1.v20250407-1000.jar index e12050f5f..fa8a56ef1 100644 Binary files a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.poi.ooxml_5.3.0.v20240703-1000.jar and b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.poi.ooxml_5.4.1.v20250407-1000.jar differ diff --git a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.poi_5.3.0.v20240703-1000.jar b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.poi_5.4.1.v20250407-1000.jar similarity index 74% rename from org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.poi_5.3.0.v20240703-1000.jar rename to org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.poi_5.4.1.v20250407-1000.jar index d67a8aef4..c996335e0 100644 Binary files a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.poi_5.3.0.v20240703-1000.jar and b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.poi_5.4.1.v20250407-1000.jar differ diff --git a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.xmlbeans_5.2.2.v20241105-1800.jar b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.xmlbeans_5.3.0.v20241214-0800.jar similarity index 85% rename from org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.xmlbeans_5.2.2.v20241105-1800.jar rename to org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.xmlbeans_5.3.0.v20241214-0800.jar index 6189beab4..5401a102d 100644 Binary files a/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.xmlbeans_5.2.2.v20241105-1800.jar and b/org.eclipse.nebula.widgets.nattable.examples/lib/org.apache.xmlbeans_5.3.0.v20241214-0800.jar differ diff --git a/org.eclipse.nebula.widgets.nattable.examples/lib/org.eclipse.collections.api_12.0.0.jar b/org.eclipse.nebula.widgets.nattable.examples/lib/org.eclipse.collections.api_12.0.0.jar new file mode 100644 index 000000000..e8aa4c0e1 Binary files /dev/null and b/org.eclipse.nebula.widgets.nattable.examples/lib/org.eclipse.collections.api_12.0.0.jar differ diff --git a/org.eclipse.nebula.widgets.nattable.examples/lib/org.eclipse.collections_11.1.0.v20220705-1455.jar b/org.eclipse.nebula.widgets.nattable.examples/lib/org.eclipse.collections.impl_12.0.0.jar similarity index 53% rename from org.eclipse.nebula.widgets.nattable.examples/lib/org.eclipse.collections_11.1.0.v20220705-1455.jar rename to org.eclipse.nebula.widgets.nattable.examples/lib/org.eclipse.collections.impl_12.0.0.jar index 5a5266402..1f04076b1 100644 Binary files a/org.eclipse.nebula.widgets.nattable.examples/lib/org.eclipse.collections_11.1.0.v20220705-1455.jar and b/org.eclipse.nebula.widgets.nattable.examples/lib/org.eclipse.collections.impl_12.0.0.jar differ diff --git a/org.eclipse.nebula.widgets.nattable.examples/lib/slf4j.api_2.0.13.jar b/org.eclipse.nebula.widgets.nattable.examples/lib/slf4j.api_2.0.17.jar similarity index 61% rename from org.eclipse.nebula.widgets.nattable.examples/lib/slf4j.api_2.0.13.jar rename to org.eclipse.nebula.widgets.nattable.examples/lib/slf4j.api_2.0.17.jar index a800cc2b5..26b154554 100644 Binary files a/org.eclipse.nebula.widgets.nattable.examples/lib/slf4j.api_2.0.13.jar and b/org.eclipse.nebula.widgets.nattable.examples/lib/slf4j.api_2.0.17.jar differ diff --git a/org.eclipse.nebula.widgets.nattable.examples/lib/slf4j.simple_2.0.13.jar b/org.eclipse.nebula.widgets.nattable.examples/lib/slf4j.simple_2.0.17.jar similarity index 68% rename from org.eclipse.nebula.widgets.nattable.examples/lib/slf4j.simple_2.0.13.jar rename to org.eclipse.nebula.widgets.nattable.examples/lib/slf4j.simple_2.0.17.jar index b756f92a0..9a7348e87 100644 Binary files a/org.eclipse.nebula.widgets.nattable.examples/lib/slf4j.simple_2.0.13.jar and b/org.eclipse.nebula.widgets.nattable.examples/lib/slf4j.simple_2.0.17.jar differ diff --git a/org.eclipse.nebula.widgets.nattable.extension.e4.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.extension.e4.feature/feature.xml index b675a4f29..db9c1ab8b 100644 --- a/org.eclipse.nebula.widgets.nattable.extension.e4.feature/feature.xml +++ b/org.eclipse.nebula.widgets.nattable.extension.e4.feature/feature.xml @@ -19,17 +19,8 @@ %license - - - - - - + version="0.0.0"/> 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 069475d44..197e4274c 100644 --- a/org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature/feature.xml +++ b/org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature/feature.xml @@ -21,23 +21,6 @@ - - - - + version="0.0.0"/> diff --git a/org.eclipse.nebula.widgets.nattable.extension.glazedlists/pom.xml b/org.eclipse.nebula.widgets.nattable.extension.glazedlists/pom.xml index 32a785153..cbd219b10 100644 --- a/org.eclipse.nebula.widgets.nattable.extension.glazedlists/pom.xml +++ b/org.eclipse.nebula.widgets.nattable.extension.glazedlists/pom.xml @@ -47,17 +47,17 @@ commons-codec commons-codec - 1.17.0 + 1.18.0 org.eclipse.platform org.eclipse.swt - 3.114.100 + 3.128.0 org.slf4j slf4j-api - 1.7.30 + 2.0.17 org.eclipse.nebula.widgets.nattable diff --git a/org.eclipse.nebula.widgets.nattable.extension.nebula.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.extension.nebula.feature/feature.xml index 13cc2535b..f8ee8d1e2 100644 --- a/org.eclipse.nebula.widgets.nattable.extension.nebula.feature/feature.xml +++ b/org.eclipse.nebula.widgets.nattable.extension.nebula.feature/feature.xml @@ -23,24 +23,4 @@ id="org.eclipse.nebula.widgets.nattable.extension.nebula" version="0.0.0"/> - - - - - - - - - - diff --git a/org.eclipse.nebula.widgets.nattable.extension.nebula/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.extension.nebula/META-INF/MANIFEST.MF index 493a95cb9..8261ba221 100644 --- a/org.eclipse.nebula.widgets.nattable.extension.nebula/META-INF/MANIFEST.MF +++ b/org.eclipse.nebula.widgets.nattable.extension.nebula/META-INF/MANIFEST.MF @@ -8,13 +8,13 @@ Export-Package: org.eclipse.nebula.widgets.nattable.extension.nebula.cdatetime;v org.eclipse.nebula.widgets.nattable.extension.nebula.richtext;version="2.6.0" Import-Package: org.apache.commons.lang3;version="[3.14.0,4.0.0)", org.apache.commons.text;version="[1.12.0,2.0.0)", - org.eclipse.collections.api;version="10.4.0", - org.eclipse.collections.api.block.predicate;version="10.4.0", - org.eclipse.collections.api.factory;version="10.4.0", - org.eclipse.collections.api.factory.list;version="10.4.0", - org.eclipse.collections.api.list;version="10.4.0", - org.eclipse.collections.api.tuple.primitive;version="10.4.0", - org.eclipse.collections.impl.tuple.primitive;version="10.4.0", + org.eclipse.collections.api;version="11.1.0", + org.eclipse.collections.api.block.predicate;version="11.1.0", + org.eclipse.collections.api.factory;version="11.1.0", + org.eclipse.collections.api.factory.list;version="11.1.0", + org.eclipse.collections.api.list;version="11.1.0", + org.eclipse.collections.api.tuple.primitive;version="11.1.0", + org.eclipse.collections.impl.tuple.primitive;version="11.1.0", org.eclipse.nebula.cwt.base, org.eclipse.nebula.cwt.v, org.eclipse.nebula.widgets.cdatetime, diff --git a/org.eclipse.nebula.widgets.nattable.extension.nebula/pom.xml b/org.eclipse.nebula.widgets.nattable.extension.nebula/pom.xml index 9118fa9bf..a66f94caf 100644 --- a/org.eclipse.nebula.widgets.nattable.extension.nebula/pom.xml +++ b/org.eclipse.nebula.widgets.nattable.extension.nebula/pom.xml @@ -54,17 +54,17 @@ org.eclipse.platform org.eclipse.swt - 3.114.100 + 3.120.0 org.slf4j slf4j-api - 1.7.30 + 2.0.17 org.apache.commons commons-text - 1.12.0 + 1.13.1 org.eclipse.nebula.widgets.nattable diff --git a/org.eclipse.nebula.widgets.nattable.extension.poi.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.extension.poi.feature/feature.xml index 7930d61a8..4f1055921 100644 --- a/org.eclipse.nebula.widgets.nattable.extension.poi.feature/feature.xml +++ b/org.eclipse.nebula.widgets.nattable.extension.poi.feature/feature.xml @@ -23,44 +23,4 @@ id="org.eclipse.nebula.widgets.nattable.extension.poi" version="0.0.0"/> - - - - - - - - - - - - - - - - - - - - diff --git a/org.eclipse.nebula.widgets.nattable.extension.poi/pom.xml b/org.eclipse.nebula.widgets.nattable.extension.poi/pom.xml index 3d3c5797a..315693ab7 100644 --- a/org.eclipse.nebula.widgets.nattable.extension.poi/pom.xml +++ b/org.eclipse.nebula.widgets.nattable.extension.poi/pom.xml @@ -42,18 +42,23 @@ org.apache.poi poi - 5.3.0 + 5.4.1 + + + org.apache.poi + poi-ooxml + 5.4.1 org.eclipse.platform org.eclipse.swt - 3.114.100 + 3.120.0 org.slf4j slf4j-api - 1.7.30 + 2.0.17 org.eclipse.nebula.widgets.nattable diff --git a/org.eclipse.nebula.widgets.nattable.updatesite/assembly.xml b/org.eclipse.nebula.widgets.nattable.updatesite/assembly.xml deleted file mode 100644 index 88b9af671..000000000 --- a/org.eclipse.nebula.widgets.nattable.updatesite/assembly.xml +++ /dev/null @@ -1,13 +0,0 @@ - - site - - zip - - false - - - ${project.build.directory}/repository - / - - - \ No newline at end of file diff --git a/org.eclipse.nebula.widgets.nattable.updatesite/category.xml b/org.eclipse.nebula.widgets.nattable.updatesite/category.xml index 66be8c6d9..3c7de52d1 100644 --- a/org.eclipse.nebula.widgets.nattable.updatesite/category.xml +++ b/org.eclipse.nebula.widgets.nattable.updatesite/category.xml @@ -30,7 +30,9 @@ - + + + The core NatTable functions. @@ -41,4 +43,9 @@ Extensions to provide additional features based on third-party libraries. + + + NatTable example data used in examples. + + diff --git a/org.eclipse.nebula.widgets.nattable.updatesite/pom.xml b/org.eclipse.nebula.widgets.nattable.updatesite/pom.xml index 888d0d405..73a870dd3 100644 --- a/org.eclipse.nebula.widgets.nattable.updatesite/pom.xml +++ b/org.eclipse.nebula.widgets.nattable.updatesite/pom.xml @@ -13,55 +13,25 @@ org.eclipse.nebula.widgets.nattable.updatesite eclipse-repository - + NatTable Update Site - - org.apache.maven.plugins - maven-assembly-plugin - - - assembly.xml - - - - - make-assembly - package - - single - - - - - - - maven-resources-plugin - - - copy-resources - validate - - copy-resources - - - ${basedir}/target/repository - - - . - - index.html - web/* - - - - - - - - + + + org.eclipse.tycho + tycho-p2-repository-plugin + ${tycho-version} + + true + true + true + true + NatTable + + + maven-deploy-plugin diff --git a/pom.xml b/pom.xml index 18af63a95..bade84eaa 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ - 4.0.12 + 4.0.13 1.5.2 ${project.version} @@ -237,6 +237,20 @@ + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho-version} + + + + org.apache.aries.spifly.dynamic.bundle + 2 + true + + + + org.apache.maven.plugins maven-resources-plugin diff --git a/target-platform/target-platform.target b/target-platform/target-platform.target index 1fef77259..e55f43af3 100644 --- a/target-platform/target-platform.target +++ b/target-platform/target-platform.target @@ -12,10 +12,6 @@ - - - - @@ -36,5 +32,27 @@ + + + + org.apache.aries.spifly + org.apache.aries.spifly.dynamic.bundle + 1.3.7 + jar + + + org.eclipse.collections + eclipse-collections-api + 12.0.0 + jar + + + org.eclipse.collections + eclipse-collections + 12.0.0 + jar + + + \ No newline at end of file