You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2020/05/23 19:49:52 UTC
[felix-dev] branch master updated: FELIX-6278: Update Dependency
Manager with latest bndtools 5.0.1
This is an automated email from the ASF dual-hosted git repository.
pderop pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new 2653922 FELIX-6278: Update Dependency Manager with latest bndtools 5.0.1
new 47e32d0 FELIX-6278: Update Dependency Manager with latest bndtools 5.0.1
2653922 is described below
commit 265392255b5c142678c1b37942fece79b9afcf45
Author: Pierre De Rop <pi...@gmail.com>
AuthorDate: Sat May 23 21:45:57 2020 +0200
FELIX-6278: Update Dependency Manager with latest bndtools 5.0.1
---
dependencymanager/.gradle-wrapper/gradle-wrapper.properties | 2 +-
dependencymanager/build.gradle | 2 +-
dependencymanager/cnf/ext/libraries.bnd | 2 +-
dependencymanager/cnf/localrepo/index.xml | 3 ---
dependencymanager/cnf/localrepo/index.xml.sha | 1 -
dependencymanager/cnf/releaserepo/index.xml | 3 ---
dependencymanager/cnf/releaserepo/index.xml.sha | 1 -
dependencymanager/cnf/repository.mvn | 4 ++--
dependencymanager/gradle.properties | 7 ++++---
.../org.apache.felix.dependencymanager.annotation/bnd.bnd | 2 +-
.../.gitignore | 1 +
.../test/.keepme | 0
.../org.apache.felix.dependencymanager.lambda/bnd.bnd | 2 +-
.../org.apache.felix.dependencymanager.runtime/bnd.bnd | 2 +-
.../src/org/apache/felix/dm/runtime/JSONMetaData.java | 12 ++++++++++--
.../org.apache.felix.dependencymanager.shell/bnd.bnd | 2 +-
16 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/dependencymanager/.gradle-wrapper/gradle-wrapper.properties b/dependencymanager/.gradle-wrapper/gradle-wrapper.properties
index 1610e0f..d110595 100644
--- a/dependencymanager/.gradle-wrapper/gradle-wrapper.properties
+++ b/dependencymanager/.gradle-wrapper/gradle-wrapper.properties
@@ -20,4 +20,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip
diff --git a/dependencymanager/build.gradle b/dependencymanager/build.gradle
index 80e7d4f..71ae1fd 100644
--- a/dependencymanager/build.gradle
+++ b/dependencymanager/build.gradle
@@ -17,6 +17,6 @@
* under the License.
*/
-task wrapper(type: Wrapper) {
+tasks.named('wrapper') {
jarFile = rootProject.file('.gradle-wrapper/gradle-wrapper.jar')
}
diff --git a/dependencymanager/cnf/ext/libraries.bnd b/dependencymanager/cnf/ext/libraries.bnd
index ef9b3a3..dc86ca7 100644
--- a/dependencymanager/cnf/ext/libraries.bnd
+++ b/dependencymanager/cnf/ext/libraries.bnd
@@ -53,7 +53,7 @@ webconsole=\
##
# bndlib
-bndlib=biz.aQute.bndlib;version=3.5.0
+bndlib=biz.aQute.bndlib;version=5.0.1
##
# mockito
diff --git a/dependencymanager/cnf/localrepo/index.xml b/dependencymanager/cnf/localrepo/index.xml
deleted file mode 100644
index 0bfa6dc..0000000
--- a/dependencymanager/cnf/localrepo/index.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<repository increment="0" name="Local" xmlns="http://www.osgi.org/xmlns/repository/v1.0.0">
-</repository>
\ No newline at end of file
diff --git a/dependencymanager/cnf/localrepo/index.xml.sha b/dependencymanager/cnf/localrepo/index.xml.sha
deleted file mode 100644
index 001203e..0000000
--- a/dependencymanager/cnf/localrepo/index.xml.sha
+++ /dev/null
@@ -1 +0,0 @@
-8de8e8866152096f0c4ea5ddd6ed1d633b4d1a6edfbd823245cb57f6639732fd
\ No newline at end of file
diff --git a/dependencymanager/cnf/releaserepo/index.xml b/dependencymanager/cnf/releaserepo/index.xml
deleted file mode 100644
index c89dffc..0000000
--- a/dependencymanager/cnf/releaserepo/index.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<repository increment="0" name="Release" xmlns="http://www.osgi.org/xmlns/repository/v1.0.0">
-</repository>
\ No newline at end of file
diff --git a/dependencymanager/cnf/releaserepo/index.xml.sha b/dependencymanager/cnf/releaserepo/index.xml.sha
deleted file mode 100644
index f2b26bf..0000000
--- a/dependencymanager/cnf/releaserepo/index.xml.sha
+++ /dev/null
@@ -1 +0,0 @@
-262a924c4164db96f2409bfbe8d20793eb0c91a51c3dcd7c2160cde2bac8a492
\ No newline at end of file
diff --git a/dependencymanager/cnf/repository.mvn b/dependencymanager/cnf/repository.mvn
index a8bdece..e003e74 100644
--- a/dependencymanager/cnf/repository.mvn
+++ b/dependencymanager/cnf/repository.mvn
@@ -16,8 +16,8 @@
#
ant:ant:1.5
-biz.aQute.bnd:biz.aQute.bnd.gradle:3.5.0
-biz.aQute.bnd:biz.aQute.bndlib:3.5.0
+biz.aQute.bnd:biz.aQute.bnd.gradle:5.0.1
+biz.aQute.bnd:biz.aQute.bndlib:5.0.1
org.apache.felix:org.apache.felix.framework:5.6.10
org.apache.felix:org.apache.felix.eventadmin:1.4.4
org.apache.felix:org.apache.felix.gogo.command:1.0.2
diff --git a/dependencymanager/gradle.properties b/dependencymanager/gradle.properties
index 07c177e..701550b 100644
--- a/dependencymanager/gradle.properties
+++ b/dependencymanager/gradle.properties
@@ -17,9 +17,10 @@
* under the License.
*/
-bnd_version=3.5.0
-
+bnd_version=5.0.1
# bnd_plugin is the dependency declaration for the bnd gradle plugin
-bnd_plugin=biz.aQute.bnd:biz.aQute.bnd.gradle:3.5.0
+bnd_plugin=biz.aQute.bnd:biz.aQute.bnd.gradle:5.0.1
+
+org.gradle.jvmargs=-Xmx2g
diff --git a/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd
index 9fae67c..f448335 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-Bundle-Version: 5.0.1
+Bundle-Version: 5.0.2
-buildpath: \
osgi.core;version=6.0,\
osgi.cmpn;version=6.0,\
diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/.gitignore
index 57b3411..5e92567 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/.gitignore
+++ b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/.gitignore
@@ -1,2 +1,3 @@
/bin/
/generated/
+/bin_test/
diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/test/.keepme b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/test/.keepme
new file mode 100644
index 0000000..e69de29
diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd
index 13668d6..3e26cb2 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd
@@ -16,7 +16,7 @@
#
javac.source: 1.8
javac.target: 1.8
-Bundle-Version: 1.2.1
+Bundle-Version: 1.2.2
-buildpath: \
org.apache.felix.dependencymanager;version=latest,\
osgi.core;version=6.0,\
diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd
index 9b9289f..8edcb70 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-Bundle-Version: 4.0.7
+Bundle-Version: 4.0.8
-buildpath: \
osgi.core;version=4.2,\
osgi.cmpn;version=4.2,\
diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/JSONMetaData.java b/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/JSONMetaData.java
index b202f71..4908944 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/JSONMetaData.java
+++ b/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/JSONMetaData.java
@@ -176,7 +176,11 @@ public class JSONMetaData implements MetaData, Cloneable
}
else if (type.equals(Character.class))
{
- return Character.valueOf((char) Integer.parseInt(value));
+ try {
+ return Character.valueOf((char) Integer.parseInt(value));
+ } catch (NumberFormatException e) {
+ return value.charAt(0);
+ }
}
else if (type.equals(Boolean.class))
{
@@ -235,7 +239,11 @@ public class JSONMetaData implements MetaData, Cloneable
else if (type.equals(Character.class))
{
for (int i = 0; i < len; i ++) {
- Array.set(result, i, Character.valueOf((char) Integer.parseInt(array.get(i).toString())));
+ try {
+ Array.set(result, i, Character.valueOf((char) Integer.parseInt(array.get(i).toString())));
+ } catch (NumberFormatException e) {
+ Array.set(result, i, Character.valueOf((char) array.get(i).toString().charAt(0)));
+ }
}
}
else if (type.equals(Boolean.class))
diff --git a/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd
index 2eab932..ceb86ed 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd
@@ -24,7 +24,7 @@
Private-Package: \
org.apache.felix.dm.shell
Bundle-Activator:org.apache.felix.dm.shell.Activator
-Bundle-Version: 4.0.8
+Bundle-Version: 4.0.9
Include-Resource: META-INF/=resources/,META-INF/changelog.txt=changelog.txt
Bundle-Name: Apache Felix Dependency Manager Shell
Bundle-Description: Gogo Shell commands for Apache Felix Dependency Manager