Update org.apache.sshd from 2.7.0 to 2.8.0
CQ: 23892
CQ: 23893
Bug: 577542
Change-Id: I4234bb49525f8039cd4c58937697c65acf91d10d
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
diff --git a/apache/org.apache.sshd.osgi_2.7.0/osgi.bnd b/apache/org.apache.sshd.osgi_2.8.0/osgi.bnd
similarity index 94%
rename from apache/org.apache.sshd.osgi_2.7.0/osgi.bnd
rename to apache/org.apache.sshd.osgi_2.8.0/osgi.bnd
index 621148f..854b383 100644
--- a/apache/org.apache.sshd.osgi_2.7.0/osgi.bnd
+++ b/apache/org.apache.sshd.osgi_2.8.0/osgi.bnd
@@ -2,7 +2,7 @@
slf4j-api-version-range=${range;[===,+);1.7}
tomcat-apr-version-range=5.5
-bcpg-jdk15on-version-range=${range;[===,+);1.68}
+bcpg-jdk15on-version-range=${range;[===,+);1.69}
eddsa-version-range=${range;[===,+);0.3}
Export-Package: \
diff --git a/apache/org.apache.sshd.osgi_2.7.0/pom.xml b/apache/org.apache.sshd.osgi_2.8.0/pom.xml
similarity index 92%
rename from apache/org.apache.sshd.osgi_2.7.0/pom.xml
rename to apache/org.apache.sshd.osgi_2.8.0/pom.xml
index 21125ea..217ffb3 100644
--- a/apache/org.apache.sshd.osgi_2.7.0/pom.xml
+++ b/apache/org.apache.sshd.osgi_2.8.0/pom.xml
@@ -8,14 +8,14 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.sshd.osgi</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.8.0-SNAPSHOT</version>
<packaging>eclipse-bundle-recipe</packaging>
<name>Apache Mina SSHD :: OSGi</name>
<dependencies>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-osgi</artifactId>
- <version>2.7.0</version>
+ <version>2.8.0</version>
</dependency>
</dependencies>
<properties>
diff --git a/apache/org.apache.sshd.osgi_2.7.0/src/eclipse/ip_log.xml b/apache/org.apache.sshd.osgi_2.8.0/src/eclipse/ip_log.xml
similarity index 64%
rename from apache/org.apache.sshd.osgi_2.7.0/src/eclipse/ip_log.xml
rename to apache/org.apache.sshd.osgi_2.8.0/src/eclipse/ip_log.xml
index 77ee803..599ed88 100644
--- a/apache/org.apache.sshd.osgi_2.7.0/src/eclipse/ip_log.xml
+++ b/apache/org.apache.sshd.osgi_2.8.0/src/eclipse/ip_log.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<ip_log version="1.0">
- <project id="org.apache.sshd.osgi" version="2.7.0" status="done">
+ <project id="org.apache.sshd.osgi" version="2.8.0" status="done">
<info>
<name>Apache Mina SSHD :: Core</name>
<repository>scm:git:git.eclipse.org:/gitroot/orbit/recipes.git</repository>
- <location>apache/org.apache.sshd.osgi_2.7.0</location>
+ <location>apache/org.apache.sshd.osgi_2.8.0</location>
</info>
<contact>
- <name>Matthias Sohn</name>
- <email>matthias.sohn@</email>
- <company>SAP SE</company>
+ <name>Thomas Wolf</name>
+ <email>thomas.wolf@paranor.ch</email>
+ <company>Paranor AG</company>
</contact>
<legal>
- <ipzilla bug_id="23469"/>
+ <ipzilla bug_id="23892"/>
<license>
<name>Apache License, 2.0</name>
<reference>http://www.apache.org/licenses/LICENSE-2.0.txt</reference>
@@ -21,7 +21,7 @@
<name>ISC</name>
<reference>https://opensource.org/licenses/ISC</reference>
</license>
- <package>sshd-osgi-2.7.0.jar</package>
+ <package>sshd-osgi-2.8.0.jar</package>
</legal>
</project>
</ip_log>
\ No newline at end of file
diff --git a/apache/org.apache.sshd.osgi_2.7.0/src/main/resources/OSGI-INF/l10n/bundle.properties b/apache/org.apache.sshd.osgi_2.8.0/src/main/resources/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from apache/org.apache.sshd.osgi_2.7.0/src/main/resources/OSGI-INF/l10n/bundle.properties
rename to apache/org.apache.sshd.osgi_2.8.0/src/main/resources/OSGI-INF/l10n/bundle.properties
diff --git a/apache/org.apache.sshd.osgi_2.7.0/src/main/resources/about.html b/apache/org.apache.sshd.osgi_2.8.0/src/main/resources/about.html
similarity index 100%
rename from apache/org.apache.sshd.osgi_2.7.0/src/main/resources/about.html
rename to apache/org.apache.sshd.osgi_2.8.0/src/main/resources/about.html
diff --git a/apache/org.apache.sshd.osgi_2.7.0/src/main/resources/about_files/APACHE_2.0_LICENSE.txt b/apache/org.apache.sshd.osgi_2.8.0/src/main/resources/about_files/APACHE_2.0_LICENSE.txt
similarity index 100%
rename from apache/org.apache.sshd.osgi_2.7.0/src/main/resources/about_files/APACHE_2.0_LICENSE.txt
rename to apache/org.apache.sshd.osgi_2.8.0/src/main/resources/about_files/APACHE_2.0_LICENSE.txt
diff --git a/apache/org.apache.sshd.osgi_2.7.0/src/main/resources/about_files/ISC_LICENSE.txt b/apache/org.apache.sshd.osgi_2.8.0/src/main/resources/about_files/ISC_LICENSE.txt
similarity index 100%
rename from apache/org.apache.sshd.osgi_2.7.0/src/main/resources/about_files/ISC_LICENSE.txt
rename to apache/org.apache.sshd.osgi_2.8.0/src/main/resources/about_files/ISC_LICENSE.txt
diff --git a/apache/org.apache.sshd.sftp_2.7.0/src/eclipse/ip_log.xml b/apache/org.apache.sshd.sftp_2.7.0/src/eclipse/ip_log.xml
deleted file mode 100644
index f8aa925..0000000
--- a/apache/org.apache.sshd.sftp_2.7.0/src/eclipse/ip_log.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ip_log version="1.0">
- <project id="org.apache.sshd.sftp" version="2.7.0" status="done">
- <info>
- <name>Apache Mina SSHD :: SFTP</name>
- <repository>scm:git:git.eclipse.org:/gitroot/orbit/recipes.git</repository>
- <location>apache/org.apache.sshd.sftp_2.7.0</location>
- </info>
- <contact>
- <name>Matthias Sohn</name>
- <email>matthias.sohn@sap.com</email>
- <company>SAP SE</company>
- </contact>
- <legal>
- <ipzilla bug_id="23470"/>
- <license>
- <name>Apache License, 2.0</name>
- <reference>http://www.apache.org/licenses/LICENSE-2.0.txt</reference>
- </license>
- <package>sshd-sftp-2.7.0.jar</package>
- </legal>
- </project>
-</ip_log>
\ No newline at end of file
diff --git a/apache/org.apache.sshd.sftp_2.7.0/osgi.bnd b/apache/org.apache.sshd.sftp_2.8.0/osgi.bnd
similarity index 100%
rename from apache/org.apache.sshd.sftp_2.7.0/osgi.bnd
rename to apache/org.apache.sshd.sftp_2.8.0/osgi.bnd
diff --git a/apache/org.apache.sshd.sftp_2.7.0/pom.xml b/apache/org.apache.sshd.sftp_2.8.0/pom.xml
similarity index 92%
rename from apache/org.apache.sshd.sftp_2.7.0/pom.xml
rename to apache/org.apache.sshd.sftp_2.8.0/pom.xml
index d4a9e9b..97c2996 100644
--- a/apache/org.apache.sshd.sftp_2.7.0/pom.xml
+++ b/apache/org.apache.sshd.sftp_2.8.0/pom.xml
@@ -8,14 +8,14 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.sshd.sftp</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.8.0-SNAPSHOT</version>
<packaging>eclipse-bundle-recipe</packaging>
<name>Apache Mina SSHD :: SFTP</name>
<dependencies>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
- <version>2.7.0</version>
+ <version>2.8.0</version>
</dependency>
</dependencies>
<properties>
diff --git a/apache/org.apache.sshd.sftp_2.8.0/src/eclipse/ip_log.xml b/apache/org.apache.sshd.sftp_2.8.0/src/eclipse/ip_log.xml
new file mode 100644
index 0000000..65640d5
--- /dev/null
+++ b/apache/org.apache.sshd.sftp_2.8.0/src/eclipse/ip_log.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ip_log version="1.0">
+ <project id="org.apache.sshd.sftp" version="2.8.0" status="done">
+ <info>
+ <name>Apache Mina SSHD :: SFTP</name>
+ <repository>scm:git:git.eclipse.org:/gitroot/orbit/recipes.git</repository>
+ <location>apache/org.apache.sshd.sftp_2.8.0</location>
+ </info>
+ <contact>
+ <name>Thomas Wolf</name>
+ <email>thomas.wolf@paranor.ch</email>
+ <company>Paranor AG</company>
+ </contact>
+ <legal>
+ <ipzilla bug_id="23893"/>
+ <license>
+ <name>Apache License, 2.0</name>
+ <reference>http://www.apache.org/licenses/LICENSE-2.0.txt</reference>
+ </license>
+ <package>sshd-sftp-2.8.0.jar</package>
+ </legal>
+ </project>
+</ip_log>
\ No newline at end of file
diff --git a/apache/org.apache.sshd.sftp_2.7.0/src/main/resources/OSGI-INF/l10n/bundle.properties b/apache/org.apache.sshd.sftp_2.8.0/src/main/resources/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from apache/org.apache.sshd.sftp_2.7.0/src/main/resources/OSGI-INF/l10n/bundle.properties
rename to apache/org.apache.sshd.sftp_2.8.0/src/main/resources/OSGI-INF/l10n/bundle.properties
diff --git a/apache/org.apache.sshd.sftp_2.7.0/src/main/resources/about.html b/apache/org.apache.sshd.sftp_2.8.0/src/main/resources/about.html
similarity index 100%
rename from apache/org.apache.sshd.sftp_2.7.0/src/main/resources/about.html
rename to apache/org.apache.sshd.sftp_2.8.0/src/main/resources/about.html
diff --git a/apache/org.apache.sshd.sftp_2.7.0/src/main/resources/about_files/APACHE_2.0_LICENSE.txt b/apache/org.apache.sshd.sftp_2.8.0/src/main/resources/about_files/APACHE_2.0_LICENSE.txt
similarity index 100%
rename from apache/org.apache.sshd.sftp_2.7.0/src/main/resources/about_files/APACHE_2.0_LICENSE.txt
rename to apache/org.apache.sshd.sftp_2.8.0/src/main/resources/about_files/APACHE_2.0_LICENSE.txt
diff --git a/apache/pom.xml b/apache/pom.xml
index 859f561..f197d5f 100644
--- a/apache/pom.xml
+++ b/apache/pom.xml
@@ -33,8 +33,8 @@
<module>org.apache.poi.ooxml_4.1.1</module>
<module>org.apache.poi.ooxml.schemas_4.1.1</module>
<module>org.apache.santuario.xmlsec_2.2.0</module>
- <module>org.apache.sshd.osgi_2.7.0</module>
- <module>org.apache.sshd.sftp_2.7.0</module>
+ <module>org.apache.sshd.osgi_2.8.0</module>
+ <module>org.apache.sshd.sftp_2.8.0</module>
<module>org.apache.ws.commons.util_1.0.2</module>
<module>org.apache.wsil4j_1.0.0</module>
<module>org.apache.xmlbeans_3.1.0</module>
diff --git a/releng/aggregationfeature/feature.xml b/releng/aggregationfeature/feature.xml
index 9fad4e3..4aa5a67 100644
--- a/releng/aggregationfeature/feature.xml
+++ b/releng/aggregationfeature/feature.xml
@@ -160,8 +160,8 @@
<!-- Mina sshd -->
<plugin id="net.i2p.crypto.eddsa" version="0.3.0.qualifier"/>
- <plugin id="org.apache.sshd.osgi" version="2.7.0.qualifier"/>
- <plugin id="org.apache.sshd.sftp" version="2.7.0.qualifier"/>
+ <plugin id="org.apache.sshd.osgi" version="2.8.0.qualifier"/>
+ <plugin id="org.apache.sshd.sftp" version="2.8.0.qualifier"/>
<!-- Logging -->
<plugin id="org.slf4j.api" version="1.7.30.qualifier"/>
