Author: pderop
Date: Sun Jun 11 08:38:56 2017
New Revision: 1798351
URL: http://svn.apache.org/viewvc?rev=1798351&view=rev
Log:
FELIX-5650: Support latest version of Gogo.
Added:
felix/trunk/dependencymanager/cnf/localrepo/org.apache.felix.gogo.command/
felix/trunk/dependencymanager/cnf/localrepo/org.apache.felix.gogo.command/org.apache.felix.gogo.command-1.0.2.jar
(with props)
felix/trunk/dependencymanager/cnf/localrepo/org.apache.felix.gogo.jline/
felix/trunk/dependencymanager/cnf/localrepo/org.apache.felix.gogo.jline/org.apache.felix.gogo.jline-1.0.6.jar
(with props)
felix/trunk/dependencymanager/cnf/localrepo/org.apache.felix.gogo.runtime/
felix/trunk/dependencymanager/cnf/localrepo/org.apache.felix.gogo.runtime/org.apache.felix.gogo.runtime-1.0.6.jar
(with props)
felix/trunk/dependencymanager/cnf/localrepo/org.jline/
felix/trunk/dependencymanager/cnf/localrepo/org.jline/org.jline-3.3.0.jar
(with props)
Modified:
felix/trunk/dependencymanager/cnf/ext/libraries.bnd
felix/trunk/dependencymanager/cnf/localrepo/index.xml
felix/trunk/dependencymanager/cnf/localrepo/index.xml.sha
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.index.itest/bnd.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd
felix/trunk/dependencymanager/release/resources/deps/NOTICE
Modified: felix/trunk/dependencymanager/cnf/ext/libraries.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/ext/libraries.bnd?rev=1798351&r1=1798350&r2=1798351&view=diff
==============================================================================
--- felix/trunk/dependencymanager/cnf/ext/libraries.bnd (original)
+++ felix/trunk/dependencymanager/cnf/ext/libraries.bnd Sun Jun 11 08:38:56 2017
@@ -26,9 +26,10 @@ log=org.apache.felix.log;version=1.0.1
##
# Gogo bundles
gogo=\
- org.apache.felix.gogo.command;version=0.14.0,\
- org.apache.felix.gogo.runtime;version=0.12.0,\
- org.apache.felix.gogo.shell;version=0.10.0
+ org.apache.felix.gogo.command;version=1.0.2,\
+ org.apache.felix.gogo.runtime;version=1.0.6,\
+ org.apache.felix.gogo.jline;version=1.0.5,\
+ org.jline;version=3.3.0
##
# Configuration Admin
Modified: felix/trunk/dependencymanager/cnf/localrepo/index.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/localrepo/index.xml?rev=1798351&r1=1798350&r2=1798351&view=diff
==============================================================================
Binary files - no diff available.
Modified: felix/trunk/dependencymanager/cnf/localrepo/index.xml.sha
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/localrepo/index.xml.sha?rev=1798351&r1=1798350&r2=1798351&view=diff
==============================================================================
--- felix/trunk/dependencymanager/cnf/localrepo/index.xml.sha (original)
+++ felix/trunk/dependencymanager/cnf/localrepo/index.xml.sha Sun Jun 11
08:38:56 2017
@@ -1 +1 @@
-4b96124139d46fec96f3ee7626ffb7ee36d87888469cffe28af772f1fa898836
\ No newline at end of file
+7ebfa7ec67c2c1e4362b9a030aa246d4fb3d1f089989064b750dd00da8d2dc64
\ No newline at end of file
Added:
felix/trunk/dependencymanager/cnf/localrepo/org.apache.felix.gogo.command/org.apache.felix.gogo.command-1.0.2.jar
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/localrepo/org.apache.felix.gogo.command/org.apache.felix.gogo.command-1.0.2.jar?rev=1798351&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/trunk/dependencymanager/cnf/localrepo/org.apache.felix.gogo.command/org.apache.felix.gogo.command-1.0.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/java-archive
Added:
felix/trunk/dependencymanager/cnf/localrepo/org.apache.felix.gogo.jline/org.apache.felix.gogo.jline-1.0.6.jar
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/localrepo/org.apache.felix.gogo.jline/org.apache.felix.gogo.jline-1.0.6.jar?rev=1798351&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/trunk/dependencymanager/cnf/localrepo/org.apache.felix.gogo.jline/org.apache.felix.gogo.jline-1.0.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/java-archive
Added:
felix/trunk/dependencymanager/cnf/localrepo/org.apache.felix.gogo.runtime/org.apache.felix.gogo.runtime-1.0.6.jar
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/localrepo/org.apache.felix.gogo.runtime/org.apache.felix.gogo.runtime-1.0.6.jar?rev=1798351&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/trunk/dependencymanager/cnf/localrepo/org.apache.felix.gogo.runtime/org.apache.felix.gogo.runtime-1.0.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/java-archive
Added: felix/trunk/dependencymanager/cnf/localrepo/org.jline/org.jline-3.3.0.jar
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/localrepo/org.jline/org.jline-3.3.0.jar?rev=1798351&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/trunk/dependencymanager/cnf/localrepo/org.jline/org.jline-3.3.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/zip
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.index.itest/bnd.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.index.itest/bnd.bnd?rev=1798351&r1=1798350&r2=1798351&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.index.itest/bnd.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.index.itest/bnd.bnd
Sun Jun 11 08:38:56 2017
@@ -16,17 +16,15 @@
#
-runbundles: \
org.apache.felix.metatype;version=1.0.4,\
- org.apache.felix.gogo.runtime;version=0.10.0,\
org.apache.felix.log;version=1.0.1,\
org.apache.felix.configadmin;version=1.8.8,\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
biz.aQute.junit;version=3.0.0,\
- org.apache.felix.gogo.command,\
- org.apache.felix.gogo.shell,\
org.apache.felix.dependencymanager.index.itest.dynamic.customindex;version=latest,\
org.apache.felix.dependencymanager.index.itest.static.customindex;version=latest,\
- org.apache.felix.dependencymanager.index.itest.tests;version=latest
+ org.apache.felix.dependencymanager.index.itest.tests;version=latest,\
+ org.apache.felix.gogo.runtime;version=1.0.6
-runee: JavaSE-1.8
-runvm: -ea
@@ -34,10 +32,10 @@
-buildpath: \
osgi.core;version=4.2,\
osgi.cmpn;version=4.2,\
- org.apache.felix.gogo.runtime;version=0.10,\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
- ${junit}
+ ${junit},\
+ org.apache.felix.gogo.runtime;version=1.0
-runsystempackages: \
sun.reflect
Test-Cases: \
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd?rev=1798351&r1=1798350&r2=1798351&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd
Sun Jun 11 08:38:56 2017
@@ -16,24 +16,22 @@
#
-runbundles: \
org.apache.felix.metatype;version=1.0.4,\
- org.apache.felix.gogo.runtime;version=0.10.0,\
org.apache.felix.log;version=1.0.1,\
org.apache.felix.configadmin;version=1.8.8,\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
biz.aQute.junit;version=3.0.0,\
- org.apache.felix.gogo.command,\
- org.apache.felix.gogo.shell
+ org.apache.felix.gogo.runtime;version=1.0.6
-runee: JavaSE-1.8
-runvm: -ea
-runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
--buildpath: \
+-buildpath: \
osgi.core;version=4.2,\
osgi.cmpn;version=4.2,\
- org.apache.felix.gogo.runtime;version=0.10,\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
- ${junit}
+ ${junit},\
+ org.apache.felix.gogo.runtime;version=1.0
-runsystempackages: \
sun.reflect
-sub: \
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd?rev=1798351&r1=1798350&r2=1798351&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd
Sun Jun 11 08:38:56 2017
@@ -18,21 +18,18 @@
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
org.apache.felix.dependencymanager.lambda;version=latest,\
- org.apache.felix.gogo.runtime;version=0.12,\
${junit},\
osgi.core;version=6.0,\
osgi.cmpn;version=6.0
-runbundles: \
org.apache.felix.metatype;version=1.0.10,\
- org.apache.felix.gogo.runtime;version=0.12.1,\
org.apache.felix.log;version=1.0.1,\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
org.apache.felix.configadmin;version=1.8.8,\
org.apache.felix.dependencymanager.lambda;version=latest,\
biz.aQute.junit;version=1.3.0,\
- org.apache.felix.gogo.shell;version=0.10.0,\
- org.apache.felix.gogo.command;version=0.14.0
+ org.apache.felix.gogo.runtime;version=1.0.6
-runee: JavaSE-1.8
-runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
-runvm: -ea
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd?rev=1798351&r1=1798350&r2=1798351&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd
Sun Jun 11 08:38:56 2017
@@ -25,7 +25,7 @@
-runbundles: \
org.apache.felix.configadmin;version=1.8.8,\
org.apache.felix.metatype;version=1.0.4,\
- org.apache.felix.gogo.runtime;version=0.10.0,\
+ org.apache.felix.gogo.runtime;version=1.0.6,\
org.apache.felix.log;version=1.0.1,\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.runtime;version=latest,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd?rev=1798351&r1=1798350&r2=1798351&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd
Sun Jun 11 08:38:56 2017
@@ -15,16 +15,16 @@
# limitations under the License.
#
-buildpath: \
- org.apache.felix.gogo.runtime;version=0.10,\
org.mockito.mockito-all;version=1.9,\
org.apache.felix.dependencymanager;version=latest,\
${junit},\
osgi.core;version=6.0,\
- osgi.cmpn;version=6.0
+ osgi.cmpn;version=6.0,\
+ org.apache.felix.gogo.runtime;version=1.0
Private-Package: \
org.apache.felix.dm.shell
Bundle-Activator:org.apache.felix.dm.shell.Activator
-Bundle-Version: 4.0.5
+Bundle-Version: 4.0.6
Include-Resource: META-INF/=resources/LICENSE,\
META-INF/=resources/NOTICE,\
META-INF/=resources/DEPENDENCIES,\
@@ -33,6 +33,4 @@ Bundle-Name: Apache Felix Dependency Man
Bundle-Description: Gogo Shell commands for Apache Felix Dependency Manager
Bundle-Category: osgi
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-Vendor: The Apache Software Foundation
-# Work around used to make sure DM api is imported using proper version range
(can be removed with bndtools 3)
-Import-Package: org.apache.felix.dm;version="[4.0, 5)", *
\ No newline at end of file
+Bundle-Vendor: The Apache Software Foundation
\ No newline at end of file
Modified: felix/trunk/dependencymanager/release/resources/deps/NOTICE
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/release/resources/deps/NOTICE?rev=1798351&r1=1798350&r2=1798351&view=diff
==============================================================================
--- felix/trunk/dependencymanager/release/resources/deps/NOTICE (original)
+++ felix/trunk/dependencymanager/release/resources/deps/NOTICE Sun Jun 11
08:38:56 2017
@@ -21,3 +21,8 @@ This product includes software developed
Hamcrest (http://www.hamcrest.org)
Copyright (c) 2000-2006, www.hamcrest.org
Licensed under BSD License
+
+This product includes software developed at
+jline3 (https://github.com/jline/jline3)
+Licensed under BSD License
+
