Update maven versions
Support updating to major versions of select dependencies, e.g., guava
and icu4j, which tend to always produce major version increments
Also add org.apache.derby:derby
diff --git a/jetty/Mirror Jetty.launch b/jetty/Mirror Jetty.launch
index 62f634a..50907ad 100644
--- a/jetty/Mirror Jetty.launch
+++ b/jetty/Mirror Jetty.launch
@@ -8,6 +8,6 @@
</mapAttribute>
<stringAttribute key="org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE" value="${workspace_loc:/org.eclipse.jetty.mirror}/build.log"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${maven.build.command}"/>
- <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-DX -DDtycho.debug.resolver=true -Dmaven.artifact.threads=16 -Duser.home=${system_property:user.home} -Dorg.eclipse.justj.p2.manager.args="-remote localhost:${project_loc:/org.eclipse.oomph.incubator}/jetty/updates" -Djetty-version=10.0.12 -Dbuild.type=nightly clean verify"/>
+ <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-DX -DDtycho.debug.resolver=true -Dmaven.artifact.threads=16 -Duser.home=${system_property:user.home} -Dorg.eclipse.justj.p2.manager.args="-remote localhost:${project_loc:/org.eclipse.oomph.incubator}/jetty/updates" -Djetty-version=10.0.15 -Dbuild.type=nightly clean verify"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${project_loc:/org.eclipse.oomph.incubator}/jetty"/>
</launchConfiguration>
diff --git a/maven-bnd/org.eclipse.oomph.maven.bnd.generator/MavenBNDUpdater.launch b/maven-bnd/org.eclipse.oomph.maven.bnd.generator/MavenBNDUpdater.launch
index cad3de5..f8462f0 100644
--- a/maven-bnd/org.eclipse.oomph.maven.bnd.generator/MavenBNDUpdater.launch
+++ b/maven-bnd/org.eclipse.oomph.maven.bnd.generator/MavenBNDUpdater.launch
@@ -13,6 +13,6 @@
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.oomph.maven.bnd.generator.Analyzer"/>
<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.eclipse.oomph.maven.bnd.generator"/>
- <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-version 4.28.0 -target ${resource_loc:/org.eclipse.oomph.incubator/maven-bnd/tp/MavenBND.target} -category ${resource_loc:/org.eclipse.oomph.incubator/maven-bnd/site/category.xml} -verbose"/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-version 4.29.0 -target ${resource_loc:/org.eclipse.oomph.incubator/maven-bnd/tp/MavenBND.target} -category ${resource_loc:/org.eclipse.oomph.incubator/maven-bnd/site/category.xml} -verbose"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.oomph.maven.bnd.generator"/>
</launchConfiguration>
diff --git a/maven/org.eclipse.oomph.maven.generator/MavenDependencyAnalyzer.launch b/maven/org.eclipse.oomph.maven.generator/MavenDependencyAnalyzer.launch
index 6a2fada..cb80bee 100644
--- a/maven/org.eclipse.oomph.maven.generator/MavenDependencyAnalyzer.launch
+++ b/maven/org.eclipse.oomph.maven.generator/MavenDependencyAnalyzer.launch
@@ -13,7 +13,7 @@
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.oomph.maven.generator.DependencyAnalyzer"/>
<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.eclipse.maven.generator"/>
- <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-targets platform=https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.releng.aggregator/master/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target windowbuilder=https://raw.githubusercontent.com/eclipse/windowbuilder/master/target-platform/mvn/wb-mvn.target tm4e=https://raw.githubusercontent.com/eclipse/tm4e/master/target-platform/tm4e-target.target m2e=https://raw.githubusercontent.com/eclipse-m2e/m2e-core/master/target-platform/target-platform.target wwd=https://raw.githubusercontent.com/eclipse/wildwebdeveloper/master/target-platform/target-platform.target linuxtools=https://raw.githubusercontent.com/eclipse-linuxtools/org.eclipse.linuxtools/master/releng/org.eclipse.linuxtools.target/linuxtools-e4.28.target egit=https://git.eclipse.org/c/egit/egit.git/plain/org.eclipse.egit.target/egit-4.28.target supplement=local:${resource_loc:/org.eclipse.oomph.incubator/maven/tp/other/MavenSupplement.target} -exclude org.jruby.joni:joni:2.1.48 "// Not a bundle" org.apache.lucene:.*:.* "// Not bundles" org.mockito:mockito-inline:.* "// Not a bundle" org.apache.commons:commons-digester3:3.* "// requires 'java.package; net.sf.cglib.proxy 0.0.0' but it could not be found" org.eclipse.jetty:.*:.* "// Ignore all Jetty artifacts" io.takari.m2e.workspace:org.eclipse.m2e.workspace.cli:.* "// This is not generally useful except for m2e" commons-jxpath:commons-jxpath:1.3 // Depends on relaly old orbit things -ignore commons-collections:commons-collections:200[234].* io.takari.m2e.workspace:org.eclipse.m2e.workspace.cli:0.4.0 ch.qos.logback:logback-classic:1.4.7 // Has non-optional missing required service capability -cache ${project_loc:/org.eclipse.oomph.maven.generator}/cache -merge ${resource_loc:/org.eclipse.oomph.incubator/maven/tp/Maven.target} -report ${project_loc:/org.eclipse.oomph.maven.generator}/report"/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-targets platform=https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.releng.aggregator/master/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target windowbuilder=https://raw.githubusercontent.com/eclipse/windowbuilder/master/target-platform/mvn/wb-mvn.target tm4e=https://raw.githubusercontent.com/eclipse/tm4e/master/target-platform/tm4e-target.target m2e=https://raw.githubusercontent.com/eclipse-m2e/m2e-core/master/target-platform/target-platform.target wwd=https://raw.githubusercontent.com/eclipse/wildwebdeveloper/master/target-platform/target-platform.target linuxtools=https://raw.githubusercontent.com/eclipse-linuxtools/org.eclipse.linuxtools/master/releng/org.eclipse.linuxtools.target/linuxtools-e4.28.target egit=https://git.eclipse.org/c/egit/egit.git/plain/org.eclipse.egit.target/egit-4.28.target supplement=local:${resource_loc:/org.eclipse.oomph.incubator/maven/tp/other/MavenSupplement.target} -exclude org.jruby.joni:joni:2.1.48 "// Not a bundle" org.apache.lucene:.*:.* "// Not bundles" org.mockito:mockito-inline:.* "// Not a bundle" org.apache.commons:commons-digester3:3.* "// requires 'java.package; net.sf.cglib.proxy 0.0.0' but it could not be found" org.eclipse.jetty:.*:.* "// Ignore all Jetty artifacts" io.takari.m2e.workspace:org.eclipse.m2e.workspace.cli:.* "// This is not generally useful except for m2e" commons-jxpath:commons-jxpath:1.3 // Depends on relaly old orbit things -include-major com.google.guava:guava com.ibm.icu:icu4j -ignore commons-collections:commons-collections:200[234].* io.takari.m2e.workspace:org.eclipse.m2e.workspace.cli:0.4.0 ch.qos.logback:logback-classic:1.4.7 // Has non-optional missing required service capability -cache ${project_loc:/org.eclipse.oomph.maven.generator}/cache -merge ${resource_loc:/org.eclipse.oomph.incubator/maven/tp/Maven.target} -report ${project_loc:/org.eclipse.oomph.maven.generator}/report"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.oomph.maven.generator"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dxorg.eclipse.maven.generator.redirection=https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.releng.aggregator/master/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target->file:/D:/Users/merks/platform-sdk-4.27/git/eclipse.platform.releng.aggregator/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target"/>
</launchConfiguration>
diff --git a/maven/org.eclipse.oomph.maven.generator/report/m2e/REPORT.md b/maven/org.eclipse.oomph.maven.generator/report/m2e/REPORT.md
index 88164b6..63b601a 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/m2e/REPORT.md
+++ b/maven/org.eclipse.oomph.maven.generator/report/m2e/REPORT.md
@@ -1,8 +1,13 @@
# Target Platform: [m2e](https://raw.githubusercontent.com/eclipse-m2e/m2e-core/master/target-platform/target-platform.target)
## Minor Updates
+ - [biz.aQute.bnd](https://repo1.maven.org/maven2/biz/aQute/bnd/)
+ - [biz.aQute.bnd.util](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.util/) **[6.4.0](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.util/6.4.0)** < [6.4.1](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.util/6.4.1/)
+ - [biz.aQute.bndlib](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/) **[6.4.0](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.4.0)** < [6.4.1](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.4.1/)
- [ch.qos.logback](https://repo1.maven.org/maven2/ch/qos/logback/)
- [logback-classic](https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/) **[1.2.12](https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/1.2.12)** < [1.4.6](https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/1.4.6/)
+ - [com.google.guava](https://repo1.maven.org/maven2/com/google/guava/)
+ - [guava](https://repo1.maven.org/maven2/com/google/guava/guava/) **[31.1-jre](https://repo1.maven.org/maven2/com/google/guava/guava/31.1-jre)** < [32.0.1-jre](https://repo1.maven.org/maven2/com/google/guava/guava/32.0.1-jre/)
- [org.mockito](https://repo1.maven.org/maven2/org/mockito/)
- [mockito-core](https://repo1.maven.org/maven2/org/mockito/mockito-core/) **[5.3.0](https://repo1.maven.org/maven2/org/mockito/mockito-core/5.3.0)** < [5.3.1](https://repo1.maven.org/maven2/org/mockito/mockito-core/5.3.1/)
diff --git a/maven/org.eclipse.oomph.maven.generator/report/m2e/original.target b/maven/org.eclipse.oomph.maven.generator/report/m2e/original.target
index 5b8ff96..eef93ba 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/m2e/original.target
+++ b/maven/org.eclipse.oomph.maven.generator/report/m2e/original.target
@@ -31,7 +31,7 @@
<unit id="org.eclipse.wildwebdeveloper.xml.feature.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
- <repository location="https://download.eclipse.org/lsp4e/releases/0.22.0/"/><!--Keep in sync with repo-ref in org.eclipse.m2e.repository/category.xml-->
+ <repository location="https://download.eclipse.org/lsp4e/releases/0.23.0/"/><!--Keep in sync with repo-ref in org.eclipse.m2e.repository/category.xml-->
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.20.1/"/><!--Keep in sync with repo-ref in org.eclipse.m2e.repository/category.xml-->
<unit id="org.eclipse.lsp4e" version="0.0.0"/>
</location>
diff --git a/maven/org.eclipse.oomph.maven.generator/report/m2e/updated.target b/maven/org.eclipse.oomph.maven.generator/report/m2e/updated.target
index f448e24..ca4956d 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/m2e/updated.target
+++ b/maven/org.eclipse.oomph.maven.generator/report/m2e/updated.target
@@ -31,7 +31,7 @@
<unit id="org.eclipse.wildwebdeveloper.xml.feature.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
- <repository location="https://download.eclipse.org/lsp4e/releases/0.22.0/"/><!--Keep in sync with repo-ref in org.eclipse.m2e.repository/category.xml-->
+ <repository location="https://download.eclipse.org/lsp4e/releases/0.23.0/"/><!--Keep in sync with repo-ref in org.eclipse.m2e.repository/category.xml-->
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.20.1/"/><!--Keep in sync with repo-ref in org.eclipse.m2e.repository/category.xml-->
<unit id="org.eclipse.lsp4e" version="0.0.0"/>
</location>
@@ -44,13 +44,13 @@
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bnd.util</artifactId>
- <version>6.4.0</version>
+ <version>6.4.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
- <version>6.4.0</version>
+ <version>6.4.1</version>
<type>jar</type>
</dependency>
<dependency>
@@ -94,7 +94,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>31.1-jre</version>
+ <version>32.0.1-jre</version>
<type>jar</type>
</dependency>
<dependency>
diff --git a/maven/org.eclipse.oomph.maven.generator/report/merged-target/REPORT.md b/maven/org.eclipse.oomph.maven.generator/report/merged-target/REPORT.md
index b94a891..63530dc 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/merged-target/REPORT.md
+++ b/maven/org.eclipse.oomph.maven.generator/report/merged-target/REPORT.md
@@ -31,11 +31,11 @@
- [args4j](https://repo1.maven.org/maven2/args4j/)
- [args4j](https://repo1.maven.org/maven2/args4j/args4j/) **[2.33](https://repo1.maven.org/maven2/args4j/args4j/2.33)**
- [biz.aQute.bnd](https://repo1.maven.org/maven2/biz/aQute/bnd/)
- - [biz.aQute.bnd.annotation](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/) **[6.4.0](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/6.4.0)**
- - [biz.aQute.bnd.embedded-repo](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.embedded-repo/) **[6.4.0](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.embedded-repo/6.4.0)**
- - [biz.aQute.bnd.util](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.util/) **[6.4.0](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.util/6.4.0)**
- - [biz.aQute.bndlib](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/) **[6.4.0](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.4.0)**
- - [biz.aQute.repository](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.repository/) **[6.4.0](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.repository/6.4.0)**
+ - [biz.aQute.bnd.annotation](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/) **[6.4.1](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/6.4.1)**
+ - [biz.aQute.bnd.embedded-repo](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.embedded-repo/) **[6.4.1](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.embedded-repo/6.4.1)**
+ - [biz.aQute.bnd.util](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.util/) **[6.4.1](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.util/6.4.1)**
+ - [biz.aQute.bndlib](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/) **[6.4.1](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.4.1)**
+ - [biz.aQute.repository](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.repository/) **[6.4.1](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.repository/6.4.1)**
- [ch.qos.logback](https://repo1.maven.org/maven2/ch/qos/logback/)
- [logback-classic](https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/) **[1.4.6](https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/1.4.6)**
- [logback-core](https://repo1.maven.org/maven2/ch/qos/logback/logback-core/) **[1.4.7](https://repo1.maven.org/maven2/ch/qos/logback/logback-core/1.4.7)**
@@ -49,7 +49,7 @@
- [gson](https://repo1.maven.org/maven2/com/google/code/gson/gson/) **[2.10.1](https://repo1.maven.org/maven2/com/google/code/gson/gson/2.10.1)**
- [com.google.guava](https://repo1.maven.org/maven2/com/google/guava/)
- [failureaccess](https://repo1.maven.org/maven2/com/google/guava/failureaccess/) **[1.0.1](https://repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1)**
- - [guava](https://repo1.maven.org/maven2/com/google/guava/guava/) **[31.1-jre](https://repo1.maven.org/maven2/com/google/guava/guava/31.1-jre)**
+ - [guava](https://repo1.maven.org/maven2/com/google/guava/guava/) **[32.0.1-jre](https://repo1.maven.org/maven2/com/google/guava/guava/32.0.1-jre)**
- [com.googlecode.javaewah](https://repo1.maven.org/maven2/com/googlecode/javaewah/)
- [JavaEWAH](https://repo1.maven.org/maven2/com/googlecode/javaewah/JavaEWAH/) **[1.2.3](https://repo1.maven.org/maven2/com/googlecode/javaewah/JavaEWAH/1.2.3)**
- [com.ibm.icu](https://repo1.maven.org/maven2/com/ibm/icu/)
@@ -65,7 +65,7 @@
- [commons-fileupload](https://repo1.maven.org/maven2/commons-fileupload/)
- [commons-fileupload](https://repo1.maven.org/maven2/commons-fileupload/commons-fileupload/) **[1.5](https://repo1.maven.org/maven2/commons-fileupload/commons-fileupload/1.5)**
- [commons-io](https://repo1.maven.org/maven2/commons-io/)
- - [commons-io](https://repo1.maven.org/maven2/commons-io/commons-io/) **[2.12.0](https://repo1.maven.org/maven2/commons-io/commons-io/2.12.0)**
+ - [commons-io](https://repo1.maven.org/maven2/commons-io/commons-io/) **[2.13.0](https://repo1.maven.org/maven2/commons-io/commons-io/2.13.0)**
- [commons-lang](https://repo1.maven.org/maven2/commons-lang/)
- [commons-lang](https://repo1.maven.org/maven2/commons-lang/commons-lang/) **[2.6](https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6)**
- [commons-logging](https://repo1.maven.org/maven2/commons-logging/)
@@ -98,6 +98,8 @@
- [org.apache.aries.spifly.dynamic.bundle](https://repo1.maven.org/maven2/org/apache/aries/spifly/org.apache.aries.spifly.dynamic.bundle/) **[1.3.6](https://repo1.maven.org/maven2/org/apache/aries/spifly/org.apache.aries.spifly.dynamic.bundle/1.3.6)**
- [org.apache.commons](https://repo1.maven.org/maven2/org/apache/commons/)
- [commons-compress](https://repo1.maven.org/maven2/org/apache/commons/commons-compress/) **[1.23.0](https://repo1.maven.org/maven2/org/apache/commons/commons-compress/1.23.0)**
+ - [org.apache.derby](https://repo1.maven.org/maven2/org/apache/derby/)
+ - [derby](https://repo1.maven.org/maven2/org/apache/derby/derby/) **[10.16.1.1](https://repo1.maven.org/maven2/org/apache/derby/derby/10.16.1.1)**
- [org.apache.felix](https://repo1.maven.org/maven2/org/apache/felix/)
- [org.apache.felix.gogo.command](https://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.gogo.command/) **[1.1.2](https://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.gogo.command/1.1.2)**
- [org.apache.felix.gogo.runtime](https://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.gogo.runtime/) **[1.1.6](https://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.gogo.runtime/1.1.6)**
diff --git a/maven/org.eclipse.oomph.maven.generator/report/merged-target/original.target b/maven/org.eclipse.oomph.maven.generator/report/merged-target/original.target
index 7697ac0..493cca0 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/merged-target/original.target
+++ b/maven/org.eclipse.oomph.maven.generator/report/merged-target/original.target
@@ -3,7 +3,7 @@
<target name="Maven" sequenceNumber="1">
<locations>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven">
- <feature id="org.eclipse.oomph.maven.all" label="Oomph Maven All" provider-name="Eclipse Oomph Project" version="4.28.0">
+ <feature id="org.eclipse.oomph.maven.all" label="Oomph Maven All" provider-name="Eclipse Oomph Project" version="4.29.0">
<description>This feature's dependencies are pulled directly from Maven central.</description>
<copyright>
Copyright (c) 2023 Eclipse contributors and others.
@@ -27,31 +27,31 @@
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bnd.annotation</artifactId>
- <version>6.4.0</version>
+ <version>6.4.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bnd.embedded-repo</artifactId>
- <version>6.4.0</version>
+ <version>6.4.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bnd.util</artifactId>
- <version>6.4.0</version>
+ <version>6.4.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
- <version>6.4.0</version>
+ <version>6.4.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.repository</artifactId>
- <version>6.4.0</version>
+ <version>6.4.1</version>
<type>jar</type>
</dependency>
<dependency>
@@ -105,7 +105,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>31.1-jre</version>
+ <version>32.0.1-jre</version>
<type>jar</type>
</dependency>
<dependency>
@@ -153,7 +153,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.12.0</version>
+ <version>2.13.0</version>
<type>jar</type>
</dependency>
<dependency>
@@ -259,6 +259,12 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.16.1.1</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.command</artifactId>
<version>1.1.2</version>
diff --git a/maven/org.eclipse.oomph.maven.generator/report/merged-target/updated.target b/maven/org.eclipse.oomph.maven.generator/report/merged-target/updated.target
index 7697ac0..493cca0 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/merged-target/updated.target
+++ b/maven/org.eclipse.oomph.maven.generator/report/merged-target/updated.target
@@ -3,7 +3,7 @@
<target name="Maven" sequenceNumber="1">
<locations>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven">
- <feature id="org.eclipse.oomph.maven.all" label="Oomph Maven All" provider-name="Eclipse Oomph Project" version="4.28.0">
+ <feature id="org.eclipse.oomph.maven.all" label="Oomph Maven All" provider-name="Eclipse Oomph Project" version="4.29.0">
<description>This feature's dependencies are pulled directly from Maven central.</description>
<copyright>
Copyright (c) 2023 Eclipse contributors and others.
@@ -27,31 +27,31 @@
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bnd.annotation</artifactId>
- <version>6.4.0</version>
+ <version>6.4.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bnd.embedded-repo</artifactId>
- <version>6.4.0</version>
+ <version>6.4.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bnd.util</artifactId>
- <version>6.4.0</version>
+ <version>6.4.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
- <version>6.4.0</version>
+ <version>6.4.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.repository</artifactId>
- <version>6.4.0</version>
+ <version>6.4.1</version>
<type>jar</type>
</dependency>
<dependency>
@@ -105,7 +105,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>31.1-jre</version>
+ <version>32.0.1-jre</version>
<type>jar</type>
</dependency>
<dependency>
@@ -153,7 +153,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.12.0</version>
+ <version>2.13.0</version>
<type>jar</type>
</dependency>
<dependency>
@@ -259,6 +259,12 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.16.1.1</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.command</artifactId>
<version>1.1.2</version>
diff --git a/maven/org.eclipse.oomph.maven.generator/report/platform/REPORT.md b/maven/org.eclipse.oomph.maven.generator/report/platform/REPORT.md
index b56e733..78705e4 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/platform/REPORT.md
+++ b/maven/org.eclipse.oomph.maven.generator/report/platform/REPORT.md
@@ -1,10 +1,18 @@
# Target Platform: [platform](https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.releng.aggregator/master/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target)
## Minor Updates
+ - [biz.aQute.bnd](https://repo1.maven.org/maven2/biz/aQute/bnd/)
+ - [biz.aQute.bnd.annotation](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/) **[6.4.0](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/6.4.0)** < [6.4.1](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/6.4.1/)
+ - [biz.aQute.bnd.embedded-repo](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.embedded-repo/) **[6.4.0](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.embedded-repo/6.4.0)** < [6.4.1](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.embedded-repo/6.4.1/)
+ - [biz.aQute.bnd.util](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.util/) **[6.4.0](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.util/6.4.0)** < [6.4.1](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.util/6.4.1/)
+ - [biz.aQute.bndlib](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/) **[6.4.0](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.4.0)** < [6.4.1](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.4.1/)
+ - [biz.aQute.repository](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.repository/) **[6.4.0](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.repository/6.4.0)** < [6.4.1](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.repository/6.4.1/)
- [com.fasterxml.jackson.core](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/)
- [jackson-annotations](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/) **[2.15.1](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.15.1)** < [2.15.2](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.15.2/)
- [jackson-core](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/) **[2.15.1](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.15.1)** < [2.15.2](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.15.2/)
- [jackson-databind](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/) **[2.15.1](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.15.1)** < [2.15.2](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.15.2/)
+ - [commons-io](https://repo1.maven.org/maven2/commons-io/)
+ - [commons-io](https://repo1.maven.org/maven2/commons-io/commons-io/) **[2.12.0](https://repo1.maven.org/maven2/commons-io/commons-io/2.12.0)** < [2.13.0](https://repo1.maven.org/maven2/commons-io/commons-io/2.13.0/)
- [net.bytebuddy](https://repo1.maven.org/maven2/net/bytebuddy/)
- [byte-buddy](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/) **[1.14.4](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.14.4)** < [1.14.5](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.14.5/)
- [byte-buddy-agent](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/) **[1.14.4](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.4)** < [1.14.5](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.5/)
diff --git a/maven/org.eclipse.oomph.maven.generator/report/platform/updated.target b/maven/org.eclipse.oomph.maven.generator/report/platform/updated.target
index 08d5102..6c17866 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/platform/updated.target
+++ b/maven/org.eclipse.oomph.maven.generator/report/platform/updated.target
@@ -245,7 +245,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.12.0</version>
+ <version>2.13.0</version>
</dependency>
</dependencies>
</location>
@@ -555,29 +555,29 @@
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bnd.util</artifactId>
- <version>6.4.0</version>
+ <version>6.4.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
- <version>6.4.0</version>
+ <version>6.4.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bnd.annotation</artifactId>
- <version>6.4.0</version>
+ <version>6.4.1</version>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.repository</artifactId>
- <version>6.4.0</version>
+ <version>6.4.1</version>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bnd.embedded-repo</artifactId>
- <version>6.4.0</version>
+ <version>6.4.1</version>
</dependency>
</dependencies>
</location>
diff --git a/maven/org.eclipse.oomph.maven.generator/report/supplement/REPORT.md b/maven/org.eclipse.oomph.maven.generator/report/supplement/REPORT.md
index 24a8d85..ea573c3 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/supplement/REPORT.md
+++ b/maven/org.eclipse.oomph.maven.generator/report/supplement/REPORT.md
@@ -18,6 +18,8 @@
- [javax.servlet-api](https://repo1.maven.org/maven2/javax/servlet/javax.servlet-api/) **[3.1.0](https://repo1.maven.org/maven2/javax/servlet/javax.servlet-api/3.1.0)**
- [org.apache.aries.spifly](https://repo1.maven.org/maven2/org/apache/aries/spifly/)
- [org.apache.aries.spifly.dynamic.bundle](https://repo1.maven.org/maven2/org/apache/aries/spifly/org.apache.aries.spifly.dynamic.bundle/) **[1.3.6](https://repo1.maven.org/maven2/org/apache/aries/spifly/org.apache.aries.spifly.dynamic.bundle/1.3.6)**
+ - [org.apache.derby](https://repo1.maven.org/maven2/org/apache/derby/)
+ - [derby](https://repo1.maven.org/maven2/org/apache/derby/derby/) **[10.16.1.1](https://repo1.maven.org/maven2/org/apache/derby/derby/10.16.1.1)**
- [org.apache.felix](https://repo1.maven.org/maven2/org/apache/felix/)
- [org.apache.felix.http.servlet-api](https://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.http.servlet-api/) **[1.2.0](https://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.http.servlet-api/1.2.0)**
- [org.eclipse.jetty.toolchain](https://repo1.maven.org/maven2/org/eclipse/jetty/toolchain/)
diff --git a/maven/org.eclipse.oomph.maven.generator/report/supplement/original.target b/maven/org.eclipse.oomph.maven.generator/report/supplement/original.target
index 38945c4..38632c0 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/supplement/original.target
+++ b/maven/org.eclipse.oomph.maven.generator/report/supplement/original.target
@@ -116,6 +116,13 @@
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.16.1.1</version>
+ <type>jar</type>
+ </dependency>
+
</dependencies>
</location>
</locations>
diff --git a/maven/org.eclipse.oomph.maven.generator/report/supplement/updated.target b/maven/org.eclipse.oomph.maven.generator/report/supplement/updated.target
index 38945c4..38632c0 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/supplement/updated.target
+++ b/maven/org.eclipse.oomph.maven.generator/report/supplement/updated.target
@@ -116,6 +116,13 @@
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.16.1.1</version>
+ <type>jar</type>
+ </dependency>
+
</dependencies>
</location>
</locations>
diff --git a/maven/org.eclipse.oomph.maven.generator/report/tm4e/REPORT.md b/maven/org.eclipse.oomph.maven.generator/report/tm4e/REPORT.md
index 2b1fea6..39d507c 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/tm4e/REPORT.md
+++ b/maven/org.eclipse.oomph.maven.generator/report/tm4e/REPORT.md
@@ -1,5 +1,12 @@
# Target Platform: [tm4e](https://raw.githubusercontent.com/eclipse/tm4e/master/target-platform/tm4e-target.target)
+## Minor Updates
+ - [org.jruby.joni](https://repo1.maven.org/maven2/org/jruby/joni/)
+ - [joni](https://repo1.maven.org/maven2/org/jruby/joni/joni/) **[2.1.48](https://repo1.maven.org/maven2/org/jruby/joni/joni/2.1.48)** < [2.2.1](https://repo1.maven.org/maven2/org/jruby/joni/joni/2.2.1/)
+
+## Updates Applied
+[updated.target](updated.target)
+
## Content
- [org.jruby.joni](https://repo1.maven.org/maven2/org/jruby/joni/)
- [joni](https://repo1.maven.org/maven2/org/jruby/joni/joni/) **[2.1.48](https://repo1.maven.org/maven2/org/jruby/joni/joni/2.1.48)**
diff --git a/maven/org.eclipse.oomph.maven.generator/report/tm4e/updated.target b/maven/org.eclipse.oomph.maven.generator/report/tm4e/updated.target
index 9150a16..9827c67 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/tm4e/updated.target
+++ b/maven/org.eclipse.oomph.maven.generator/report/tm4e/updated.target
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.jruby.joni</groupId>
<artifactId>joni</artifactId>
- <version>2.1.48</version>
+ <version>2.2.1</version>
<type>jar</type>
</dependency>
</dependencies>
diff --git a/maven/org.eclipse.oomph.maven.generator/report/windowbuilder/REPORT.md b/maven/org.eclipse.oomph.maven.generator/report/windowbuilder/REPORT.md
index 92bb3b0..0d2ebfd 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/windowbuilder/REPORT.md
+++ b/maven/org.eclipse.oomph.maven.generator/report/windowbuilder/REPORT.md
@@ -1,6 +1,8 @@
# Target Platform: [windowbuilder](https://raw.githubusercontent.com/eclipse/windowbuilder/master/target-platform/mvn/wb-mvn.target)
## Minor Updates
+ - [commons-io](https://repo1.maven.org/maven2/commons-io/)
+ - [commons-io](https://repo1.maven.org/maven2/commons-io/commons-io/) **[2.12.0](https://repo1.maven.org/maven2/commons-io/commons-io/2.12.0)** < [2.13.0](https://repo1.maven.org/maven2/commons-io/commons-io/2.13.0/)
- [org.apache.commons](https://repo1.maven.org/maven2/org/apache/commons/)
- [commons-digester3](https://repo1.maven.org/maven2/org/apache/commons/commons-digester3/) **[3.1](https://repo1.maven.org/maven2/org/apache/commons/commons-digester3/3.1)** < [3.2](https://repo1.maven.org/maven2/org/apache/commons/commons-digester3/3.2/)
diff --git a/maven/org.eclipse.oomph.maven.generator/report/windowbuilder/updated.target b/maven/org.eclipse.oomph.maven.generator/report/windowbuilder/updated.target
index a978e91..4900e3f 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/windowbuilder/updated.target
+++ b/maven/org.eclipse.oomph.maven.generator/report/windowbuilder/updated.target
@@ -57,7 +57,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.12.0</version>
+ <version>2.13.0</version>
<type>jar</type>
</dependency>
</dependencies>
diff --git a/maven/org.eclipse.oomph.maven.generator/src/org/eclipse/oomph/maven/generator/DependencyAnalyzer.java b/maven/org.eclipse.oomph.maven.generator/src/org/eclipse/oomph/maven/generator/DependencyAnalyzer.java
index 397183a..c8b771d 100644
--- a/maven/org.eclipse.oomph.maven.generator/src/org/eclipse/oomph/maven/generator/DependencyAnalyzer.java
+++ b/maven/org.eclipse.oomph.maven.generator/src/org/eclipse/oomph/maven/generator/DependencyAnalyzer.java
@@ -63,15 +63,19 @@
var ignorePatterns = ignores.stream().filter(it -> !it.startsWith("/")).map(Pattern::compile)
.collect(Collectors.toList());
- var analyzer = new Analyzer(contentHandler, ignorePatterns);
+ var majorInclusions = getArguments(arguments, "-include-major");
+ var majorInclusionPatterns = majorInclusions.stream().filter(it -> !it.startsWith("/")).map(Pattern::compile)
+ .collect(Collectors.toList());
+
+ var analyzer = new Analyzer(contentHandler, ignorePatterns, majorInclusionPatterns);
var dependencies = new TreeSet<Dependency>();
var reporter = new Reporter(getArgument(arguments, "-report"));
- var targets = getArguments(arguments, "-targets").stream().filter(it -> !it.startsWith("//")).map(it -> it.split("="))
- .collect(Collectors.toMap(it -> it[0], it -> it[1]));
+ var targets = getArguments(arguments, "-targets").stream().filter(it -> !it.startsWith("//"))
+ .map(it -> it.split("=")).collect(Collectors.toMap(it -> it[0], it -> it[1]));
for (var target : targets.entrySet()) {
var uri = createURI(target.getValue());
- reporter.generateReport(contentHandler, analyzer, target.getKey(), uri);
+ reporter.generateReport(contentHandler, analyzer, target.getKey(), uri, majorInclusionPatterns);
dependencies.addAll(analyzer.getTargetDependencies(uri));
}
@@ -85,7 +89,8 @@
// Remove any dependency for which there is a minor update version.
dependencies.removeIf(it -> {
return dependencies.stream().anyMatch(it2 -> {
- return it != it2 && it2.isSameArtfiact(it) && it2.version.compareTo(it.version.nextMajor()) < 0
+ return it != it2 && it2.isSameArtfiact(it)
+ && it2.version.compareTo(it.nextMajorVersion(majorInclusionPatterns)) < 0
&& it.version.compareTo(it2.version) < 0;
});
});
@@ -107,17 +112,18 @@
var allUpdateVersions = analyzer.getAllUpdateVersions(dependencies);
allUpdateVersions.entrySet().removeIf(it -> {
- var nextMajor = it.getKey().version.nextMajor();
+ var nextMajor = it.getKey().nextMajorVersion(majorInclusionPatterns);
var versions = it.getValue();
versions.removeIf(version -> version.compareTo(nextMajor) >= 0);
return versions.isEmpty();
});
dependencyUpdates.putAll(allUpdateVersions);
- var newMavenContent = replace(reducedMavenTarget, dependencyUpdates, true, true);
+ var newMavenContent = replace(reducedMavenTarget, dependencyUpdates, true, true, majorInclusionPatterns);
writeString(mavenTarget, newMavenContent);
- reporter.generateReport(contentHandler, analyzer, "merged-target", mavenTarget.toUri());
+ reporter.generateReport(contentHandler, analyzer, "merged-target", mavenTarget.toUri(),
+ majorInclusionPatterns);
}
}
@@ -160,7 +166,7 @@
private static final Pattern INDENTATION_PATTERN = Pattern.compile(".*>\r?\n(\\s+)<locations>.*", Pattern.DOTALL);
private static String replace(String content, Map<Dependency, List<Version>> dependencies, boolean ignoreMajor,
- boolean addMissing) {
+ boolean addMissing, List<Pattern> majorInclusions) {
var indentation = INDENTATION_PATTERN.matcher(content).replaceAll("$1");
for (var entry : dependencies.entrySet()) {
var dependency = entry.getKey();
@@ -168,10 +174,11 @@
var artifactId = dependency.artifactId;
var type = dependency.type;
var actualVersion = dependency.version;
+ var nextMajor = dependency.nextMajorVersion(majorInclusions);
var versions = entry.getValue();
var version = versions.get(0);
- if (!ignoreMajor || version.compareTo(actualVersion.nextMajor()) < 0) {
+ if (!ignoreMajor || version.compareTo(nextMajor) < 0) {
Pattern pattern = Pattern.compile("(<dependency>[^<]*" + //
"<groupId>" + Pattern.quote(groupId) + "</groupId>[^<]*" + //
"<artifactId>" + Pattern.quote(artifactId) + "</artifactId>[^<]*" + //
@@ -282,8 +289,8 @@
}
}
- public void generateReport(ContentHandler contentHandler, Analyzer analyzer, String name, URI uri)
- throws IOException {
+ public void generateReport(ContentHandler contentHandler, Analyzer analyzer, String name, URI uri,
+ List<Pattern> majorInclusions) throws IOException {
if (reportRoot == null) {
return;
}
@@ -297,7 +304,7 @@
var targetDependencies = analyzer.getTargetDependencies(uri);
var targetDependencyVersions = analyzer.getAllUpdateVersions(targetDependencies);
- var newContent = replace(content, targetDependencyVersions, true, false);
+ var newContent = replace(content, targetDependencyVersions, true, false, majorInclusions);
writeString(report.resolve("updated.target"), newContent);
try (var out = new PrintStream(Files.newOutputStream(report.resolve("REPORT.md")), false,
@@ -313,7 +320,7 @@
for (var entry : targetDependencyVersions.entrySet()) {
var dependency = entry.getKey();
var versions = new ArrayList<Version>(entry.getValue());
- var nextMajor = dependency.version.nextMajor();
+ var nextMajor = dependency.nextMajorVersion(majorInclusions);
versions.removeIf(it -> minor ? it.compareTo(nextMajor) >= 0 : it.compareTo(nextMajor) < 0);
if (!versions.isEmpty()) {
if (!started) {
@@ -384,9 +391,12 @@
private final List<Pattern> ignorePatterns;
- public Analyzer(ContentHandler contentHandler, List<Pattern> ignorePatterns) {
+ private final List<Pattern> majorInclusions;
+
+ public Analyzer(ContentHandler contentHandler, List<Pattern> ignorePatterns, List<Pattern> majorInclusions) {
this.contentHandler = contentHandler;
this.ignorePatterns = ignorePatterns;
+ this.majorInclusions = majorInclusions;
}
public List<Dependency> getTargetDependencies(URI location) throws IOException {
@@ -420,8 +430,7 @@
}
public List<Version> getUpdateVersions(Dependency dependency) throws IOException {
-
- var nextMajor = dependency.version.nextMajor();
+ var nextMajor = dependency.nextMajorVersion(majorInclusions);
var nextAvailableVersion = dependency.version;
var maxAvailableVersion = dependency.version;
@@ -464,14 +473,17 @@
.collect(Collectors.toList());
}
+ private static Pattern INCLUDED_QUALIFIER = Pattern.compile("[-.][0-9]+|[.]v20[0-9]+|-ga|-GA|-jre");
+
private boolean isIncludedQualifier(String qualifier) {
if (qualifier == null) {
return true;
}
- String lowerCaseQualifier = qualifier.toLowerCase();
- if ("-ga".equals(lowerCaseQualifier)) {
+
+ if (INCLUDED_QUALIFIER.matcher(qualifier).matches()) {
return true;
}
+
return false;
}
}
@@ -559,6 +571,8 @@
}
private static final class Dependency implements Comparable<Dependency> {
+ private static final Version MAX_VERSION = new Version(Short.MAX_VALUE, 0, -1, null);
+
private final String groupId;
private final String artifactId;
private final String type;
@@ -572,6 +586,13 @@
this.version = version;
}
+ public Version nextMajorVersion(List<Pattern> majorInclusions) {
+ if (majorInclusions.stream().anyMatch(it -> it.matcher(groupId + ":" + artifactId).matches())) {
+ return MAX_VERSION;
+ }
+ return version.nextMajor();
+ }
+
public URI getGroupURI() {
return URI.create("https://repo1.maven.org/maven2/" + groupId.replace('.', '/') + "/");
}
diff --git a/maven/tp/Maven.target b/maven/tp/Maven.target
index 7697ac0..493cca0 100644
--- a/maven/tp/Maven.target
+++ b/maven/tp/Maven.target
@@ -3,7 +3,7 @@
<target name="Maven" sequenceNumber="1">
<locations>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven">
- <feature id="org.eclipse.oomph.maven.all" label="Oomph Maven All" provider-name="Eclipse Oomph Project" version="4.28.0">
+ <feature id="org.eclipse.oomph.maven.all" label="Oomph Maven All" provider-name="Eclipse Oomph Project" version="4.29.0">
<description>This feature's dependencies are pulled directly from Maven central.</description>
<copyright>
Copyright (c) 2023 Eclipse contributors and others.
@@ -27,31 +27,31 @@
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bnd.annotation</artifactId>
- <version>6.4.0</version>
+ <version>6.4.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bnd.embedded-repo</artifactId>
- <version>6.4.0</version>
+ <version>6.4.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bnd.util</artifactId>
- <version>6.4.0</version>
+ <version>6.4.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
- <version>6.4.0</version>
+ <version>6.4.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.repository</artifactId>
- <version>6.4.0</version>
+ <version>6.4.1</version>
<type>jar</type>
</dependency>
<dependency>
@@ -105,7 +105,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>31.1-jre</version>
+ <version>32.0.1-jre</version>
<type>jar</type>
</dependency>
<dependency>
@@ -153,7 +153,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.12.0</version>
+ <version>2.13.0</version>
<type>jar</type>
</dependency>
<dependency>
@@ -259,6 +259,12 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.16.1.1</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.command</artifactId>
<version>1.1.2</version>
diff --git a/maven/tp/other/MavenSupplement.target b/maven/tp/other/MavenSupplement.target
index 38945c4..38632c0 100644
--- a/maven/tp/other/MavenSupplement.target
+++ b/maven/tp/other/MavenSupplement.target
@@ -116,6 +116,13 @@
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.16.1.1</version>
+ <type>jar</type>
+ </dependency>
+
</dependencies>
</location>
</locations>
diff --git a/orbit/pom.xml b/orbit/pom.xml
index a5c2e72..a009277 100644
--- a/orbit/pom.xml
+++ b/orbit/pom.xml
@@ -217,7 +217,7 @@
-type ${build.type}
-breadcrumb "Oomph
https://projects.eclipse.org/projects/tools.oomph"
- -mapping orbit->Orbit
+ -mapping simrel-orbit->SimRel-Orbit
-simrel-alias
${org.eclipse.justj.p2.manager.extra.args}
</appArgLine>
