Update Maven version
diff --git a/.project b/.project
index b9f5b46..d0881b6 100644
--- a/.project
+++ b/.project
@@ -10,12 +10,12 @@
</natures>
<filteredResources>
<filter>
- <id>1674393847791</id>
+ <id>1684419812912</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
- <arguments>1.0-projectRelativePath-matches-true-true-simrel-extras/(features|releng)/.*/.*|maven/org.eclipse.oomph.maven.generator/.*</arguments>
+ <arguments>1.0-projectRelativePath-matches-true-true-simrel-extras/(features|releng)/.*/.*|maven/org.eclipse.oomph.maven.generator/.*|maven-bnd/org.eclipse.oomph.maven.bnd.generator/.*</arguments>
</matcher>
</filter>
</filteredResources>
diff --git a/maven/org.eclipse.oomph.maven.generator/.project b/maven/org.eclipse.oomph.maven.generator/.project
index 96b065a..4a6b96a 100644
--- a/maven/org.eclipse.oomph.maven.generator/.project
+++ b/maven/org.eclipse.oomph.maven.generator/.project
@@ -15,11 +15,6 @@
<arguments>
</arguments>
</buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
diff --git a/maven/org.eclipse.oomph.maven.generator/report/egit/REPORT.md b/maven/org.eclipse.oomph.maven.generator/report/egit/REPORT.md
index aadc26c..65d562a 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/egit/REPORT.md
+++ b/maven/org.eclipse.oomph.maven.generator/report/egit/REPORT.md
@@ -24,6 +24,9 @@
- [jakarta.servlet-api](https://repo1.maven.org/maven2/jakarta/servlet/jakarta.servlet-api/) **[4.0.4](https://repo1.maven.org/maven2/jakarta/servlet/jakarta.servlet-api/4.0.4)**
- [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.sshd](https://repo1.maven.org/maven2/org/apache/sshd/)
+ - [sshd-osgi](https://repo1.maven.org/maven2/org/apache/sshd/sshd-osgi/) **[2.10.0](https://repo1.maven.org/maven2/org/apache/sshd/sshd-osgi/2.10.0)**
+ - [sshd-sftp](https://repo1.maven.org/maven2/org/apache/sshd/sshd-sftp/) **[2.10.0](https://repo1.maven.org/maven2/org/apache/sshd/sshd-sftp/2.10.0)**
- [org.assertj](https://repo1.maven.org/maven2/org/assertj/)
- [assertj-core](https://repo1.maven.org/maven2/org/assertj/assertj-core/) **[3.24.2](https://repo1.maven.org/maven2/org/assertj/assertj-core/3.24.2)**
- [org.bouncycastle](https://repo1.maven.org/maven2/org/bouncycastle/)
diff --git a/maven/org.eclipse.oomph.maven.generator/report/egit/original.target b/maven/org.eclipse.oomph.maven.generator/report/egit/original.target
index 420f5db..66fe8a3 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/egit/original.target
+++ b/maven/org.eclipse.oomph.maven.generator/report/egit/original.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="egit-4.28" sequenceNumber="1683038199">
+<target name="egit-4.28" sequenceNumber="1684175058">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -50,10 +50,6 @@
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.16.v20221207-1049"/>
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
<unit id="org.apache.log4j.source" version="1.2.24.v20221221-2012"/>
- <unit id="org.apache.sshd.osgi" version="2.9.2.v20221117-1942"/>
- <unit id="org.apache.sshd.osgi.source" version="2.9.2.v20221117-1942"/>
- <unit id="org.apache.sshd.sftp" version="2.9.2.v20221117-1942"/>
- <unit id="org.apache.sshd.sftp.source" version="2.9.2.v20221117-1942"/>
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
<unit id="org.junit.source" version="4.13.2.v20211018-1956"/>
<unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
@@ -116,6 +112,22 @@
</dependency>
</dependencies>
</location>
+ <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="sshd">
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-osgi</artifactId>
+ <version>2.10.0</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-sftp</artifactId>
+ <version>2.10.0</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ </location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty">
<dependencies>
<dependency>
diff --git a/maven/org.eclipse.oomph.maven.generator/report/egit/updated.target b/maven/org.eclipse.oomph.maven.generator/report/egit/updated.target
index 420f5db..66fe8a3 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/egit/updated.target
+++ b/maven/org.eclipse.oomph.maven.generator/report/egit/updated.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="egit-4.28" sequenceNumber="1683038199">
+<target name="egit-4.28" sequenceNumber="1684175058">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -50,10 +50,6 @@
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.16.v20221207-1049"/>
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
<unit id="org.apache.log4j.source" version="1.2.24.v20221221-2012"/>
- <unit id="org.apache.sshd.osgi" version="2.9.2.v20221117-1942"/>
- <unit id="org.apache.sshd.osgi.source" version="2.9.2.v20221117-1942"/>
- <unit id="org.apache.sshd.sftp" version="2.9.2.v20221117-1942"/>
- <unit id="org.apache.sshd.sftp.source" version="2.9.2.v20221117-1942"/>
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
<unit id="org.junit.source" version="4.13.2.v20211018-1956"/>
<unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
@@ -116,6 +112,22 @@
</dependency>
</dependencies>
</location>
+ <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="sshd">
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-osgi</artifactId>
+ <version>2.10.0</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-sftp</artifactId>
+ <version>2.10.0</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ </location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty">
<dependencies>
<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 017ba8c..eb1ed9d 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
@@ -95,6 +95,7 @@
- [org.apache.felix.scr](https://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.scr/) **[2.2.6](https://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.scr/2.2.6)**
- [org.apache.sshd](https://repo1.maven.org/maven2/org/apache/sshd/)
- [sshd-osgi](https://repo1.maven.org/maven2/org/apache/sshd/sshd-osgi/) **[2.10.0](https://repo1.maven.org/maven2/org/apache/sshd/sshd-osgi/2.10.0)**
+ - [sshd-sftp](https://repo1.maven.org/maven2/org/apache/sshd/sshd-sftp/) **[2.10.0](https://repo1.maven.org/maven2/org/apache/sshd/sshd-sftp/2.10.0)**
- [org.apiguardian](https://repo1.maven.org/maven2/org/apiguardian/)
- [apiguardian-api](https://repo1.maven.org/maven2/org/apiguardian/apiguardian-api/) **[1.1.2](https://repo1.maven.org/maven2/org/apiguardian/apiguardian-api/1.1.2)**
- [org.assertj](https://repo1.maven.org/maven2/org/assertj/)
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 aca989b..07188e1 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
@@ -277,6 +277,12 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-sftp</artifactId>
+ <version>2.10.0</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apiguardian</groupId>
<artifactId>apiguardian-api</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 aca989b..07188e1 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
@@ -277,6 +277,12 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-sftp</artifactId>
+ <version>2.10.0</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apiguardian</groupId>
<artifactId>apiguardian-api</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 ea596af..90b7862 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/platform/REPORT.md
+++ b/maven/org.eclipse.oomph.maven.generator/report/platform/REPORT.md
@@ -1,13 +1,5 @@
# 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
- - [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.0](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.15.0)** < [2.15.1](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.15.1/)
- - [jackson-core](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/) **[2.15.0](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.15.0)** < [2.15.1](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.15.1/)
- - [jackson-databind](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/) **[2.15.0](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.15.0)** < [2.15.1](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.15.1/)
- - [commons-io](https://repo1.maven.org/maven2/commons-io/)
- - [commons-io](https://repo1.maven.org/maven2/commons-io/commons-io/) **[2.11.0](https://repo1.maven.org/maven2/commons-io/commons-io/2.11.0)** < [2.12.0](https://repo1.maven.org/maven2/commons-io/commons-io/2.12.0/)
-
## Major Updates
- [jakarta.annotation](https://repo1.maven.org/maven2/jakarta/annotation/)
- [jakarta.annotation-api](https://repo1.maven.org/maven2/jakarta/annotation/jakarta.annotation-api/) **[1.3.5](https://repo1.maven.org/maven2/jakarta/annotation/jakarta.annotation-api/1.3.5)** < [2.1.1](https://repo1.maven.org/maven2/jakarta/annotation/jakarta.annotation-api/2.1.1/)
@@ -29,9 +21,6 @@
- [org.yaml](https://repo1.maven.org/maven2/org/yaml/)
- [snakeyaml](https://repo1.maven.org/maven2/org/yaml/snakeyaml/) **[1.33](https://repo1.maven.org/maven2/org/yaml/snakeyaml/1.33)** < [2.0](https://repo1.maven.org/maven2/org/yaml/snakeyaml/2.0/)
-## Updates Applied
-[updated.target](updated.target)
-
## Content
- [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)**
@@ -40,9 +29,9 @@
- [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)**
- [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.0](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.15.0)**
- - [jackson-core](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/) **[2.15.0](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.15.0)**
- - [jackson-databind](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/) **[2.15.0](https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.15.0)**
+ - [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)**
+ - [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)**
+ - [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)**
- [com.google.code.gson](https://repo1.maven.org/maven2/com/google/code/gson/)
- [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.ibm.icu](https://repo1.maven.org/maven2/com/ibm/icu/)
@@ -54,7 +43,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.11.0](https://repo1.maven.org/maven2/commons-io/commons-io/2.11.0)**
+ - [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-jxpath](https://repo1.maven.org/maven2/commons-jxpath/)
- [commons-jxpath](https://repo1.maven.org/maven2/commons-jxpath/commons-jxpath/) **[1.3](https://repo1.maven.org/maven2/commons-jxpath/commons-jxpath/1.3)**
- [commons-lang](https://repo1.maven.org/maven2/commons-lang/)
diff --git a/maven/org.eclipse.oomph.maven.generator/report/platform/original.target b/maven/org.eclipse.oomph.maven.generator/report/platform/original.target
index 41ad4a2..7542b1b 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/platform/original.target
+++ b/maven/org.eclipse.oomph.maven.generator/report/platform/original.target
@@ -39,7 +39,7 @@
<!-- This is the "normal" Orbit repository. During development on Bug 568936 this repo is the EBR (git)
sourced bundles of Orbit from 2022-06. This is the sub-p2-repo of the 2022-06 recommended build.
This is the repo that is expected to be updated on milestones based on Orbit deliveries. -->
- <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20230403203110/repository/"/>
+ <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20230516204213/repository/"/>
</location>
<location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
@@ -245,7 +245,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.11.0</version>
+ <version>2.12.0</version>
</dependency>
</dependencies>
</location>
@@ -586,19 +586,19 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.15.0</version>
+ <version>2.15.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.15.0</version>
+ <version>2.15.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.15.0</version>
+ <version>2.15.1</version>
<type>jar</type>
</dependency>
</dependencies>
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 2818fa9..7542b1b 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/platform/updated.target
+++ b/maven/org.eclipse.oomph.maven.generator/report/platform/updated.target
@@ -39,7 +39,7 @@
<!-- This is the "normal" Orbit repository. During development on Bug 568936 this repo is the EBR (git)
sourced bundles of Orbit from 2022-06. This is the sub-p2-repo of the 2022-06 recommended build.
This is the repo that is expected to be updated on milestones based on Orbit deliveries. -->
- <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20230403203110/repository/"/>
+ <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20230516204213/repository/"/>
</location>
<location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
diff --git a/maven/tp/Maven.target b/maven/tp/Maven.target
index aca989b..07188e1 100644
--- a/maven/tp/Maven.target
+++ b/maven/tp/Maven.target
@@ -277,6 +277,12 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-sftp</artifactId>
+ <version>2.10.0</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apiguardian</groupId>
<artifactId>apiguardian-api</artifactId>
<version>1.1.2</version>
