Bug 567461 - Please update felix gogo shell to 1.1.4 due to bug in 1.1.0
Update components in Orbit
Change-Id: I84db5b09fa497fe1fa5febe225317fa406818ba0
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/apache/felix/org.apache.felix.gogo.command_1.1.0/osgi.bnd b/apache/felix/org.apache.felix.gogo.command_1.1.0/osgi.bnd
deleted file mode 100644
index a6ce74e..0000000
--- a/apache/felix/org.apache.felix.gogo.command_1.1.0/osgi.bnd
+++ /dev/null
@@ -1,16 +0,0 @@
-package-version=${version;===;${Bundle-Version}}
-org.osgi.core-version=${version;===;4.3.1}
-org.osgi.compendium-version=${version;===;4.3.1}
-org.apache.felix.gogo.runtime-version=${version;===;1.0.0}
-
-Export-Package: !about.html,!about_files, \
- org.apache.felix.gogo.command; x-internal=true; provisional=true; mandatory:=provisional
-
-Import-Package: \
- org.apache.felix.service.command;version="[1.0,2)", \
- org.osgi.framework;version="[1.5,2.0)", \
- org.osgi.framework.wiring;version="[1.0,2)", \
- org.osgi.service.log;version="[1.3,2)", \
- org.osgi.service.packageadmin;version="[1.2,2)", \
- org.osgi.service.startlevel;version="[1.1,2)", \
- *; resolution:=optional
diff --git a/apache/felix/org.apache.felix.gogo.command_1.1.0/.project b/apache/felix/org.apache.felix.gogo.command_1.1.2/.project
similarity index 78%
rename from apache/felix/org.apache.felix.gogo.command_1.1.0/.project
rename to apache/felix/org.apache.felix.gogo.command_1.1.2/.project
index e7c3e8a..0a248af 100644
--- a/apache/felix/org.apache.felix.gogo.command_1.1.0/.project
+++ b/apache/felix/org.apache.felix.gogo.command_1.1.2/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.apache.felix.gogo.command_1.1.0</name>
+ <name>org.apache.felix.gogo.command_1.1.2</name>
<comment></comment>
<projects>
</projects>
diff --git a/apache/felix/org.apache.felix.gogo.command_1.1.0/pom.xml b/apache/felix/org.apache.felix.gogo.command_1.1.2/pom.xml
similarity index 88%
rename from apache/felix/org.apache.felix.gogo.command_1.1.0/pom.xml
rename to apache/felix/org.apache.felix.gogo.command_1.1.2/pom.xml
index efffe86..ad67bd9 100644
--- a/apache/felix/org.apache.felix.gogo.command_1.1.0/pom.xml
+++ b/apache/felix/org.apache.felix.gogo.command_1.1.2/pom.xml
@@ -8,9 +8,9 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.felix.gogo.command</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.2-SNAPSHOT</version>
<packaging>eclipse-bundle-recipe</packaging>
- <name>Apache Felix Gogo Command 1.1.0</name>
+ <name>Apache Felix Gogo Command 1.1.2</name>
<properties>
<recipe.excludes>
@@ -23,7 +23,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.command</artifactId>
- <version>1.1.0</version>
+ <version>1.1.2</version>
</dependency>
</dependencies>
</project>
diff --git a/apache/felix/org.apache.felix.gogo.command_1.1.0/src/eclipse/ip_log.xml b/apache/felix/org.apache.felix.gogo.command_1.1.2/src/eclipse/ip_log.xml
similarity index 63%
rename from apache/felix/org.apache.felix.gogo.command_1.1.0/src/eclipse/ip_log.xml
rename to apache/felix/org.apache.felix.gogo.command_1.1.2/src/eclipse/ip_log.xml
index f7e9a76..4b5044b 100644
--- a/apache/felix/org.apache.felix.gogo.command_1.1.0/src/eclipse/ip_log.xml
+++ b/apache/felix/org.apache.felix.gogo.command_1.1.2/src/eclipse/ip_log.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<ip_log version="1.0">
- <project id="org.apache.felix.gogo.command" version="1.1.0" status="done">
+ <project id="org.apache.felix.gogo.command" version="1.1.2" status="done">
<info>
<name>Apache Felix Gogo Command</name>
<repository>scm:git:git.eclipse.org:/gitroot/orbit/recipes.git</repository>
- <location>apache/felix/org.apache.felix.gogo.command_1.1.0</location>
+ <location>apache/felix/org.apache.felix.gogo.command_1.1.2</location>
</info>
<contact>
<name>Alexander Kurtakov</name>
@@ -12,12 +12,12 @@
<company>Red Hat</company>
</contact>
<legal>
- <ipzilla bug_id="22658"/>
+ <clearlydefined url="https://clearlydefined.io/definitions/maven/mavencentral/org.apache.felix/org.apache.felix.gogo.command/1.1.2"/>
<license>
<name>Apache License, 2.0</name>
<reference>http://www.apache.org/licenses/LICENSE-2.0.txt</reference>
</license>
- <package>org.apache.felix.gogo.command-1.1.0.jar</package>
+ <package>org.apache.felix.gogo.command-1.1.2.jar</package>
</legal>
</project>
</ip_log>
diff --git a/apache/felix/org.apache.felix.gogo.command_1.1.0/src/main/resources/OSGI-INF/l10n/bundle.properties b/apache/felix/org.apache.felix.gogo.command_1.1.2/src/main/resources/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from apache/felix/org.apache.felix.gogo.command_1.1.0/src/main/resources/OSGI-INF/l10n/bundle.properties
rename to apache/felix/org.apache.felix.gogo.command_1.1.2/src/main/resources/OSGI-INF/l10n/bundle.properties
diff --git a/apache/felix/org.apache.felix.gogo.command_1.1.0/src/main/resources/about.html b/apache/felix/org.apache.felix.gogo.command_1.1.2/src/main/resources/about.html
similarity index 100%
rename from apache/felix/org.apache.felix.gogo.command_1.1.0/src/main/resources/about.html
rename to apache/felix/org.apache.felix.gogo.command_1.1.2/src/main/resources/about.html
diff --git a/apache/felix/org.apache.felix.gogo.command_1.1.0/src/main/resources/about_files/THE_APACHE_SOFTWARE_LICENSE__VERSION_2.0.txt b/apache/felix/org.apache.felix.gogo.command_1.1.2/src/main/resources/about_files/THE_APACHE_SOFTWARE_LICENSE__VERSION_2.0.txt
similarity index 100%
rename from apache/felix/org.apache.felix.gogo.command_1.1.0/src/main/resources/about_files/THE_APACHE_SOFTWARE_LICENSE__VERSION_2.0.txt
rename to apache/felix/org.apache.felix.gogo.command_1.1.2/src/main/resources/about_files/THE_APACHE_SOFTWARE_LICENSE__VERSION_2.0.txt
diff --git a/apache/felix/org.apache.felix.gogo.runtime_1.1.2/osgi.bnd b/apache/felix/org.apache.felix.gogo.runtime_1.1.2/osgi.bnd
deleted file mode 100644
index 234837b..0000000
--- a/apache/felix/org.apache.felix.gogo.runtime_1.1.2/osgi.bnd
+++ /dev/null
@@ -1,18 +0,0 @@
-package-version=${version;===;${Bundle-Version}}
-
-Export-Package: \
- !about.html,!about_files, \
- org.apache.felix.service.command; version=1.0.0, \
- org.apache.felix.service.threadio; version=1.0.0, \
- org.apache.felix.gogo.runtime*;version="${package-version}"
-
-Import-Package: \
- org.apache.felix.gogo.runtime;version="[1.1,2)", \
- org.apache.felix.gogo.runtime.threadio;version="[1.1,2)", \
- org.apache.felix.service.command;version="[1.0,2)", \
- org.apache.felix.service.threadio;version="[1.0,2)", \
- org.osgi.framework;version="[1.8,2)", \
- org.osgi.util.tracker;version="[1.5,2)", \
- org.osgi.service.event;version="[1.3,2)";resolution:=optional,\
- *;resolution=optional
-
diff --git a/apache/felix/org.apache.felix.gogo.runtime_1.1.2/.project b/apache/felix/org.apache.felix.gogo.runtime_1.1.4/.project
similarity index 78%
rename from apache/felix/org.apache.felix.gogo.runtime_1.1.2/.project
rename to apache/felix/org.apache.felix.gogo.runtime_1.1.4/.project
index 0a992a4..ecaa232 100644
--- a/apache/felix/org.apache.felix.gogo.runtime_1.1.2/.project
+++ b/apache/felix/org.apache.felix.gogo.runtime_1.1.4/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.apache.felix.gogo.runtime_1.1.2</name>
+ <name>org.apache.felix.gogo.runtime_1.1.4</name>
<comment></comment>
<projects>
</projects>
diff --git a/apache/felix/org.apache.felix.gogo.runtime_1.1.2/pom.xml b/apache/felix/org.apache.felix.gogo.runtime_1.1.4/pom.xml
similarity index 86%
rename from apache/felix/org.apache.felix.gogo.runtime_1.1.2/pom.xml
rename to apache/felix/org.apache.felix.gogo.runtime_1.1.4/pom.xml
index 83c7540..2b22c1a 100644
--- a/apache/felix/org.apache.felix.gogo.runtime_1.1.2/pom.xml
+++ b/apache/felix/org.apache.felix.gogo.runtime_1.1.4/pom.xml
@@ -8,14 +8,14 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<packaging>eclipse-bundle-recipe</packaging>
- <name>Apache Felix Gogo Runtime 1.1.2</name>
+ <name>Apache Felix Gogo Runtime 1.1.4</name>
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
- <version>1.1.2</version>
+ <version>1.1.4</version>
</dependency>
</dependencies>
</project>
diff --git a/apache/felix/org.apache.felix.gogo.runtime_1.1.2/src/eclipse/ip_log.xml b/apache/felix/org.apache.felix.gogo.runtime_1.1.4/src/eclipse/ip_log.xml
similarity index 72%
rename from apache/felix/org.apache.felix.gogo.runtime_1.1.2/src/eclipse/ip_log.xml
rename to apache/felix/org.apache.felix.gogo.runtime_1.1.4/src/eclipse/ip_log.xml
index 5d76da5..becf544 100644
--- a/apache/felix/org.apache.felix.gogo.runtime_1.1.2/src/eclipse/ip_log.xml
+++ b/apache/felix/org.apache.felix.gogo.runtime_1.1.4/src/eclipse/ip_log.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<ip_log version="1.0">
- <project id="org.apache.felix.gogo.runtime" version="1.1.2" status="done">
+ <project id="org.apache.felix.gogo.runtime" version="1.1.4" status="done">
<info>
<name>Apache Felix Gogo Runtime</name>
<repository>scm:git:git.eclipse.org:/gitroot/orbit/recipes.git</repository>
- <location>apache/felix/org.apache.felix.gogo.runtime_1.1.2</location>
+ <location>apache/felix/org.apache.felix.gogo.runtime_1.1.4</location>
</info>
<contact>
<name>Alexander Kurtakov</name>
@@ -12,12 +12,12 @@
<company>Red Hat</company>
</contact>
<legal>
- <ipzilla bug_id="22659"/>
+ <ipzilla bug_id="22929"/>
<license>
<name>Apache License, 2.0</name>
<reference>http://www.apache.org/licenses/LICENSE-2.0.txt</reference>
</license>
- <package>org.apache.felix.gogo.runtime-1.1.2.jar</package>
+ <package>org.apache.felix.gogo.runtime-1.1.4.jar</package>
</legal>
</project>
</ip_log>
diff --git a/apache/felix/org.apache.felix.gogo.runtime_1.1.2/src/main/resources/OSGI-INF/l10n/bundle.properties b/apache/felix/org.apache.felix.gogo.runtime_1.1.4/src/main/resources/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from apache/felix/org.apache.felix.gogo.runtime_1.1.2/src/main/resources/OSGI-INF/l10n/bundle.properties
rename to apache/felix/org.apache.felix.gogo.runtime_1.1.4/src/main/resources/OSGI-INF/l10n/bundle.properties
diff --git a/apache/felix/org.apache.felix.gogo.runtime_1.1.2/src/main/resources/about.html b/apache/felix/org.apache.felix.gogo.runtime_1.1.4/src/main/resources/about.html
similarity index 100%
rename from apache/felix/org.apache.felix.gogo.runtime_1.1.2/src/main/resources/about.html
rename to apache/felix/org.apache.felix.gogo.runtime_1.1.4/src/main/resources/about.html
diff --git a/apache/felix/org.apache.felix.gogo.runtime_1.1.2/src/main/resources/about_files/APACHE_LICENSE__2.0.txt b/apache/felix/org.apache.felix.gogo.runtime_1.1.4/src/main/resources/about_files/APACHE_LICENSE__2.0.txt
similarity index 100%
rename from apache/felix/org.apache.felix.gogo.runtime_1.1.2/src/main/resources/about_files/APACHE_LICENSE__2.0.txt
rename to apache/felix/org.apache.felix.gogo.runtime_1.1.4/src/main/resources/about_files/APACHE_LICENSE__2.0.txt
diff --git a/apache/felix/org.apache.felix.gogo.shell_1.1.2/osgi.bnd b/apache/felix/org.apache.felix.gogo.shell_1.1.2/osgi.bnd
deleted file mode 100644
index 6f6ca91..0000000
--- a/apache/felix/org.apache.felix.gogo.shell_1.1.2/osgi.bnd
+++ /dev/null
@@ -1,15 +0,0 @@
-package-version=${version;===;${Bundle-Version}}
-org.apache.felix.gogo.runtime-version=${version;===;1.1.0}
-
-Private-Pacakge: org.apache.felix.gogo.shell, \
- org.apache.felix.gogo.options
-
-Export-Package: \
- !about.html,!about_files
-
-Import-Package: \
- org.apache.felix.service.command;version="[1.0,2)", \
- org.osgi.framework;version="[1.8,2)", \
- org.osgi.service.startlevel;version="[1.1,2)", \
- org.osgi.util.tracker;version="[1.5,2)", \
- *; resolution:=optional
diff --git a/apache/felix/org.apache.felix.gogo.shell_1.1.2/.project b/apache/felix/org.apache.felix.gogo.shell_1.1.4/.project
similarity index 78%
rename from apache/felix/org.apache.felix.gogo.shell_1.1.2/.project
rename to apache/felix/org.apache.felix.gogo.shell_1.1.4/.project
index 8a04e1a..151cf59 100644
--- a/apache/felix/org.apache.felix.gogo.shell_1.1.2/.project
+++ b/apache/felix/org.apache.felix.gogo.shell_1.1.4/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.apache.felix.gogo.shell_1.1.2</name>
+ <name>org.apache.felix.gogo.shell_1.1.4</name>
<comment></comment>
<projects>
</projects>
diff --git a/apache/felix/org.apache.felix.gogo.shell_1.1.2/pom.xml b/apache/felix/org.apache.felix.gogo.shell_1.1.4/pom.xml
similarity index 86%
rename from apache/felix/org.apache.felix.gogo.shell_1.1.2/pom.xml
rename to apache/felix/org.apache.felix.gogo.shell_1.1.4/pom.xml
index fc6480b..cc9eb2f 100644
--- a/apache/felix/org.apache.felix.gogo.shell_1.1.2/pom.xml
+++ b/apache/felix/org.apache.felix.gogo.shell_1.1.4/pom.xml
@@ -8,14 +8,14 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.felix.gogo.shell</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<packaging>eclipse-bundle-recipe</packaging>
- <name>Apache Felix Gogo Shell 1.1.2</name>
+ <name>Apache Felix Gogo Shell 1.1.4</name>
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.shell</artifactId>
- <version>1.1.2</version>
+ <version>1.1.4</version>
</dependency>
</dependencies>
</project>
diff --git a/apache/felix/org.apache.felix.gogo.shell_1.1.2/src/eclipse/ip_log.xml b/apache/felix/org.apache.felix.gogo.shell_1.1.4/src/eclipse/ip_log.xml
similarity index 63%
rename from apache/felix/org.apache.felix.gogo.shell_1.1.2/src/eclipse/ip_log.xml
rename to apache/felix/org.apache.felix.gogo.shell_1.1.4/src/eclipse/ip_log.xml
index f60a730..0b26603 100644
--- a/apache/felix/org.apache.felix.gogo.shell_1.1.2/src/eclipse/ip_log.xml
+++ b/apache/felix/org.apache.felix.gogo.shell_1.1.4/src/eclipse/ip_log.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<ip_log version="1.0">
- <project id="org.apache.felix.gogo.shell" version="1.1.2" status="done">
+ <project id="org.apache.felix.gogo.shell" version="1.1.4" status="done">
<info>
<name>Apache Felix Gogo Shell</name>
<repository>scm:git:git.eclipse.org:/gitroot/orbit/recipes.git</repository>
- <location>apache/felix/org.apache.felix.gogo.shell_1.1.2</location>
+ <location>apache/felix/org.apache.felix.gogo.shell_1.1.4</location>
</info>
<contact>
<name>Alexander Kurtakov</name>
@@ -12,12 +12,12 @@
<company>Red Hat</company>
</contact>
<legal>
- <ipzilla bug_id="22660"/>
+ <clearlydefined url="https://clearlydefined.io/definitions/maven/mavencentral/org.apache.felix/org.apache.felix.gogo.shell/1.1.4"/>
<license>
<name>Apache License, 2.0</name>
<reference>http://www.apache.org/licenses/LICENSE-2.0.txt</reference>
</license>
- <package>org.apache.felix.gogo.shell-1.1.2.jar</package>
+ <package>org.apache.felix.gogo.shell-1.1.4.jar</package>
</legal>
</project>
</ip_log>
diff --git a/apache/felix/org.apache.felix.gogo.shell_1.1.2/src/main/resources/OSGI-INF/l10n/bundle.properties b/apache/felix/org.apache.felix.gogo.shell_1.1.4/src/main/resources/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from apache/felix/org.apache.felix.gogo.shell_1.1.2/src/main/resources/OSGI-INF/l10n/bundle.properties
rename to apache/felix/org.apache.felix.gogo.shell_1.1.4/src/main/resources/OSGI-INF/l10n/bundle.properties
diff --git a/apache/felix/org.apache.felix.gogo.shell_1.1.2/src/main/resources/about.html b/apache/felix/org.apache.felix.gogo.shell_1.1.4/src/main/resources/about.html
similarity index 100%
rename from apache/felix/org.apache.felix.gogo.shell_1.1.2/src/main/resources/about.html
rename to apache/felix/org.apache.felix.gogo.shell_1.1.4/src/main/resources/about.html
diff --git a/apache/felix/org.apache.felix.gogo.shell_1.1.2/src/main/resources/about_files/APACHE_LICENSE__2.0.txt b/apache/felix/org.apache.felix.gogo.shell_1.1.4/src/main/resources/about_files/APACHE_LICENSE__2.0.txt
similarity index 100%
rename from apache/felix/org.apache.felix.gogo.shell_1.1.2/src/main/resources/about_files/APACHE_LICENSE__2.0.txt
rename to apache/felix/org.apache.felix.gogo.shell_1.1.4/src/main/resources/about_files/APACHE_LICENSE__2.0.txt
diff --git a/apache/felix/org.apache.felix.gogo.shell_1.1.2/src/main/resources/gosh_profile b/apache/felix/org.apache.felix.gogo.shell_1.1.4/src/main/resources/gosh_profile
similarity index 100%
rename from apache/felix/org.apache.felix.gogo.shell_1.1.2/src/main/resources/gosh_profile
rename to apache/felix/org.apache.felix.gogo.shell_1.1.4/src/main/resources/gosh_profile
diff --git a/apache/felix/pom.xml b/apache/felix/pom.xml
index d4f1db4..981c742 100644
--- a/apache/felix/pom.xml
+++ b/apache/felix/pom.xml
@@ -15,9 +15,9 @@
<name>Eclipse Orbit :: Apache Felix Recipes</name>
<modules>
- <module>org.apache.felix.gogo.command_1.1.0</module>
- <module>org.apache.felix.gogo.runtime_1.1.2</module>
- <module>org.apache.felix.gogo.shell_1.1.2</module>
+ <module>org.apache.felix.gogo.command_1.1.2</module>
+ <module>org.apache.felix.gogo.runtime_1.1.4</module>
+ <module>org.apache.felix.gogo.shell_1.1.4</module>
<module>org.apache.felix.scr_2.1.24</module>
</modules>
diff --git a/releng/aggregationfeature/feature.xml b/releng/aggregationfeature/feature.xml
index 8376143..14360db 100644
--- a/releng/aggregationfeature/feature.xml
+++ b/releng/aggregationfeature/feature.xml
@@ -109,9 +109,9 @@
<plugin id="org.apache.commons.compress" version="1.19.0.qualifier"/>
<plugin id="org.apache.commons.collections4" version="4.4.0.qualifier"/>
- <plugin id="org.apache.felix.gogo.command" version="1.1.0.qualifier"/>
- <plugin id="org.apache.felix.gogo.runtime" version="1.1.2.qualifier"/>
- <plugin id="org.apache.felix.gogo.shell" version="1.1.2.qualifier"/>
+ <plugin id="org.apache.felix.gogo.command" version="1.1.2.qualifier"/>
+ <plugin id="org.apache.felix.gogo.runtime" version="1.1.4.qualifier"/>
+ <plugin id="org.apache.felix.gogo.shell" version="1.1.4.qualifier"/>
<plugin id="org.apache.felix.scr" version="2.1.24.qualifier"/>
