[felix-dev] branch master updated: In preparation for a release, remove SNAPSHOT dependency
This is an automated email from the ASF dual-hosted git repository. davidb 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 9017cb5 In preparation for a release, remove SNAPSHOT dependency 9017cb5 is described below commit 9017cb53873e463b98e5837a5528f2e949f92ea7 Author: David Bosschaert AuthorDate: Thu Mar 12 15:46:37 2020 + In preparation for a release, remove SNAPSHOT dependency The http.base component has not changed since the last release. --- http/jetty/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml index 1ca1881..e135277 100644 --- a/http/jetty/pom.xml +++ b/http/jetty/pom.xml @@ -262,7 +262,7 @@ org.apache.felix org.apache.felix.http.base -4.0.9-SNAPSHOT +4.0.8 commons-fileupload
svn commit: r38517 - /release/felix/
Author: davidb Date: Mon Mar 16 09:29:51 2020 New Revision: 38517 Log: org.apache.felix.http.jetty-4.0.16 Added: release/felix/org.apache.felix.http.jetty-4.0.16-javadoc.jar (with props) release/felix/org.apache.felix.http.jetty-4.0.16-javadoc.jar.asc release/felix/org.apache.felix.http.jetty-4.0.16-javadoc.jar.md5 release/felix/org.apache.felix.http.jetty-4.0.16-javadoc.jar.sha1 release/felix/org.apache.felix.http.jetty-4.0.16-light.jar (with props) release/felix/org.apache.felix.http.jetty-4.0.16-light.jar.asc release/felix/org.apache.felix.http.jetty-4.0.16-light.jar.md5 release/felix/org.apache.felix.http.jetty-4.0.16-light.jar.sha1 release/felix/org.apache.felix.http.jetty-4.0.16-source-release.tar.gz (with props) release/felix/org.apache.felix.http.jetty-4.0.16-source-release.tar.gz.asc release/felix/org.apache.felix.http.jetty-4.0.16-source-release.tar.gz.md5 release/felix/org.apache.felix.http.jetty-4.0.16-source-release.tar.gz.sha1 release/felix/org.apache.felix.http.jetty-4.0.16-source-release.zip (with props) release/felix/org.apache.felix.http.jetty-4.0.16-source-release.zip.asc release/felix/org.apache.felix.http.jetty-4.0.16-source-release.zip.md5 release/felix/org.apache.felix.http.jetty-4.0.16-source-release.zip.sha1 release/felix/org.apache.felix.http.jetty-4.0.16-sources.jar (with props) release/felix/org.apache.felix.http.jetty-4.0.16-sources.jar.asc release/felix/org.apache.felix.http.jetty-4.0.16-sources.jar.md5 release/felix/org.apache.felix.http.jetty-4.0.16-sources.jar.sha1 release/felix/org.apache.felix.http.jetty-4.0.16.jar (with props) release/felix/org.apache.felix.http.jetty-4.0.16.jar.asc release/felix/org.apache.felix.http.jetty-4.0.16.jar.md5 release/felix/org.apache.felix.http.jetty-4.0.16.jar.sha1 release/felix/org.apache.felix.http.jetty-4.0.16.pom release/felix/org.apache.felix.http.jetty-4.0.16.pom.asc release/felix/org.apache.felix.http.jetty-4.0.16.pom.md5 release/felix/org.apache.felix.http.jetty-4.0.16.pom.sha1 Removed: release/felix/org.apache.felix.http.jetty-4.0.14-javadoc.jar release/felix/org.apache.felix.http.jetty-4.0.14-javadoc.jar.asc release/felix/org.apache.felix.http.jetty-4.0.14-javadoc.jar.sha1 release/felix/org.apache.felix.http.jetty-4.0.14-javadoc.jar.sha512 release/felix/org.apache.felix.http.jetty-4.0.14-light.jar release/felix/org.apache.felix.http.jetty-4.0.14-light.jar.asc release/felix/org.apache.felix.http.jetty-4.0.14-light.jar.sha1 release/felix/org.apache.felix.http.jetty-4.0.14-light.jar.sha512 release/felix/org.apache.felix.http.jetty-4.0.14-source-release.tar.gz release/felix/org.apache.felix.http.jetty-4.0.14-source-release.tar.gz.asc release/felix/org.apache.felix.http.jetty-4.0.14-source-release.tar.gz.sha1 release/felix/org.apache.felix.http.jetty-4.0.14-source-release.tar.gz.sha512 release/felix/org.apache.felix.http.jetty-4.0.14-source-release.zip release/felix/org.apache.felix.http.jetty-4.0.14-source-release.zip.asc release/felix/org.apache.felix.http.jetty-4.0.14-source-release.zip.sha1 release/felix/org.apache.felix.http.jetty-4.0.14-source-release.zip.sha512 release/felix/org.apache.felix.http.jetty-4.0.14-sources.jar release/felix/org.apache.felix.http.jetty-4.0.14-sources.jar.asc release/felix/org.apache.felix.http.jetty-4.0.14-sources.jar.sha1 release/felix/org.apache.felix.http.jetty-4.0.14-sources.jar.sha512 release/felix/org.apache.felix.http.jetty-4.0.14.jar release/felix/org.apache.felix.http.jetty-4.0.14.jar.asc release/felix/org.apache.felix.http.jetty-4.0.14.jar.sha1 release/felix/org.apache.felix.http.jetty-4.0.14.jar.sha512 release/felix/org.apache.felix.http.jetty-4.0.14.pom release/felix/org.apache.felix.http.jetty-4.0.14.pom.asc release/felix/org.apache.felix.http.jetty-4.0.14.pom.sha1 release/felix/org.apache.felix.http.jetty-4.0.14.pom.sha512 Added: release/felix/org.apache.felix.http.jetty-4.0.16-javadoc.jar == Binary file - no diff available. Propchange: release/felix/org.apache.felix.http.jetty-4.0.16-javadoc.jar -- svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.http.jetty-4.0.16-javadoc.jar.asc == --- release/felix/org.apache.felix.http.jetty-4.0.16-javadoc.jar.asc (added) +++ release/felix/org.apache.felix.http.jetty-4.0.16-javadoc.jar.asc Mon Mar 16 09:29:51 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE6xvDHSN2Fhyp8Ax73f1PYfJPDZ8FAl5qXagACgkQ3f1PYfJP +DZ+LexAAouJbNRa2rzqH4JfcBc2zWZGrRP+6fx5MU74WF/dJeXK0Bs6hsF4gnzG+ +7exgXh9G2+hYLTavf5KIlYgNd+gqC+9OsOZFLYi+gJY6yJj
[felix-dev] branch master updated: FELIX-6239 Converter should be able to invoke default methods in Interfaces
This is an automated email from the ASF dual-hosted git repository. davidb 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 daace94 FELIX-6239 Converter should be able to invoke default methods in Interfaces daace94 is described below commit daace949c60bb92acbd782ba954eedb02b3f5cb4 Author: David Bosschaert AuthorDate: Thu Apr 16 13:45:30 2020 +0100 FELIX-6239 Converter should be able to invoke default methods in Interfaces Add missing license header on test class. --- .../osgi/util/converter/InterfaceWithDefaultMethod.java | 16 1 file changed, 16 insertions(+) diff --git a/converter/converter/src/test/java/org/osgi/util/converter/InterfaceWithDefaultMethod.java b/converter/converter/src/test/java/org/osgi/util/converter/InterfaceWithDefaultMethod.java index c8a42ff..7ad2c37 100644 --- a/converter/converter/src/test/java/org/osgi/util/converter/InterfaceWithDefaultMethod.java +++ b/converter/converter/src/test/java/org/osgi/util/converter/InterfaceWithDefaultMethod.java @@ -1,3 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.osgi.util.converter; public interface InterfaceWithDefaultMethod
svn commit: r39036 - /release/felix/
Author: davidb Date: Mon Apr 20 09:26:49 2020 New Revision: 39036 Log: org.apache.felix.converter-1.0.14 Added: release/felix/org.apache.felix.converter-1.0.14-all.jar (with props) release/felix/org.apache.felix.converter-1.0.14-all.jar.asc release/felix/org.apache.felix.converter-1.0.14-all.jar.md5 release/felix/org.apache.felix.converter-1.0.14-all.jar.sha1 release/felix/org.apache.felix.converter-1.0.14-javadoc.jar (with props) release/felix/org.apache.felix.converter-1.0.14-javadoc.jar.asc release/felix/org.apache.felix.converter-1.0.14-javadoc.jar.md5 release/felix/org.apache.felix.converter-1.0.14-javadoc.jar.sha1 release/felix/org.apache.felix.converter-1.0.14-source-release.tar.gz (with props) release/felix/org.apache.felix.converter-1.0.14-source-release.tar.gz.asc release/felix/org.apache.felix.converter-1.0.14-source-release.tar.gz.md5 release/felix/org.apache.felix.converter-1.0.14-source-release.tar.gz.sha1 release/felix/org.apache.felix.converter-1.0.14-source-release.zip (with props) release/felix/org.apache.felix.converter-1.0.14-source-release.zip.asc release/felix/org.apache.felix.converter-1.0.14-source-release.zip.md5 release/felix/org.apache.felix.converter-1.0.14-source-release.zip.sha1 release/felix/org.apache.felix.converter-1.0.14-sources.jar (with props) release/felix/org.apache.felix.converter-1.0.14-sources.jar.asc release/felix/org.apache.felix.converter-1.0.14-sources.jar.md5 release/felix/org.apache.felix.converter-1.0.14-sources.jar.sha1 release/felix/org.apache.felix.converter-1.0.14.jar (with props) release/felix/org.apache.felix.converter-1.0.14.jar.asc release/felix/org.apache.felix.converter-1.0.14.jar.md5 release/felix/org.apache.felix.converter-1.0.14.jar.sha1 release/felix/org.apache.felix.converter-1.0.14.pom release/felix/org.apache.felix.converter-1.0.14.pom.asc release/felix/org.apache.felix.converter-1.0.14.pom.md5 release/felix/org.apache.felix.converter-1.0.14.pom.sha1 Removed: release/felix/org.apache.felix.converter-1.0.12-all.jar release/felix/org.apache.felix.converter-1.0.12-all.jar.asc release/felix/org.apache.felix.converter-1.0.12-all.jar.md5 release/felix/org.apache.felix.converter-1.0.12-all.jar.sha1 release/felix/org.apache.felix.converter-1.0.12-javadoc.jar release/felix/org.apache.felix.converter-1.0.12-javadoc.jar.asc release/felix/org.apache.felix.converter-1.0.12-javadoc.jar.md5 release/felix/org.apache.felix.converter-1.0.12-javadoc.jar.sha1 release/felix/org.apache.felix.converter-1.0.12-source-release.tar.gz release/felix/org.apache.felix.converter-1.0.12-source-release.tar.gz.asc release/felix/org.apache.felix.converter-1.0.12-source-release.tar.gz.md5 release/felix/org.apache.felix.converter-1.0.12-source-release.tar.gz.sha1 release/felix/org.apache.felix.converter-1.0.12-source-release.zip release/felix/org.apache.felix.converter-1.0.12-source-release.zip.asc release/felix/org.apache.felix.converter-1.0.12-source-release.zip.md5 release/felix/org.apache.felix.converter-1.0.12-source-release.zip.sha1 release/felix/org.apache.felix.converter-1.0.12-sources.jar release/felix/org.apache.felix.converter-1.0.12-sources.jar.asc release/felix/org.apache.felix.converter-1.0.12-sources.jar.md5 release/felix/org.apache.felix.converter-1.0.12-sources.jar.sha1 release/felix/org.apache.felix.converter-1.0.12.jar release/felix/org.apache.felix.converter-1.0.12.jar.asc release/felix/org.apache.felix.converter-1.0.12.jar.md5 release/felix/org.apache.felix.converter-1.0.12.jar.sha1 release/felix/org.apache.felix.converter-1.0.12.pom release/felix/org.apache.felix.converter-1.0.12.pom.asc release/felix/org.apache.felix.converter-1.0.12.pom.md5 release/felix/org.apache.felix.converter-1.0.12.pom.sha1 Added: release/felix/org.apache.felix.converter-1.0.14-all.jar == Binary file - no diff available. Propchange: release/felix/org.apache.felix.converter-1.0.14-all.jar -- svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.converter-1.0.14-all.jar.asc == --- release/felix/org.apache.felix.converter-1.0.14-all.jar.asc (added) +++ release/felix/org.apache.felix.converter-1.0.14-all.jar.asc Mon Apr 20 09:26:49 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE6xvDHSN2Fhyp8Ax73f1PYfJPDZ8FAl6ZZP4ACgkQ3f1PYfJP +DZ+sAw//eL6395utCK9zA0RcPQ+NJCZh3aXXueLpZBz3bcifo+H+PxK0dvyMt+f/ +4QcZ/ATKxC8bLayFRdQ577rk5jNOUpqr6MgmiIOgTdOHlYIvQf5KMoGnrjQfmnWf +297bvU4rZUXZvEkb9JA6zVICo+/fSfr5Nu4cbmuoKhqLICNUYSDDwEG3M2TmNHZq +cFEqxZtSor41TPTOwNp5tWXH9iiYEg
[felix-dev] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. davidb 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 22406c9 [maven-release-plugin] prepare for next development iteration 22406c9 is described below commit 22406c97ffdf311068972984466841a1173752b0 Author: David Bosschaert AuthorDate: Fri Apr 17 09:11:20 2020 +0100 [maven-release-plugin] prepare for next development iteration --- converter/converter/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/converter/converter/pom.xml b/converter/converter/pom.xml index 6b41c18..66263d3 100644 --- a/converter/converter/pom.xml +++ b/converter/converter/pom.xml @@ -28,14 +28,14 @@ Apache Felix Converter org.apache.felix.converter -1.0.14 +1.0.15-SNAPSHOT bundle scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.converter-1.0.14 + HEAD
[felix-dev] annotated tag org.apache.felix.converter-1.0.14 updated (255df95 -> 67a43c0)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to annotated tag org.apache.felix.converter-1.0.14 in repository https://gitbox.apache.org/repos/asf/felix-dev.git. *** WARNING: tag org.apache.felix.converter-1.0.14 was modified! *** from 255df95 (commit) to 67a43c0 (tag) tagging 255df95ff27145ffc0391e504bb91c62678b35fc (commit) replaces org.apache.felix.cm.json-1.0.0 by David Bosschaert on Fri Apr 17 09:11:15 2020 +0100 - Log - [maven-release-plugin] copy for tag org.apache.felix.converter-1.0.14 --- No new revisions were added by this update. Summary of changes:
[felix-dev] branch master updated: FELIX-6242 Conversion of boolean to Long results in Integer
This is an automated email from the ASF dual-hosted git repository.
davidb 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 b4875d1 FELIX-6242 Conversion of boolean to Long results in Integer
new f2cc5ad Merge pull request #18 from bosschaert/FELIX-6242
b4875d1 is described below
commit b4875d1e5163579e16f8135c300239463703dbe5
Author: David Bosschaert
AuthorDate: Thu Apr 16 14:04:05 2020 +0100
FELIX-6242 Conversion of boolean to Long results in Integer
---
.../java/org/osgi/util/converter/ConvertingImpl.java | 6 --
.../java/org/osgi/util/converter/ConverterTest.java | 19 +++
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git
a/converter/converter/src/main/java/org/osgi/util/converter/ConvertingImpl.java
b/converter/converter/src/main/java/org/osgi/util/converter/ConvertingImpl.java
index 0733060..71e333a 100644
---
a/converter/converter/src/main/java/org/osgi/util/converter/ConvertingImpl.java
+++
b/converter/converter/src/main/java/org/osgi/util/converter/ConvertingImpl.java
@@ -18,8 +18,8 @@ package org.osgi.util.converter;
import java.lang.annotation.Annotation;
import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
import java.lang.invoke.MethodHandles.Lookup;
+import java.lang.invoke.MethodType;
import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
@@ -915,7 +915,9 @@ class ConvertingImpl extends AbstractSpecifying
}
} else if (Number.class.isAssignableFrom(targetAsClass)) {
if (object instanceof Boolean) {
- return ((Boolean) object).booleanValue() ? 1 :
0;
+ return c.convert(((Boolean)
object).booleanValue() ? 1 : 0)
+ .targetAs(targetAsClass)
+ .to(targetType);
} else if (object instanceof Number) {
if (Byte.class.isAssignableFrom(targetAsClass))
{
return ((Number) object).byteValue();
diff --git
a/converter/converter/src/test/java/org/osgi/util/converter/ConverterTest.java
b/converter/converter/src/test/java/org/osgi/util/converter/ConverterTest.java
index 166b9c9..b635edf 100644
---
a/converter/converter/src/test/java/org/osgi/util/converter/ConverterTest.java
+++
b/converter/converter/src/test/java/org/osgi/util/converter/ConverterTest.java
@@ -349,13 +349,13 @@ public class ConverterTest {
assertArrayEquals(new char [] {'x', 'y'}, ca4b);
assertNotSame("Should have created a new instance", ca4a, ca4b);
}
-
+
/**
* 707.4.3.1 - null becomes an empty array
*/
@Test
public void testNullToArrayConversion() {
-
+
checkArray(String[].class);
checkArray(boolean[].class);
checkArray(byte[].class);
@@ -376,7 +376,7 @@ public class ConverterTest {
checkArray(long[][].class);
checkArray(double[][].class);
-
+
checkArray(String[][][].class);
checkArray(boolean[][][].class);
checkArray(byte[][][].class);
@@ -390,7 +390,7 @@ public class ConverterTest {
private void checkArray(Class arrayType) {
assertTrue(arrayType.isArray());
-
+
Object array = converter.convert(null).to(arrayType);
assertEquals(0, Array.getLength(array));
assertTrue(arrayType.isInstance(array));
@@ -1473,6 +1473,17 @@ public class ConverterTest {
new HashMap()).to(clazz);
assertEquals(InterfaceWithDefaultMethod.RESULT, i.defaultMethod());
}
+
+@Test
+public void testConvertBooleanToNumber() {
+assertEquals(Byte.valueOf((byte) 1),
converter.convert(Boolean.TRUE).to(Byte.class));
+assertEquals(Short.valueOf((short) 1),
converter.convert(Boolean.TRUE).to(Short.class));
+assertEquals(Integer.valueOf(1),
converter.convert(Boolean.TRUE).to(Integer.class));
+assertEquals(Long.valueOf(1),
converter.convert(Boolean.TRUE).to(Long.class));
+assertEquals(Float.valueOf(1.0f),
converter.convert(Boolean.TRUE).to(Float.class));
+assertEquals(Double.valueOf(1.0),
converter.convert(Boolean.TRUE).to(Double.class));
+}
+
static interface MyIntf2 {
String code();
Integer value();
[felix-dev] branch master updated (f2cc5ad -> 255df95)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git. from f2cc5ad Merge pull request #18 from bosschaert/FELIX-6242 add 255df95 [maven-release-plugin] prepare release org.apache.felix.converter-1.0.14 No new revisions were added by this update. Summary of changes: converter/converter/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
svn commit: r38816 - /release/felix/
Author: davidb Date: Mon Apr 6 09:39:48 2020 New Revision: 38816 Log: org.apache.felix.webconsole-4.4.0 Added: release/felix/org.apache.felix.webconsole-4.4.0-all.jar (with props) release/felix/org.apache.felix.webconsole-4.4.0-all.jar.asc release/felix/org.apache.felix.webconsole-4.4.0-all.jar.md5 release/felix/org.apache.felix.webconsole-4.4.0-all.jar.sha1 release/felix/org.apache.felix.webconsole-4.4.0-debug.jar (with props) release/felix/org.apache.felix.webconsole-4.4.0-debug.jar.asc release/felix/org.apache.felix.webconsole-4.4.0-debug.jar.md5 release/felix/org.apache.felix.webconsole-4.4.0-debug.jar.sha1 release/felix/org.apache.felix.webconsole-4.4.0-javadoc.jar (with props) release/felix/org.apache.felix.webconsole-4.4.0-javadoc.jar.asc release/felix/org.apache.felix.webconsole-4.4.0-javadoc.jar.md5 release/felix/org.apache.felix.webconsole-4.4.0-javadoc.jar.sha1 release/felix/org.apache.felix.webconsole-4.4.0-source-release.tar.gz (with props) release/felix/org.apache.felix.webconsole-4.4.0-source-release.tar.gz.asc release/felix/org.apache.felix.webconsole-4.4.0-source-release.tar.gz.md5 release/felix/org.apache.felix.webconsole-4.4.0-source-release.tar.gz.sha1 release/felix/org.apache.felix.webconsole-4.4.0-source-release.zip (with props) release/felix/org.apache.felix.webconsole-4.4.0-source-release.zip.asc release/felix/org.apache.felix.webconsole-4.4.0-source-release.zip.md5 release/felix/org.apache.felix.webconsole-4.4.0-source-release.zip.sha1 release/felix/org.apache.felix.webconsole-4.4.0-sources.jar (with props) release/felix/org.apache.felix.webconsole-4.4.0-sources.jar.asc release/felix/org.apache.felix.webconsole-4.4.0-sources.jar.md5 release/felix/org.apache.felix.webconsole-4.4.0-sources.jar.sha1 release/felix/org.apache.felix.webconsole-4.4.0.jar (with props) release/felix/org.apache.felix.webconsole-4.4.0.jar.asc release/felix/org.apache.felix.webconsole-4.4.0.jar.md5 release/felix/org.apache.felix.webconsole-4.4.0.jar.sha1 release/felix/org.apache.felix.webconsole-4.4.0.pom release/felix/org.apache.felix.webconsole-4.4.0.pom.asc release/felix/org.apache.felix.webconsole-4.4.0.pom.md5 release/felix/org.apache.felix.webconsole-4.4.0.pom.sha1 Removed: release/felix/org.apache.felix.webconsole-4.3.16-all.jar release/felix/org.apache.felix.webconsole-4.3.16-all.jar.asc release/felix/org.apache.felix.webconsole-4.3.16-all.jar.sha1 release/felix/org.apache.felix.webconsole-4.3.16-debug.jar release/felix/org.apache.felix.webconsole-4.3.16-debug.jar.asc release/felix/org.apache.felix.webconsole-4.3.16-debug.jar.sha1 release/felix/org.apache.felix.webconsole-4.3.16-javadoc.jar release/felix/org.apache.felix.webconsole-4.3.16-javadoc.jar.asc release/felix/org.apache.felix.webconsole-4.3.16-javadoc.jar.sha1 release/felix/org.apache.felix.webconsole-4.3.16-source-release.tar.gz release/felix/org.apache.felix.webconsole-4.3.16-source-release.tar.gz.asc release/felix/org.apache.felix.webconsole-4.3.16-source-release.tar.gz.sha1 release/felix/org.apache.felix.webconsole-4.3.16-source-release.zip release/felix/org.apache.felix.webconsole-4.3.16-source-release.zip.asc release/felix/org.apache.felix.webconsole-4.3.16-source-release.zip.sha1 release/felix/org.apache.felix.webconsole-4.3.16-sources.jar release/felix/org.apache.felix.webconsole-4.3.16-sources.jar.asc release/felix/org.apache.felix.webconsole-4.3.16-sources.jar.sha1 release/felix/org.apache.felix.webconsole-4.3.16.jar release/felix/org.apache.felix.webconsole-4.3.16.jar.asc release/felix/org.apache.felix.webconsole-4.3.16.jar.sha1 release/felix/org.apache.felix.webconsole-4.3.16.pom release/felix/org.apache.felix.webconsole-4.3.16.pom.asc release/felix/org.apache.felix.webconsole-4.3.16.pom.sha1 Added: release/felix/org.apache.felix.webconsole-4.4.0-all.jar == Binary file - no diff available. Propchange: release/felix/org.apache.felix.webconsole-4.4.0-all.jar -- svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.webconsole-4.4.0-all.jar.asc == --- release/felix/org.apache.felix.webconsole-4.4.0-all.jar.asc (added) +++ release/felix/org.apache.felix.webconsole-4.4.0-all.jar.asc Mon Apr 6 09:39:48 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE6xvDHSN2Fhyp8Ax73f1PYfJPDZ8FAl6Fw/8ACgkQ3f1PYfJP +DZ9hWg//aIW0b20ZBgDnJMWEuB8UKpRqUetNuBJ6W39aAXyGJq9o70GwcfGFzwkI +pyYsHuuHHJ9XLxFi1WF8OeEPcUnbwl7+XiWDznSewnsYhiINxcii4s+eX6qCizVn +5tfirO12D6N/yv1uLUuvVR9+JslqCEVcBRoWmzOapFQYGEvs2Rvmd0RgReN6RuE6 +qH6BZ3BkawvnSYa
[felix-dev] branch master updated: Update to 4.4.0 as FELIX-6232 introduced a new feature
This is an automated email from the ASF dual-hosted git repository. davidb 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 6da3602 Update to 4.4.0 as FELIX-6232 introduced a new feature 6da3602 is described below commit 6da3602a94d8d2b2b80ab42dbd7f5590c295b0f5 Author: David Bosschaert AuthorDate: Thu Apr 2 11:47:10 2020 +0100 Update to 4.4.0 as FELIX-6232 introduced a new feature --- webconsole/changelog.txt | 2 +- webconsole/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webconsole/changelog.txt b/webconsole/changelog.txt index 91025a5..4b5f084 100644 --- a/webconsole/changelog.txt +++ b/webconsole/changelog.txt @@ -1,4 +1,4 @@ -Changes in 4.3.18 +Changes in 4.4.0 - ** Improvement * [FELIX-6232] - Allow Webconsole to install parallel versions of bundles diff --git a/webconsole/pom.xml b/webconsole/pom.xml index c4e5cdc..3c3c352 100644 --- a/webconsole/pom.xml +++ b/webconsole/pom.xml @@ -28,7 +28,7 @@ org.apache.felix.webconsole bundle -4.3.17-SNAPSHOT +4.4.0-SNAPSHOT Apache Felix Web Management Console
[felix-dev] branch master updated: Update Web Console parent pom to felix-parent 6
This is an automated email from the ASF dual-hosted git repository. davidb 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 bd89907 Update Web Console parent pom to felix-parent 6 bd89907 is described below commit bd89907b6ccfd19c00b338fd4013312c213c67c9 Author: David Bosschaert AuthorDate: Thu Apr 2 11:22:46 2020 +0100 Update Web Console parent pom to felix-parent 6 As the unit test dependencies are not in the parent pom any more, these are now brought into the component pom. --- webconsole/pom.xml | 15 ++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/webconsole/pom.xml b/webconsole/pom.xml index cb7df48..c4e5cdc 100644 --- a/webconsole/pom.xml +++ b/webconsole/pom.xml @@ -22,7 +22,7 @@ org.apache.felix felix-parent -4 +6 ../pom/pom.xml @@ -416,5 +416,18 @@ provided true + + +junit +junit +4.12 +test + + +org.mockito +mockito-all +1.10.19 +test +
[felix-dev] annotated tag org.apache.felix.webconsole-4.4.0 updated (4cd5334 -> 6e566f7)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to annotated tag org.apache.felix.webconsole-4.4.0 in repository https://gitbox.apache.org/repos/asf/felix-dev.git. *** WARNING: tag org.apache.felix.webconsole-4.4.0 was modified! *** from 4cd5334 (commit) to 6e566f7 (tag) tagging 4cd5334c1649d48bbc0bdc5644657ca96b130837 (commit) replaces org.apache.felix.fileinstall-3.6.6 by David Bosschaert on Thu Apr 2 11:50:42 2020 +0100 - Log - [maven-release-plugin] copy for tag org.apache.felix.webconsole-4.4.0 --- No new revisions were added by this update. Summary of changes:
[felix-dev] branch master updated: [maven-release-plugin] prepare release org.apache.felix.webconsole-4.4.0
This is an automated email from the ASF dual-hosted git repository. davidb 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 4cd5334 [maven-release-plugin] prepare release org.apache.felix.webconsole-4.4.0 4cd5334 is described below commit 4cd5334c1649d48bbc0bdc5644657ca96b130837 Author: David Bosschaert AuthorDate: Thu Apr 2 11:50:27 2020 +0100 [maven-release-plugin] prepare release org.apache.felix.webconsole-4.4.0 --- webconsole/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webconsole/pom.xml b/webconsole/pom.xml index 3c3c352..0f46503 100644 --- a/webconsole/pom.xml +++ b/webconsole/pom.xml @@ -28,7 +28,7 @@ org.apache.felix.webconsole bundle -4.4.0-SNAPSHOT +4.4.0 Apache Felix Web Management Console @@ -50,7 +50,8 @@ scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - + org.apache.felix.webconsole-4.4.0 +
[felix-dev] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. davidb 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 2668e81 [maven-release-plugin] prepare for next development iteration 2668e81 is described below commit 2668e811c4ffb41fe7e21d83845a28adb72f205d Author: David Bosschaert AuthorDate: Thu Apr 2 11:50:47 2020 +0100 [maven-release-plugin] prepare for next development iteration --- webconsole/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webconsole/pom.xml b/webconsole/pom.xml index 0f46503..025bcfa 100644 --- a/webconsole/pom.xml +++ b/webconsole/pom.xml @@ -28,7 +28,7 @@ org.apache.felix.webconsole bundle -4.4.0 +4.4.1-SNAPSHOT Apache Felix Web Management Console @@ -50,7 +50,7 @@ scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.webconsole-4.4.0 + HEAD
[felix-dev] branch master updated: [converter] handle default methods
This is an automated email from the ASF dual-hosted git repository.
davidb 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 1431a1b [converter] handle default methods
new 0cb4bb0 Merge pull request #10 from stbischof/conv_def_method
1431a1b is described below
commit 1431a1bb2262cb60e6c072b49930f2f54e216e02
Author: Stefan Bischof
AuthorDate: Wed Mar 18 19:14:39 2020 +0100
[converter] handle default methods
---
.../org/osgi/util/converter/ConvertingImpl.java| 29 ++
.../org/osgi/util/converter/ConverterTest.java | 8 ++
.../util/converter/InterfaceWithDefaultMethod.java | 11
3 files changed, 48 insertions(+)
diff --git
a/converter/converter/src/main/java/org/osgi/util/converter/ConvertingImpl.java
b/converter/converter/src/main/java/org/osgi/util/converter/ConvertingImpl.java
index c9e3722..0733060 100644
---
a/converter/converter/src/main/java/org/osgi/util/converter/ConvertingImpl.java
+++
b/converter/converter/src/main/java/org/osgi/util/converter/ConvertingImpl.java
@@ -17,6 +17,9 @@
package org.osgi.util.converter;
import java.lang.annotation.Annotation;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.invoke.MethodHandles.Lookup;
import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
@@ -810,6 +813,32 @@ class ConvertingImpl extends AbstractSpecifying
if (cls.isAnnotation()) {
val = method.getDefaultValue();
}
+ else if (method.isDefault())
+ {
+ double javaVersion =
Double.parseDouble(
+
System.getProperty("java.class.version"));
+ double java8 = 52.0;
+ if (javaVersion > java8)
+ {
+ val =
MethodHandles.lookup().findSpecial(
+
method.getDeclaringClass(), method.getName(),
+
MethodType.methodType(method.getReturnType(),
+ new
Class[] {}),
+
method.getDeclaringClass()).bindTo(
+
proxy).invokeWithArguments(args);
+ }
+ else
+ {
+ Constructor c =
Lookup.class.getDeclaredConstructor(
+ Class.class);
+ if (!c.isAccessible())
+ {
+
c.setAccessible(true);
+ }
+ val =
c.newInstance(cls).in(cls).unreflectSpecial(method,
+
cls).bindTo(proxy).invokeWithArguments(args);
+ }
+ }
if (val == null) {
if (args != null && args.length
== 1) {
diff --git
a/converter/converter/src/test/java/org/osgi/util/converter/ConverterTest.java
b/converter/converter/src/test/java/org/osgi/util/converter/ConverterTest.java
index ef00c13..166b9c9 100644
---
a/converter/converter/src/test/java/org/osgi/util/converter/ConverterTest.java
+++
b/converter/converter/src/test/java/org/osgi/util/converter/ConverterTest.java
@@ -1465,6 +1465,14 @@ public class ConverterTest {
assertNotNull(k);
}
+@Test
+public void testDefaultInterfaceMethod() throws Throwable
+{
+Class clazz = InterfaceWithDefaultMethod.class;
+InterfaceWithDefaultMethod i = (InterfaceWithDefaultMethod)
Converters.standardConverter().convert(
+new HashMap()).to(clazz);
+assertEquals(InterfaceWithDefaultMethod.RESULT, i.defaultMethod());
+}
static interface MyIntf2 {
String code();
Integer value();
diff --git
a/converter/converter/src/test/java/org/osgi/util/converter/InterfaceWithDefaultMethod.java
[felix-dev] branch master updated: Convert to Interface without methods - FELIX-6238
This is an automated email from the ASF dual-hosted git repository.
davidb 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 9f29bc8 Convert to Interface without methods - FELIX-6238
new 29ccc55 Merge pull request #9 from stbischof/conv_int_empt
9f29bc8 is described below
commit 9f29bc82aa688c38b9b74b79ccd2d50ae0a8abac
Author: Stefan Bischof
AuthorDate: Tue Mar 17 15:24:51 2020 +0100
Convert to Interface without methods - FELIX-6238
---
.../org/osgi/util/converter/ConvertingImpl.java| 6 -
.../org/osgi/util/converter/ConverterTest.java | 29 ++
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git
a/converter/converter/src/main/java/org/osgi/util/converter/ConvertingImpl.java
b/converter/converter/src/main/java/org/osgi/util/converter/ConvertingImpl.java
index fc409d2..c9e3722 100644
---
a/converter/converter/src/main/java/org/osgi/util/converter/ConvertingImpl.java
+++
b/converter/converter/src/main/java/org/osgi/util/converter/ConvertingImpl.java
@@ -1126,11 +1126,15 @@ class ConvertingImpl extends
AbstractSpecifying
Set> interfaces = getInterfaces0(cls);
outer: for (Iterator> it = interfaces.iterator();
it.hasNext();) {
Class< ? > intf = it.next();
- for (Method method : intf.getMethods()) {
+ Method[] methods=intf.getMethods();
+ for (Method method : methods) {
if(method.getDeclaringClass() == intf) {
continue outer;
}
}
+ if(intf==cls&==0) {
+ continue outer;
+ }
it.remove();
}
diff --git
a/converter/converter/src/test/java/org/osgi/util/converter/ConverterTest.java
b/converter/converter/src/test/java/org/osgi/util/converter/ConverterTest.java
index 9b4615e..ef00c13 100644
---
a/converter/converter/src/test/java/org/osgi/util/converter/ConverterTest.java
+++
b/converter/converter/src/test/java/org/osgi/util/converter/ConverterTest.java
@@ -1451,11 +1451,40 @@ public class ConverterTest {
assertEquals(Integer.valueOf(0), inter.value());
}
+@Test
+public void testMapToEmptyInterface() throws Exception {
+Map map = new HashMap();
+map.put("a", "b");
+EmptyInterface i =
Converters.standardConverter().convert(map).to(EmptyInterface.class);
+assertNotNull(i);
+
+EmptyInterface2 j =
Converters.standardConverter().convert(map).to(EmptyInterface2.class);
+assertNotNull(j);
+
+EmptyInterface3 k =
Converters.standardConverter().convert(map).to(EmptyInterface3.class);
+assertNotNull(k);
+}
+
static interface MyIntf2 {
String code();
Integer value();
}
+static interface EmptyInterface
+{
+}
+
+static interface EmptyInterface2 extends EmptyInterface
+{
+}
+static interface NonEmptyInterface
+{
+ int a();
+}
+
+static interface EmptyInterface3 extends NonEmptyInterface
+{
+}
static class MyClass2 {
private final String value;
public MyClass2(String v) {
[felix-dev] branch master updated: FELIX-6362 Utils ResourceBuilder does not allow java.* imports
This is an automated email from the ASF dual-hosted git repository.
davidb 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 d2f25bf FELIX-6362 Utils ResourceBuilder does not allow java.* imports
new cf18cb6 Merge pull request #62 from bosschaert/FELIX-6362
d2f25bf is described below
commit d2f25bf4e714d3d16ae41fe70c092c277a1d850e
Author: David Bosschaert
AuthorDate: Mon Nov 23 16:56:05 2020 +
FELIX-6362 Utils ResourceBuilder does not allow java.* imports
---
.../felix/utils/resource/ResourceBuilder.java | 7 ++---
.../felix/utils/resource/ResourceBuilderTest.java | 33 ++
2 files changed, 35 insertions(+), 5 deletions(-)
diff --git
a/utils/src/main/java/org/apache/felix/utils/resource/ResourceBuilder.java
b/utils/src/main/java/org/apache/felix/utils/resource/ResourceBuilder.java
index a2cec7f..a269300 100644
--- a/utils/src/main/java/org/apache/felix/utils/resource/ResourceBuilder.java
+++ b/utils/src/main/java/org/apache/felix/utils/resource/ResourceBuilder.java
@@ -309,17 +309,14 @@ public final class ResourceBuilder {
clause.attrs.put(Constants.BUNDLE_VERSION_ATTRIBUTE,
VersionRange.parseVersionRange(v.toString()));
}
-// Verify java.* is not imported, nor any duplicate imports.
+// Verify no duplicate imports, nor '.' or empty packages.
for (String pkgName : clause.paths) {
if (!dupeSet.contains(pkgName)) {
-// Verify that java.* packages are not imported.
-if (pkgName.startsWith("java.")) {
-throw new BundleException("Importing java.* packages
not allowed: " + pkgName);
// The character "." has no meaning in the OSGi spec except
// when placed on the bundle class path. Some people,
however,
// mistakenly think it means the default package when
imported
// or exported. This is not correct. It is invalid.
-} else if (pkgName.equals(".")) {
+if (pkgName.equals(".")) {
throw new BundleException("Importing '.' is invalid.");
// Make sure a package name was specified.
} else if (pkgName.length() == 0) {
diff --git
a/utils/src/test/java/org/apache/felix/utils/resource/ResourceBuilderTest.java
b/utils/src/test/java/org/apache/felix/utils/resource/ResourceBuilderTest.java
new file mode 100644
index 000..eb8bcfe
--- /dev/null
+++
b/utils/src/test/java/org/apache/felix/utils/resource/ResourceBuilderTest.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.felix.utils.resource;
+
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ResourceBuilderTest {
+@Test
+public void testImportJavaPackage() throws Exception {
+Map headers = new HashMap<>();
+headers.put("Bundle-ManifestVersion", "2");
+headers.put("Bundle-SymbolicName", "foo");
+headers.put("Import-Package", "java.util");
+ResourceBuilder.build("http://foo;, headers);
+}
+}
[felix-dev] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. davidb 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 7be69de [maven-release-plugin] prepare for next development iteration 7be69de is described below commit 7be69dea338690cce390f655d62356b6badd32df Author: David Bosschaert AuthorDate: Tue Nov 24 09:01:00 2020 + [maven-release-plugin] prepare for next development iteration --- utils/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/pom.xml b/utils/pom.xml index 9bcad84..f15e5d8 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -27,14 +27,14 @@ 4.0.0 Apache Felix Utils Utility classes for OSGi. -1.11.6 +1.11.7-SNAPSHOT org.apache.felix.utils scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.utils-1.11.6 + HEAD
[felix-dev] annotated tag org.apache.felix.utils-1.11.6 updated (964413a -> 3448e1b)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to annotated tag org.apache.felix.utils-1.11.6 in repository https://gitbox.apache.org/repos/asf/felix-dev.git. *** WARNING: tag org.apache.felix.utils-1.11.6 was modified! *** from 964413a (commit) to 3448e1b (tag) tagging 964413aa20bb412b2258c5f832b0517569ecea88 (commit) replaces org.apache.felix.gogo.bom-1.0.6 by David Bosschaert on Tue Nov 24 09:00:55 2020 + - Log - [maven-release-plugin] copy for tag org.apache.felix.utils-1.11.6 --- No new revisions were added by this update. Summary of changes:
[felix-dev] branch master updated (cf18cb6 -> 964413a)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git. from cf18cb6 Merge pull request #62 from bosschaert/FELIX-6362 add 964413a [maven-release-plugin] prepare release org.apache.felix.utils-1.11.6 No new revisions were added by this update. Summary of changes: utils/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
[felix-dev] branch master updated: [maven-release-plugin] prepare release org.apache.felix.converter-1.0.16
This is an automated email from the ASF dual-hosted git repository. davidb 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 f065b19 [maven-release-plugin] prepare release org.apache.felix.converter-1.0.16 f065b19 is described below commit f065b197549a711029f64747e34417838f9a516c Author: David Bosschaert AuthorDate: Fri Jun 4 09:26:34 2021 +0100 [maven-release-plugin] prepare release org.apache.felix.converter-1.0.16 --- converter/converter/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/converter/converter/pom.xml b/converter/converter/pom.xml index 66263d3..e909dc7 100644 --- a/converter/converter/pom.xml +++ b/converter/converter/pom.xml @@ -28,14 +28,14 @@ Apache Felix Converter org.apache.felix.converter -1.0.15-SNAPSHOT +1.0.16 bundle scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - HEAD + org.apache.felix.converter-1.0.16
[felix-dev] annotated tag org.apache.felix.converter-1.0.16 updated (f065b19 -> d6069b2)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to annotated tag org.apache.felix.converter-1.0.16 in repository https://gitbox.apache.org/repos/asf/felix-dev.git. *** WARNING: tag org.apache.felix.converter-1.0.16 was modified! *** from f065b19 (commit) to d6069b2 (tag) tagging f065b197549a711029f64747e34417838f9a516c (commit) replaces org.apache.felix.configadmin.plugin.interpolation-1.1.4 by David Bosschaert on Fri Jun 4 09:26:49 2021 +0100 - Log - [maven-release-plugin] copy for tag org.apache.felix.converter-1.0.16 --- No new revisions were added by this update. Summary of changes:
[felix-dev] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. davidb 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 1f9722e [maven-release-plugin] prepare for next development iteration 1f9722e is described below commit 1f9722ec3273adb758fba433a01362c4510cf69c Author: David Bosschaert AuthorDate: Fri Jun 4 09:26:54 2021 +0100 [maven-release-plugin] prepare for next development iteration --- converter/converter/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/converter/converter/pom.xml b/converter/converter/pom.xml index e909dc7..77675ad 100644 --- a/converter/converter/pom.xml +++ b/converter/converter/pom.xml @@ -28,14 +28,14 @@ Apache Felix Converter org.apache.felix.converter -1.0.16 +1.0.17-SNAPSHOT bundle scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.converter-1.0.16 + HEAD
[felix-dev] annotated tag org.apache.felix.converter-1.0.18 updated (9387b52 -> d10b653)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to annotated tag org.apache.felix.converter-1.0.18 in repository https://gitbox.apache.org/repos/asf/felix-dev.git. *** WARNING: tag org.apache.felix.converter-1.0.18 was modified! *** from 9387b52 (commit) to d10b653 (tag) tagging 9387b524d349d102091b95bdefb275922f9eac4a (commit) replaces org.apache.felix.converter-1.0.16 by David Bosschaert on Fri Jun 4 09:36:34 2021 +0100 - Log - [maven-release-plugin] copy for tag org.apache.felix.converter-1.0.18 --- No new revisions were added by this update. Summary of changes:
[felix-dev] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. davidb 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 693d09c [maven-release-plugin] prepare for next development iteration 693d09c is described below commit 693d09cfa983dca5bfd97d11c282c9af72dc2d43 Author: David Bosschaert AuthorDate: Fri Jun 4 09:36:39 2021 +0100 [maven-release-plugin] prepare for next development iteration --- converter/converter/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/converter/converter/pom.xml b/converter/converter/pom.xml index 0f804a5..2145816 100644 --- a/converter/converter/pom.xml +++ b/converter/converter/pom.xml @@ -28,14 +28,14 @@ Apache Felix Converter org.apache.felix.converter -1.0.18 +1.0.19-SNAPSHOT bundle scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.converter-1.0.18 + HEAD
[felix-dev] branch master updated: [maven-release-plugin] prepare release org.apache.felix.converter-1.0.18
This is an automated email from the ASF dual-hosted git repository. davidb 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 9387b52 [maven-release-plugin] prepare release org.apache.felix.converter-1.0.18 9387b52 is described below commit 9387b524d349d102091b95bdefb275922f9eac4a Author: David Bosschaert AuthorDate: Fri Jun 4 09:36:19 2021 +0100 [maven-release-plugin] prepare release org.apache.felix.converter-1.0.18 --- converter/converter/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/converter/converter/pom.xml b/converter/converter/pom.xml index 77675ad..0f804a5 100644 --- a/converter/converter/pom.xml +++ b/converter/converter/pom.xml @@ -28,14 +28,14 @@ Apache Felix Converter org.apache.felix.converter -1.0.17-SNAPSHOT +1.0.18 bundle scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - HEAD + org.apache.felix.converter-1.0.18
[felix-dev] branch master updated: FELIX-6402 don't swallow exception when converting to array
This is an automated email from the ASF dual-hosted git repository.
davidb 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 18aa59f FELIX-6402 don't swallow exception when converting to array
new b178fda Merge pull request #74 from kwin/FELIX-6402_dont-swallow-CME
18aa59f is described below
commit 18aa59f1e05a25ef510a29f20f96922dfb6ebd94
Author: Konrad Windszus
AuthorDate: Tue May 4 16:47:42 2021 +0200
FELIX-6402 don't swallow exception when converting to array
---
.../org/osgi/util/converter/ConvertingImpl.java| 8 +++---
.../org/osgi/util/converter/ConverterTest.java | 33 ++
2 files changed, 37 insertions(+), 4 deletions(-)
diff --git
a/converter/converter/src/main/java/org/osgi/util/converter/ConvertingImpl.java
b/converter/converter/src/main/java/org/osgi/util/converter/ConvertingImpl.java
index 71e333a..87410a8 100644
---
a/converter/converter/src/main/java/org/osgi/util/converter/ConvertingImpl.java
+++
b/converter/converter/src/main/java/org/osgi/util/converter/ConvertingImpl.java
@@ -297,20 +297,20 @@ class ConvertingImpl extends
AbstractSpecifying
@SuppressWarnings("unchecked")
private T convertToArray(Class< ? > componentClz, Type
componentType, InternalConverter c) {
Collection< ? > collectionView = collectionView(c);
- Iterator< ? > itertor = collectionView.iterator();
+ Iterator< ? > iterator = collectionView.iterator();
try {
Object array = Array.newInstance(componentClz,
collectionView.size());
for (int i = 0; i < collectionView.size()
- && itertor.hasNext(); i++) {
- Object next = itertor.next();
+ && iterator.hasNext(); i++) {
+ Object next = iterator.next();
Object converted = c.convert(next)
.to(componentType);
Array.set(array, i, converted);
}
return (T) array;
} catch (Exception e) {
- return null;
+ throw new ConversionException("Cannot iterate over " +
collectionView.getClass(), e);
}
}
diff --git
a/converter/converter/src/test/java/org/osgi/util/converter/ConverterTest.java
b/converter/converter/src/test/java/org/osgi/util/converter/ConverterTest.java
index b635edf..f92205e 100644
---
a/converter/converter/src/test/java/org/osgi/util/converter/ConverterTest.java
+++
b/converter/converter/src/test/java/org/osgi/util/converter/ConverterTest.java
@@ -50,6 +50,7 @@ import java.util.Arrays;
import java.util.Calendar;
import java.util.Collection;
import java.util.Collections;
+import java.util.ConcurrentModificationException;
import java.util.Date;
import java.util.Deque;
import java.util.GregorianCalendar;
@@ -388,6 +389,38 @@ public class ConverterTest {
checkArray(double[][][].class);
}
+@Test
+public void testPropagatingExceptionInArray() {
+try {
+Set concurrentModificationSet = new HashSet() {
+private static final long serialVersionUID = 1L;
+
+@Override
+public Iterator iterator() {
+return new Iterator() {
+
+@Override
+public boolean hasNext() {
+return true;
+}
+
+@Override
+public String next() {
+throw new ConcurrentModificationException("This
iterator deliberately throws CMEs!");
+}
+};
+}
+
+};
+concurrentModificationSet.add("one");
+concurrentModificationSet.add("two");
+converter.convert(concurrentModificationSet).to(String[].class);
+fail("Should have thrown a Conversion Exception when a collection
throwing a CME was used as source");
+} catch (ConversionException e) {
+// good
+}
+}
+
private void checkArray(Class arrayType) {
assertTrue(arrayType.isArray());
[felix-dev] branch master updated: FELIX-6384 support empty directive values
This is an automated email from the ASF dual-hosted git repository.
davidb 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 0e8c8da FELIX-6384 support empty directive values
new 0b07b35 Merge pull request #69 from
kwin/feature/support-empty-default-values
0e8c8da is described below
commit 0e8c8da91122ed8b0bae0d0c38818d77a097dbc5
Author: Konrad Windszus
AuthorDate: Tue Feb 2 13:25:46 2021 +0100
FELIX-6384 support empty directive values
In addition support "=" within directive values
---
configadmin-plugins/interpolation/README.md | 3 +++
.../felix/configadmin/plugin/interpolation/Interpolator.java | 7 ---
.../interpolation/InterpolationConfigurationPluginTest.java | 11 ++-
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/configadmin-plugins/interpolation/README.md
b/configadmin-plugins/interpolation/README.md
index d1a7f10..868ea0f 100644
--- a/configadmin-plugins/interpolation/README.md
+++ b/configadmin-plugins/interpolation/README.md
@@ -61,10 +61,13 @@ It is possible to specify a default value as part of the
placeholder, for exampl
```
"port" : "$[env:PORT;default=8080]"
+"label" : "$[env:LABEL;default=]"
```
Without a default, the placeholder is left in the value if no value can be
found. With a default, the default is used instead.
+The default value may contain all alphanumeric and punctuation characters and
space except for a `;`. It may even be left out which leads to replacing the
placeholder with the empty string.
+
## Type Support
A placeholder can contain additional information like the type the value
should be converted to.
diff --git
a/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/Interpolator.java
b/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/Interpolator.java
index cb98fd6..ceddb92 100755
---
a/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/Interpolator.java
+++
b/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/Interpolator.java
@@ -114,9 +114,10 @@ public class Interpolator {
directives = new HashMap<>();
for (String dir : postfix.substring(dirPos + 1).split(";")) {
-String[] kv = dir.split("=");
-if (kv.length == 2) {
-directives.put(kv[0], kv[1]);
+String[] kv = dir.split("=", 2);
+if (kv.length > 0) {
+final String directiveValue = kv.length == 2 ? kv[1] :
"";
+directives.put(kv[0], directiveValue);
}
}
}
diff --git
a/configadmin-plugins/interpolation/src/test/java/org/apache/felix/configadmin/plugin/interpolation/InterpolationConfigurationPluginTest.java
b/configadmin-plugins/interpolation/src/test/java/org/apache/felix/configadmin/plugin/interpolation/InterpolationConfigurationPluginTest.java
index bdbf173..7a38573 100644
---
a/configadmin-plugins/interpolation/src/test/java/org/apache/felix/configadmin/plugin/interpolation/InterpolationConfigurationPluginTest.java
+++
b/configadmin-plugins/interpolation/src/test/java/org/apache/felix/configadmin/plugin/interpolation/InterpolationConfigurationPluginTest.java
@@ -138,10 +138,19 @@ public class InterpolationConfigurationPluginTest {
Dictionary dict = new Hashtable<>();
dict.put("defaulted", "$[env:notset;default=foo]");
-
+dict.put("defaulted2", "$[env:notset;default=]");
+dict.put("defaulted3", "$[env:notset;default=foo=bar]");
+dict.put("defaulted4", "$[env:notset;default=foo;=bar]");
+dict.put("defaulted5", "$[env:notset;default= ]");
+dict.put("defaulted6", "$[env:notset;default");
plugin.modifyConfiguration(null, dict);
assertEquals("foo", dict.get("defaulted"));
+assertEquals("", dict.get("defaulted2"));
+assertEquals("foo=bar", dict.get("defaulted3"));
+assertEquals("foo", dict.get("defaulted4")); // semicolon is not
supported in values
+assertEquals(" ", dict.get("defaulted5"));
+assertEquals("$[env:notset;default", dict.get("defaulted6"));
}
@Test
[felix-dev] annotated tag org.apache.felix.configadmin.plugin.interpolation-1.1.2 updated (b3c1ba1 -> 4293904)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to annotated tag org.apache.felix.configadmin.plugin.interpolation-1.1.2 in repository https://gitbox.apache.org/repos/asf/felix-dev.git. *** WARNING: tag org.apache.felix.configadmin.plugin.interpolation-1.1.2 was modified! *** from b3c1ba1 (commit) to 4293904 (tag) tagging b3c1ba140f148007536bfc06164d218faebe50f2 (commit) replaces org.apache.felix.cm.json-1.0.6 by David Bosschaert on Wed Feb 17 15:55:19 2021 + - Log - [maven-release-plugin] copy for tag org.apache.felix.configadmin.plugin.interpolation-1.1.2 --- No new revisions were added by this update. Summary of changes:
[felix-dev] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. davidb 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 22bc647 [maven-release-plugin] prepare for next development iteration 22bc647 is described below commit 22bc647defd15b71b78b7f42ba5d1917cb03c1b0 Author: David Bosschaert AuthorDate: Wed Feb 17 15:55:23 2021 + [maven-release-plugin] prepare for next development iteration --- configadmin-plugins/interpolation/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configadmin-plugins/interpolation/pom.xml b/configadmin-plugins/interpolation/pom.xml index 2a0efab..a8f15e3 100644 --- a/configadmin-plugins/interpolation/pom.xml +++ b/configadmin-plugins/interpolation/pom.xml @@ -28,7 +28,7 @@ org.apache.felix.configadmin.plugin.interpolation jar -1.1.2 +1.1.3-SNAPSHOT Apache Felix Configuration Admin Values Interpolation Plugin @@ -44,7 +44,7 @@ scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.configadmin.plugin.interpolation-1.1.2 + HEAD
[felix-dev] branch master updated (56da82c -> b3c1ba1)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git. from 56da82c Update dependencies to latest version add b3c1ba1 [maven-release-plugin] prepare release org.apache.felix.configadmin.plugin.interpolation-1.1.2 No new revisions were added by this update. Summary of changes: configadmin-plugins/interpolation/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[felix-dev] branch master updated: Update dependencies to latest version
This is an automated email from the ASF dual-hosted git repository. davidb 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 56da82c Update dependencies to latest version 56da82c is described below commit 56da82cfe995bf72dda9b9e1282cead91aea88b3 Author: David Bosschaert AuthorDate: Wed Feb 17 15:53:47 2021 + Update dependencies to latest version --- configadmin-plugins/interpolation/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configadmin-plugins/interpolation/pom.xml b/configadmin-plugins/interpolation/pom.xml index c379cd8..882f54a 100644 --- a/configadmin-plugins/interpolation/pom.xml +++ b/configadmin-plugins/interpolation/pom.xml @@ -22,7 +22,7 @@ org.apache.felix felix-parent -6 +7 ../../../pom/pom.xml @@ -121,7 +121,7 @@ org.apache.felix org.apache.felix.converter -1.0.12 +1.0.14 provided
[felix-dev] branch master updated: FELIX-6444 Contribute a compatible implementation of OSGi Features
This is an automated email from the ASF dual-hosted git repository.
davidb 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 d381c9c FELIX-6444 Contribute a compatible implementation of OSGi
Features
new 6eff0d0 Merge pull request #88 from bosschaert/features-contribution
d381c9c is described below
commit d381c9c52b2148606c79a1c10d410a1a2a98b9ea
Author: David Bosschaert
AuthorDate: Thu Aug 12 16:20:55 2021 +0100
FELIX-6444 Contribute a compatible implementation of OSGi Features
This implementation was initially made in the Apache Sling Whiteboard
component at
https://github.com/apache/sling-whiteboard/tree/master/osgi-featuremodel
---
features/pom.xml | 141
.../felix/feature/impl/ArtifactBuilderImpl.java| 95 +
.../felix/feature/impl/BuilderFactoryImpl.java | 59 +++
.../felix/feature/impl/BundleBuilderImpl.java | 95 +
.../feature/impl/ConfigurationBuilderImpl.java | 125 +++
.../felix/feature/impl/ExtensionBuilderImpl.java | 151
.../felix/feature/impl/FeatureBuilderImpl.java | 275 ++
.../felix/feature/impl/FeatureServiceImpl.java | 399 +
.../java/org/apache/felix/feature/impl/IDImpl.java | 214 +++
.../felix/feature/impl/FeatureServiceImplTest.java | 295 +++
.../src/test/resources/features/test-exfeat1.json | 26 ++
.../src/test/resources/features/test-exfeat2.json | 9 +
.../src/test/resources/features/test-feature.json | 28 ++
.../src/test/resources/features/test-feature2.json | 19 +
14 files changed, 1931 insertions(+)
diff --git a/features/pom.xml b/features/pom.xml
new file mode 100644
index 000..cd4f4d6
--- /dev/null
+++ b/features/pom.xml
@@ -0,0 +1,141 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+
+ 4.0.0
+
+ org.apache.felix
+ felix-parent
+ 7
+
+
+
+ org.apache.felix.feature
+ 0.0.1-SNAPSHOT
+ jar
+
+ OSGi Feature Model API
+
+
+ 11
+
+
+
+
+ sonatype.snapshots
+ OSGi Snapshot
+ https://oss.sonatype.org/content/repositories/snapshots
+
+
+
+
+
+
+biz.aQute.bnd
+bnd-maven-plugin
+5.3.0
+
+
+
+bnd-process
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+
+
+
${project.build.outputDirectory}/META-INF/MANIFEST.MF
+
+
+
+
+ org.apache.rat
+ apache-rat-plugin
+
+
+ *.md
+
src/main/resources/META-INF/services/*
+
+
+
+
+
+
+
+ org.osgi
+ osgi.annotation
+ 8.0.0
+ provided
+
+
+ org.osgi
+ osgi.core
+ 8.0.0
+ provided
+
+
+ org.osgi
+ org.osgi.service.feature
+ 1.0.0-SNAPSHOT
+ provided
+
+
+ org.osgi
+ org.osgi.util.function
+ 1.0.0
+ provided
+
+
+ org.apache.geronimo.specs
+ geronimo-json_1.1_spec
+ 1.3
+ provided
+
+
+ org.apache.felix
+ org.apache.felix.converter
+ 1.0.18
+ provided
+
+
+org.apache.felix
+org.apache.felix.cm.json
+1.0.6
+
[felix-dev] branch master updated: [Features] Don't rely on internal cm.json classes.
This is an automated email from the ASF dual-hosted git repository.
davidb 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 9287b26 [Features] Don't rely on internal cm.json classes.
new ebdd855 Merge pull request #91 from bosschaert/cmreader
9287b26 is described below
commit 9287b26fe5b7a2133bdb10c83be3c035d8c5f9bc
Author: David Bosschaert
AuthorDate: Thu Aug 26 07:13:58 2021 +0100
[Features] Don't rely on internal cm.json classes.
---
.../felix/feature/impl/FeatureServiceImpl.java | 60 --
1 file changed, 32 insertions(+), 28 deletions(-)
diff --git
a/features/src/main/java/org/apache/felix/feature/impl/FeatureServiceImpl.java
b/features/src/main/java/org/apache/felix/feature/impl/FeatureServiceImpl.java
index 41d05b7..69d61c0 100644
---
a/features/src/main/java/org/apache/felix/feature/impl/FeatureServiceImpl.java
+++
b/features/src/main/java/org/apache/felix/feature/impl/FeatureServiceImpl.java
@@ -19,13 +19,16 @@ package org.apache.felix.feature.impl;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
+import java.io.StringWriter;
import java.io.Writer;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Dictionary;
import java.util.HashMap;
+import java.util.Hashtable;
import java.util.LinkedHashMap;
import java.util.List;
-import java.util.Map;
+import java.util.Map;
import javax.json.Json;
import javax.json.JsonArray;
@@ -33,13 +36,15 @@ import javax.json.JsonArrayBuilder;
import javax.json.JsonNumber;
import javax.json.JsonObject;
import javax.json.JsonObjectBuilder;
+import javax.json.JsonReader;
import javax.json.JsonString;
import javax.json.JsonValue;
import javax.json.stream.JsonGenerator;
import javax.json.stream.JsonGeneratorFactory;
-import org.apache.felix.cm.json.impl.JsonSupport;
-import org.apache.felix.cm.json.impl.TypeConverter;
+import org.apache.felix.cm.json.ConfigurationReader;
+import org.apache.felix.cm.json.ConfigurationWriter;
+import org.apache.felix.cm.json.Configurations;
import org.osgi.service.feature.BuilderFactory;
import org.osgi.service.feature.Feature;
import org.osgi.service.feature.FeatureArtifact;
@@ -83,7 +88,7 @@ public class FeatureServiceImpl implements FeatureService {
public Feature readFeature(Reader jsonReader) throws IOException {
JsonObject json = Json.createReader(
-
JsonSupport.createCommentRemovingReader(jsonReader)).readObject();
+
Configurations.jsonCommentAwareReader(jsonReader)).readObject();
String id = json.getString("id");
FeatureBuilder builder =
builderFactory.newFeatureBuilder(getIDfromMavenCoordinates(id));
@@ -189,7 +194,7 @@ public class FeatureServiceImpl implements FeatureService {
return cats.toArray(new String[] {});
}
-private FeatureConfiguration[] getConfigurations(JsonObject json) {
+private FeatureConfiguration[] getConfigurations(JsonObject json) throws
IOException {
JsonObject jo = json.getJsonObject("configurations");
if (jo == null)
return new FeatureConfiguration[] {};
@@ -214,20 +219,14 @@ public class FeatureServiceImpl implements FeatureService
{
}
JsonObject values = entry.getValue().asJsonObject();
-for (Map.Entry value : values.entrySet()) {
- String key = value.getKey();
- String typeInfo = null;
- int cidx = key.indexOf(':');
- if (cidx > 0) {
- typeInfo = key.substring(cidx + 1);
- key = key.substring(0, cidx);
- }
-
-JsonValue val = value.getValue();
-// TODO ensure that binary support works as well
-Object v = TypeConverter.convertObjectToType(val, typeInfo);
-builder.addValue(key, v);
+
+ConfigurationReader cr =
Configurations.buildReader().build(values);
+Hashtable cmap = cr.readConfiguration();
+
+for (Map.Entry cme : cmap.entrySet()) {
+builder.addValue(cme.getKey(), cme.getValue());
}
+
configs.add(builder.build());
}
@@ -389,23 +388,28 @@ public class FeatureServiceImpl implements FeatureService
{
return ab.build();
}
- private JsonObject getConfigurations(Feature feature) {
+ private JsonObject getConfigurations(Feature feature) throws
IOException {
Map configs =
feature.getConfigurations();
if (configs == null || configs.size() == 0)
return null;
JsonObjectBuilder ob = J
[felix-dev] branch master updated: Remove spurious import
This is an automated email from the ASF dual-hosted git repository. davidb 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 f8784a2 Remove spurious import f8784a2 is described below commit f8784a2ba071d5f881f4796786353c842521d5db Author: David Bosschaert AuthorDate: Thu Aug 26 06:20:23 2021 +0100 Remove spurious import --- .../src/main/java/org/apache/felix/feature/impl/FeatureServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/features/src/main/java/org/apache/felix/feature/impl/FeatureServiceImpl.java b/features/src/main/java/org/apache/felix/feature/impl/FeatureServiceImpl.java index e34b2ef..41d05b7 100644 --- a/features/src/main/java/org/apache/felix/feature/impl/FeatureServiceImpl.java +++ b/features/src/main/java/org/apache/felix/feature/impl/FeatureServiceImpl.java @@ -37,7 +37,6 @@ import javax.json.JsonString; import javax.json.JsonValue; import javax.json.stream.JsonGenerator; import javax.json.stream.JsonGeneratorFactory; -import javax.print.DocFlavor.STRING; import org.apache.felix.cm.json.impl.JsonSupport; import org.apache.felix.cm.json.impl.TypeConverter;
[felix-dev] branch master updated: Fixes for gaps identified by the TCK
This is an automated email from the ASF dual-hosted git repository.
davidb 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 4431984 Fixes for gaps identified by the TCK
new 9abf655 Merge pull request #93 from bosschaert/tck_fixes
4431984 is described below
commit 44319843f495e7bbfc1fef70cc85ebe835326cb8
Author: David Bosschaert
AuthorDate: Fri Aug 27 15:32:05 2021 +0100
Fixes for gaps identified by the TCK
---
.../felix/feature/impl/ArtifactBuilderImpl.java| 23 -
.../felix/feature/impl/BundleBuilderImpl.java | 21 +
.../felix/feature/impl/FeatureServiceImpl.java | 8 ++
.../java/org/apache/felix/feature/impl/IDImpl.java | 7 ++
.../felix/feature/impl/BundleBuilderImplTest.java | 105 +
5 files changed, 163 insertions(+), 1 deletion(-)
diff --git
a/features/src/main/java/org/apache/felix/feature/impl/ArtifactBuilderImpl.java
b/features/src/main/java/org/apache/felix/feature/impl/ArtifactBuilderImpl.java
index 4fe6584..3af5e71 100644
---
a/features/src/main/java/org/apache/felix/feature/impl/ArtifactBuilderImpl.java
+++
b/features/src/main/java/org/apache/felix/feature/impl/ArtifactBuilderImpl.java
@@ -36,13 +36,34 @@ class ArtifactBuilderImpl implements FeatureArtifactBuilder
{
@Override
public FeatureArtifactBuilder addMetadata(String key, Object value) {
+ if (key == null)
+ throw new IllegalArgumentException("Metadata key cannot be
null");
+
+ if (value == null)
+ throw new IllegalArgumentException("Metadata key cannot be
null");
+
+ if ("id".equalsIgnoreCase(key))
+ throw new IllegalArgumentException("Key cannot be 'id'");
+
this.metadata.put(key, value);
return this;
}
@Override
public FeatureArtifactBuilder addMetadata(Map md) {
-this.metadata.putAll(md);
+ if (md.keySet().contains(null))
+ throw new IllegalArgumentException("Metadata key cannot be
null");
+
+ if (md.values().contains(null))
+ throw new IllegalArgumentException("Metadata key cannot be
null");
+
+ if (md.keySet().stream()
+ .map(String::toLowerCase)
+ .anyMatch(s -> "id".equals(s))) {
+ throw new IllegalArgumentException("Key cannot be 'id'");
+ }
+
+ this.metadata.putAll(md);
return this;
}
diff --git
a/features/src/main/java/org/apache/felix/feature/impl/BundleBuilderImpl.java
b/features/src/main/java/org/apache/felix/feature/impl/BundleBuilderImpl.java
index e19a2b1..1f55d03 100644
---
a/features/src/main/java/org/apache/felix/feature/impl/BundleBuilderImpl.java
+++
b/features/src/main/java/org/apache/felix/feature/impl/BundleBuilderImpl.java
@@ -36,12 +36,33 @@ class BundleBuilderImpl implements FeatureBundleBuilder {
@Override
public FeatureBundleBuilder addMetadata(String key, Object value) {
+ if (key == null)
+ throw new IllegalArgumentException("Metadata key cannot be
null");
+
+ if (value == null)
+ throw new IllegalArgumentException("Metadata key cannot be
null");
+
+ if ("id".equalsIgnoreCase(key))
+ throw new IllegalArgumentException("Key cannot be 'id'");
+
this.metadata.put(key, value);
return this;
}
@Override
public FeatureBundleBuilder addMetadata(Map md) {
+ if (md.keySet().contains(null))
+ throw new IllegalArgumentException("Metadata key cannot be
null");
+
+ if (md.values().contains(null))
+ throw new IllegalArgumentException("Metadata key cannot be
null");
+
+ if (md.keySet().stream()
+ .map(String::toLowerCase)
+ .anyMatch(s -> "id".equals(s))) {
+ throw new IllegalArgumentException("Key cannot be 'id'");
+ }
+
this.metadata.putAll(md);
return this;
}
diff --git
a/features/src/main/java/org/apache/felix/feature/impl/FeatureServiceImpl.java
b/features/src/main/java/org/apache/felix/feature/impl/FeatureServiceImpl.java
index 69d61c0..a25021d 100644
---
a/features/src/main/java/org/apache/felix/feature/impl/FeatureServiceImpl.java
+++
b/features/src/main/java/org/apache/felix/feature/impl/FeatureServiceImpl.java
@@ -78,11 +78,19 @@ public class FeatureServiceImpl implements FeatureService {
@Override
public ID getID(String groupId, String artifactId, String version,
String type) {
+ if (type == null)
+ throw new Null
[felix-dev] branch master updated: Add support for variables
This is an automated email from the ASF dual-hosted git repository.
davidb 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 5e30c21 Add support for variables
new 1743e11 Merge pull request #89 from bosschaert/features_impl_1
5e30c21 is described below
commit 5e30c214b8283eb0436896f9db8b95d59102d864
Author: David Bosschaert
AuthorDate: Tue Aug 24 14:56:37 2021 +0100
Add support for variables
---
.../feature/impl/ConfigurationBuilderImpl.java | 13 -
.../felix/feature/impl/FeatureBuilderImpl.java | 12 ++---
.../felix/feature/impl/FeatureServiceImpl.java | 62 +++---
.../felix/feature/impl/FeatureServiceImplTest.java | 18 ++-
.../src/test/resources/features/test-feature.json | 10
5 files changed, 88 insertions(+), 27 deletions(-)
diff --git
a/features/src/main/java/org/apache/felix/feature/impl/ConfigurationBuilderImpl.java
b/features/src/main/java/org/apache/felix/feature/impl/ConfigurationBuilderImpl.java
index 62da552..b9922f1 100644
---
a/features/src/main/java/org/apache/felix/feature/impl/ConfigurationBuilderImpl.java
+++
b/features/src/main/java/org/apache/felix/feature/impl/ConfigurationBuilderImpl.java
@@ -41,19 +41,6 @@ class ConfigurationBuilderImpl implements
FeatureConfigurationBuilder {
this.name = name;
}
-ConfigurationBuilderImpl(FeatureConfiguration c) {
-if (c.getFactoryPid() == null) {
-p = c.getPid();
-name = null;
-} else {
-// TODO
-p = null;
-name = null;
-}
-
-addValues(c.getValues());
-}
-
@Override
public FeatureConfigurationBuilder addValue(String key, Object value) {
// TODO can do some validation on the configuration
diff --git
a/features/src/main/java/org/apache/felix/feature/impl/FeatureBuilderImpl.java
b/features/src/main/java/org/apache/felix/feature/impl/FeatureBuilderImpl.java
index 2f86860..f155822 100644
---
a/features/src/main/java/org/apache/felix/feature/impl/FeatureBuilderImpl.java
+++
b/features/src/main/java/org/apache/felix/feature/impl/FeatureBuilderImpl.java
@@ -47,7 +47,7 @@ class FeatureBuilderImpl implements FeatureBuilder {
private final List categories = new ArrayList<>();
private final Map configurations = new
LinkedHashMap<>();
private final Map extensions = new
LinkedHashMap<>();
-private final Map variables = new LinkedHashMap<>();
+private final Map variables = new LinkedHashMap<>();
FeatureBuilderImpl(ID id) {
this.id = id;
@@ -125,13 +125,13 @@ class FeatureBuilderImpl implements FeatureBuilder {
}
@Override
-public FeatureBuilder addVariable(String key, String value) {
+public FeatureBuilder addVariable(String key, Object value) {
this.variables.put(key, value);
return this;
}
@Override
-public FeatureBuilder addVariables(Map variables) {
+public FeatureBuilder addVariables(Map variables) {
this.variables.putAll(variables);
return this;
}
@@ -157,11 +157,11 @@ class FeatureBuilderImpl implements FeatureBuilder {
private final List categories;
private final Map configurations;
private final Map extensions;
-private final Map variables;
+private final Map variables;
private FeatureImpl(ID id, String aName, String desc, String docs,
String lic, String sc, String vnd,
boolean comp, List bs, List cats,
Map cs,
-Map es, Map vars) {
+Map es, Map vars) {
this.id = id;
name = Optional.ofNullable(aName);
description = Optional.ofNullable(desc);
@@ -239,7 +239,7 @@ class FeatureBuilderImpl implements FeatureBuilder {
}
@Override
-public Map getVariables() {
+public Map getVariables() {
return variables;
}
diff --git
a/features/src/main/java/org/apache/felix/feature/impl/FeatureServiceImpl.java
b/features/src/main/java/org/apache/felix/feature/impl/FeatureServiceImpl.java
index 10dc999..e34b2ef 100644
---
a/features/src/main/java/org/apache/felix/feature/impl/FeatureServiceImpl.java
+++
b/features/src/main/java/org/apache/felix/feature/impl/FeatureServiceImpl.java
@@ -37,6 +37,7 @@ import javax.json.JsonString;
import javax.json.JsonValue;
import javax.json.stream.JsonGenerator;
import javax.json.stream.JsonGeneratorFactory;
+import javax.print.DocFlavor.STRING;
import org.apache.felix.cm.json.impl.JsonSupport;
import org.apache.felix.cm.json.impl.TypeConverter;
@@ -94,9 +95,9 @@ public class FeatureServiceImpl implements FeatureService {
builder.setLicense(json.getString("license", null));
builder.setSCM(json.getString("scm", null));
[felix-dev] branch master updated (adc9559 -> 2ac4785)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git. from adc9559 [Features] Update OSGi API dependency to RC1 add 2ac4785 [maven-release-plugin] prepare release org.apache.felix.feature-0.9.0-RC1 No new revisions were added by this update. Summary of changes: features/pom.xml | 9 - 1 file changed, 4 insertions(+), 5 deletions(-)
[felix-dev] annotated tag org.apache.felix.feature-0.9.0-RC1 updated (2ac4785 -> be43353)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to annotated tag org.apache.felix.feature-0.9.0-RC1 in repository https://gitbox.apache.org/repos/asf/felix-dev.git. *** WARNING: tag org.apache.felix.feature-0.9.0-RC1 was modified! *** from 2ac4785 (commit) to be43353 (tag) tagging 2ac47852473a59910bc3fa42cf1c41e889c69189 (commit) replaces org.apache.felix.scr-2.1.30 by David Bosschaert on Fri Sep 3 11:49:28 2021 +0100 - Log - [maven-release-plugin] copy for tag org.apache.felix.feature-0.9.0-RC1 --- No new revisions were added by this update. Summary of changes:
[felix-dev] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. davidb 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 b50b6af [maven-release-plugin] prepare for next development iteration b50b6af is described below commit b50b6afa751422904eff0344e9303e61a3f3f9f7 Author: David Bosschaert AuthorDate: Fri Sep 3 11:49:30 2021 +0100 [maven-release-plugin] prepare for next development iteration --- features/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/features/pom.xml b/features/pom.xml index 32d1bc4..9f96a61 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -20,7 +20,7 @@ org.apache.felix.feature -0.9.0-RC1 +0.9.1-SNAPSHOT jar OSGi Feature Model API @@ -29,7 +29,7 @@ scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.feature-0.9.0-RC1 + HEAD
[felix-dev] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. davidb 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 d2bf394 [maven-release-plugin] prepare for next development iteration d2bf394 is described below commit d2bf3948e4da6ea2170a83c58e048673e69bf55a Author: David Bosschaert AuthorDate: Thu Sep 9 14:07:25 2021 +0100 [maven-release-plugin] prepare for next development iteration --- features/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/features/pom.xml b/features/pom.xml index 1cafdd5..fa406a6 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -20,7 +20,7 @@ org.apache.felix.feature -0.9.4-RC3 +0.9.5-SNAPSHOT jar OSGi Feature Model API @@ -29,7 +29,7 @@ scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.feature-0.9.4-RC3 + HEAD
[felix-dev] annotated tag org.apache.felix.feature-0.9.4-RC3 updated (9c422b8 -> 0548ff5)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to annotated tag org.apache.felix.feature-0.9.4-RC3 in repository https://gitbox.apache.org/repos/asf/felix-dev.git. *** WARNING: tag org.apache.felix.feature-0.9.4-RC3 was modified! *** from 9c422b8 (commit) to 0548ff5 (tag) tagging 9c422b883dac9e24d50f7bf9e9239417d1bd8c15 (commit) replaces org.apache.felix.feature-0.9.2-RC2 by David Bosschaert on Thu Sep 9 14:07:23 2021 +0100 - Log - [maven-release-plugin] copy for tag org.apache.felix.feature-0.9.4-RC3 --- No new revisions were added by this update. Summary of changes:
[felix-dev] branch master updated (c202a5c -> 9c422b8)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git. from c202a5c Merge pull request #100 from bosschaert/features_service_cap add 9c422b8 [maven-release-plugin] prepare release org.apache.felix.feature-0.9.4-RC3 No new revisions were added by this update. Summary of changes: features/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[felix-dev] branch master updated: [Features] Provide osgi.service capability
This is an automated email from the ASF dual-hosted git repository. davidb 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 badf129 [Features] Provide osgi.service capability new c202a5c Merge pull request #100 from bosschaert/features_service_cap badf129 is described below commit badf1294a17c7b8c5471731203c361929ebdc8fd Author: David Bosschaert AuthorDate: Thu Sep 9 12:01:44 2021 +0100 [Features] Provide osgi.service capability --- features/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/features/pom.xml b/features/pom.xml index 3434a14..6529842 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -50,6 +50,7 @@
[felix-dev] branch master updated: Additional parameter checking
This is an automated email from the ASF dual-hosted git repository.
davidb 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 5308c80 Additional parameter checking
new 56aaba6 Merge pull request #98 from bosschaert/tck_fixes_2
5308c80 is described below
commit 5308c807267c74a94fdf4c5904b6dc59da5c2f01
Author: David Bosschaert
AuthorDate: Tue Sep 7 08:37:30 2021 +0100
Additional parameter checking
This fixes a number of TCK failures
---
.../felix/feature/impl/ArtifactBuilderImpl.java| 32 +-
.../felix/feature/impl/BundleBuilderImpl.java | 20 +-
2 files changed, 44 insertions(+), 8 deletions(-)
diff --git
a/features/src/main/java/org/apache/felix/feature/impl/ArtifactBuilderImpl.java
b/features/src/main/java/org/apache/felix/feature/impl/ArtifactBuilderImpl.java
index 683d914..f1c8c3f 100644
---
a/features/src/main/java/org/apache/felix/feature/impl/ArtifactBuilderImpl.java
+++
b/features/src/main/java/org/apache/felix/feature/impl/ArtifactBuilderImpl.java
@@ -39,34 +39,52 @@ class ArtifactBuilderImpl implements FeatureArtifactBuilder
{
if (key == null)
throw new IllegalArgumentException("Metadata key cannot be
null");
- if (value == null)
- throw new IllegalArgumentException("Metadata value cannot be
null");
-
+ if (key.length() == 0)
+ throw new IllegalArgumentException("Key must not be empty");
+
if ("id".equalsIgnoreCase(key))
throw new IllegalArgumentException("Key cannot be 'id'");
+
+ checkMetadataValue(value);
this.metadata.put(key, value);
return this;
}
-@Override
+ @Override
public FeatureArtifactBuilder addMetadata(Map md) {
if (md.keySet().contains(null))
throw new IllegalArgumentException("Metadata key cannot be
null");
- if (md.values().contains(null))
- throw new IllegalArgumentException("Metadata value cannot be
null");
-
+ if (md.keySet().contains(""))
+ throw new IllegalArgumentException("Key must not be empty");
+
if (md.keySet().stream()
.map(String::toLowerCase)
.anyMatch(s -> "id".equals(s))) {
throw new IllegalArgumentException("Key cannot be 'id'");
}
+
+ md.values().stream()
+ .forEach(this::checkMetadataValue);
this.metadata.putAll(md);
return this;
}
+private void checkMetadataValue(Object value) {
+ if (value instanceof String)
+ return;
+
+ if (value instanceof Boolean)
+ return;
+
+ if (value instanceof Number)
+ return;
+
+ throw new IllegalArgumentException("Illegal metadata value: " + value);
+ }
+
@Override
public FeatureArtifact build() {
return new ArtifactImpl(id, metadata);
diff --git
a/features/src/main/java/org/apache/felix/feature/impl/BundleBuilderImpl.java
b/features/src/main/java/org/apache/felix/feature/impl/BundleBuilderImpl.java
index 7232dfe..275ccb7 100644
---
a/features/src/main/java/org/apache/felix/feature/impl/BundleBuilderImpl.java
+++
b/features/src/main/java/org/apache/felix/feature/impl/BundleBuilderImpl.java
@@ -45,7 +45,9 @@ class BundleBuilderImpl implements FeatureBundleBuilder {
if ("id".equalsIgnoreCase(key))
throw new IllegalArgumentException("Key cannot be 'id'");
-this.metadata.put(key, value);
+ checkMetadataValue(value);
+
+ this.metadata.put(key, value);
return this;
}
@@ -63,10 +65,26 @@ class BundleBuilderImpl implements FeatureBundleBuilder {
throw new IllegalArgumentException("Key cannot be 'id'");
}
+ md.values().stream()
+ .forEach(this::checkMetadataValue);
+
this.metadata.putAll(md);
return this;
}
+private void checkMetadataValue(Object value) {
+ if (value instanceof String)
+ return;
+
+ if (value instanceof Boolean)
+ return;
+
+ if (value instanceof Number)
+ return;
+
+ throw new IllegalArgumentException("Illegal metadata value: " + value);
+ }
+
@Override
public FeatureBundle build() {
return new BundleImpl(id, metadata);
[felix-dev] branch master updated (56aaba6 -> 963a227)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git. from 56aaba6 Merge pull request #98 from bosschaert/tck_fixes_2 add 963a227 [maven-release-plugin] prepare release org.apache.felix.feature-0.9.2-RC2 No new revisions were added by this update. Summary of changes: features/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[felix-dev] annotated tag org.apache.felix.feature-0.9.2-RC2 updated (963a227 -> d8cc918)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to annotated tag org.apache.felix.feature-0.9.2-RC2 in repository https://gitbox.apache.org/repos/asf/felix-dev.git. *** WARNING: tag org.apache.felix.feature-0.9.2-RC2 was modified! *** from 963a227 (commit) to d8cc918 (tag) tagging 963a2276b9ba56b9163bc704ac2f19d667e18288 (commit) replaces org.apache.felix.feature-0.9.0-RC1 by David Bosschaert on Tue Sep 7 10:35:02 2021 +0100 - Log - [maven-release-plugin] copy for tag org.apache.felix.feature-0.9.2-RC2 --- No new revisions were added by this update. Summary of changes:
[felix-dev] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. davidb 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 fad750e [maven-release-plugin] prepare for next development iteration fad750e is described below commit fad750ed4194d1dfa7c3334de73638aaff20c379 Author: David Bosschaert AuthorDate: Tue Sep 7 10:35:04 2021 +0100 [maven-release-plugin] prepare for next development iteration --- features/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/features/pom.xml b/features/pom.xml index d20c38b..3434a14 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -20,7 +20,7 @@ org.apache.felix.feature -0.9.2-RC2 +0.9.3-SNAPSHOT jar OSGi Feature Model API @@ -29,7 +29,7 @@ scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.feature-0.9.2-RC2 + HEAD
[felix-dev] 02/04: Convert tabs to spaces
This is an automated email from the ASF dual-hosted git repository.
davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 9c297110c47881319b9ec77844768339160e6e3e
Author: David Bosschaert
AuthorDate: Fri Sep 3 11:11:23 2021 +0100
Convert tabs to spaces
---
features/pom.xml | 222 +++
1 file changed, 111 insertions(+), 111 deletions(-)
diff --git a/features/pom.xml b/features/pom.xml
index 769028b..b46aa84 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -1,46 +1,46 @@
+license agreements. See the NOTICE file distributed with this work for
additional
+information regarding copyright ownership. The ASF licenses this file to
+you under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of
+the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+by applicable law or agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS
+OF ANY KIND, either express or implied. See the License for the specific
+language governing permissions and limitations under the License. -->
http://maven.apache.org/POM/4.0.0;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
- 4.0.0
-
- org.apache.felix
- felix-parent
- 7
-
-
+4.0.0
+
+org.apache.felix
+felix-parent
+7
+
+
- org.apache.felix.feature
- 0.0.1-SNAPSHOT
- jar
+org.apache.felix.feature
+0.0.1-SNAPSHOT
+jar
- OSGi Feature Model API
+OSGi Feature Model API
8
-
-
- sonatype.snapshots
- OSGi Snapshot
- https://oss.sonatype.org/content/repositories/snapshots
-
+
+
+sonatype.snapshots
+OSGi Snapshot
+https://oss.sonatype.org/content/repositories/snapshots
+
-
-
+
+
biz.aQute.bnd
bnd-maven-plugin
@@ -51,71 +51,71 @@
bnd-process
-
+
-
- org.apache.maven.plugins
- maven-jar-plugin
-
-
-
${project.build.outputDirectory}/META-INF/MANIFEST.MF
-
-
-
-
- org.apache.rat
- apache-rat-plugin
-
-
- *.md
-
src/main/resources/META-INF/services/*
-
-
-
-
-
-
-
- org.osgi
- osgi.annotation
- 8.0.0
- provided
-
-
- org.osgi
- osgi.core
- 8.0.0
- provided
-
-
- org.osgi
- org.osgi.service.feature
- 1.0.0-SNAPSHOT
- provided
-
-
- org.osgi
- org.osgi.util.function
- 1.0.0
- provided
-
-
- org.apache.geronimo.specs
- geronimo-json_1.1_spec
- 1.3
- provided
-
-
- org.apache.felix
- org.apache.felix.converter
- 1.0.18
- provided
-
+
+org.apache.maven.plugins
+maven-jar-plugin
+
+
+
${pr
[felix-dev] 03/04: [Features] Add SCM info
This is an automated email from the ASF dual-hosted git repository. davidb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git commit 41f6f348128adcc9bf0d36ff8e484d0a816fec8d Author: David Bosschaert AuthorDate: Fri Sep 3 11:15:15 2021 +0100 [Features] Add SCM info --- features/pom.xml | 6 ++ 1 file changed, 6 insertions(+) diff --git a/features/pom.xml b/features/pom.xml index b46aa84..a1162e9 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -27,6 +27,12 @@ OSGi Feature Model API + + scm:git:https://github.com/apache/felix-dev.git + scm:git:https://github.com/apache/felix-dev.git + https://gitbox.apache.org/repos/asf?p=felix-dev.git + + 8
[felix-dev] branch master updated (7481a12 -> adc9559)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git. from 7481a12 [maven-release-plugin] prepare for next development iteration new 1fc28f2 Update johnzon dependency new 9c29711 Convert tabs to spaces new 41f6f34 [Features] Add SCM info new adc9559 [Features] Update OSGi API dependency to RC1 The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: features/pom.xml | 224 +++ 1 file changed, 111 insertions(+), 113 deletions(-)
[felix-dev] 01/04: Update johnzon dependency
This is an automated email from the ASF dual-hosted git repository. davidb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git commit 1fc28f2ad85204b60ce0bbee3fced97b33c0 Author: David Bosschaert AuthorDate: Fri Sep 3 11:10:33 2021 +0100 Update johnzon dependency --- features/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/pom.xml b/features/pom.xml index f86e491..769028b 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -139,7 +139,7 @@ org.apache.johnzon johnzon-core - 1.2.2 + 1.2.14 test
[felix-dev] 04/04: [Features] Update OSGi API dependency to RC1
This is an automated email from the ASF dual-hosted git repository. davidb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git commit adc95597f7b75683db17782f2bfb5134135e3d1c Author: David Bosschaert AuthorDate: Fri Sep 3 11:19:07 2021 +0100 [Features] Update OSGi API dependency to RC1 --- features/pom.xml | 10 +- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/features/pom.xml b/features/pom.xml index a1162e9..7539e6a 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -37,14 +37,6 @@ 8 - - -sonatype.snapshots -OSGi Snapshot -https://oss.sonatype.org/content/repositories/snapshots - - - @@ -101,7 +93,7 @@ org.osgi org.osgi.service.feature -1.0.0-SNAPSHOT +1.0.0-RC1 provided
[felix-dev] branch master updated: FELIX-6441 Make it possible to run the Configuration Interpolation independently of Configuration Admin
This is an automated email from the ASF dual-hosted git repository.
davidb 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 bbadfa2 FELIX-6441 Make it possible to run the Configuration
Interpolation independently of Configuration Admin
new 67ab32b Merge pull request #83 from bosschaert/FELIX-6441-sq
bbadfa2 is described below
commit bbadfa28bd856c6bfe3e8183514b4fed2bd78284
Author: David Bosschaert
AuthorDate: Fri Jul 30 15:24:41 2021 +0100
FELIX-6441 Make it possible to run the Configuration Interpolation
independently of Configuration Admin
The new StandaloneInterpolator class provides the entry-point for using
the interpolator outside of a Configuration Admin environment.
---
configadmin-plugins/interpolation/pom.xml | 2 +-
.../plugin/interpolation/Activator.java| 2 +-
.../InterpolationConfigurationPlugin.java | 11 +-
.../interpolation/StandaloneInterpolator.java | 80 +
.../InterpolationConfigurationPluginTest.java | 12 +-
.../interpolation/StandaloneInterpolatorTest.java | 124 +
.../interpolation/src/test/resources/res1/my.db| 1 +
7 files changed, 218 insertions(+), 14 deletions(-)
diff --git a/configadmin-plugins/interpolation/pom.xml
b/configadmin-plugins/interpolation/pom.xml
index 10563be..203a7ba 100644
--- a/configadmin-plugins/interpolation/pom.xml
+++ b/configadmin-plugins/interpolation/pom.xml
@@ -28,7 +28,7 @@
org.apache.felix.configadmin.plugin.interpolation
jar
-1.1.5-SNAPSHOT
+1.2.0-SNAPSHOT
Apache Felix Configuration Admin Values Interpolation Plugin
diff --git
a/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/Activator.java
b/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/Activator.java
index c538c7d..c3fcbe9 100644
---
a/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/Activator.java
+++
b/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/Activator.java
@@ -51,7 +51,7 @@ public class Activator implements BundleActivator {
}
String encoding = context.getProperty(ENCODING_PROPERTY);
-ConfigurationPlugin plugin = new
InterpolationConfigurationPlugin(context, directory, encoding);
+ConfigurationPlugin plugin = new
InterpolationConfigurationPlugin(context::getProperty, directory, encoding);
Dictionary props = new Hashtable<>();
props.put(ConfigurationPlugin.CM_RANKING, PLUGIN_RANKING);
props.put("config.plugin.id", PLUGIN_ID);
diff --git
a/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/InterpolationConfigurationPlugin.java
b/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/InterpolationConfigurationPlugin.java
index 4974848..2dae521 100644
---
a/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/InterpolationConfigurationPlugin.java
+++
b/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/InterpolationConfigurationPlugin.java
@@ -30,10 +30,9 @@ import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
+import java.util.function.Function;
import java.util.stream.Stream;
-import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.ConfigurationPlugin;
@@ -95,13 +94,13 @@ class InterpolationConfigurationPlugin implements
ConfigurationPlugin {
TYPE_MAP.put("char[]", char[].class);
}
-private final BundleContext context;
+private final Function propertiesProvider;
private final List directory;
private final Charset encodingCharset;
-InterpolationConfigurationPlugin(BundleContext bc, String dir, String
fileEncoding) {
-context = bc;
+InterpolationConfigurationPlugin(Function pp, String dir,
String fileEncoding) {
+propertiesProvider = pp;
if (dir != null) {
directory =
Stream.of(dir.split("\\s*,\\s*")).map(File::new).collect(toList());
getLog().info("Configured directory for secrets: {}", dir);
@@ -189,7 +188,7 @@ class InterpolationConfigurationPlugin implements
ConfigurationPlugin {
}
String getVariableFromProperty(final String name) {
-return context.getProperty(name);
+return propertiesProvider.apply(name);
}
String getVariableFromFile(final String key, final String name, final
Object pid) {
d
[felix-dev] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. davidb 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 1f68433 [maven-release-plugin] prepare for next development iteration 1f68433 is described below commit 1f684332b47094bb3101ceebef24fbb732db9ff2 Author: David Bosschaert AuthorDate: Tue Aug 3 12:23:51 2021 +0100 [maven-release-plugin] prepare for next development iteration --- configadmin-plugins/interpolation/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configadmin-plugins/interpolation/pom.xml b/configadmin-plugins/interpolation/pom.xml index 9aaa374..47682ab 100644 --- a/configadmin-plugins/interpolation/pom.xml +++ b/configadmin-plugins/interpolation/pom.xml @@ -28,7 +28,7 @@ org.apache.felix.configadmin.plugin.interpolation jar -1.2.0 +1.2.1-SNAPSHOT Apache Felix Configuration Admin Values Interpolation Plugin @@ -44,7 +44,7 @@ scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.configadmin.plugin.interpolation-1.2.0 + HEAD
[felix-dev] branch master updated (0b9b7d2 -> 1b645db)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git. from 0b9b7d2 Merge pull request #85 from bosschaert/FELIX-6441-2 add 1b645db [maven-release-plugin] prepare release org.apache.felix.configadmin.plugin.interpolation-1.2.0 No new revisions were added by this update. Summary of changes: configadmin-plugins/interpolation/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[felix-dev] annotated tag org.apache.felix.configadmin.plugin.interpolation-1.2.0 updated (1b645db -> ea2e9e9)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to annotated tag org.apache.felix.configadmin.plugin.interpolation-1.2.0 in repository https://gitbox.apache.org/repos/asf/felix-dev.git. *** WARNING: tag org.apache.felix.configadmin.plugin.interpolation-1.2.0 was modified! *** from 1b645db (commit) to ea2e9e9 (tag) tagging 1b645db5e00280a4a1f91083cc724917d4745bcf (commit) replaces org.apache.felix.scr-2.1.28 by David Bosschaert on Tue Aug 3 12:23:48 2021 +0100 - Log - [maven-release-plugin] copy for tag org.apache.felix.configadmin.plugin.interpolation-1.2.0 --- No new revisions were added by this update. Summary of changes:
[felix-dev] branch master updated: FELIX-6441 Make it possible to run the Configuration Interpolation independently of Configuration Admin
This is an automated email from the ASF dual-hosted git repository.
davidb 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 53ef77e FELIX-6441 Make it possible to run the Configuration
Interpolation independently of Configuration Admin
new 0b9b7d2 Merge pull request #85 from bosschaert/FELIX-6441-2
53ef77e is described below
commit 53ef77e2b8e2f5656d66283b766b6016d6b4e406
Author: David Bosschaert
AuthorDate: Tue Aug 3 10:28:13 2021 +0100
FELIX-6441 Make it possible to run the Configuration Interpolation
independently of Configuration Admin
Prevent NPE when null passed in for secrets locations
---
.../felix/configadmin/plugin/interpolation/StandaloneInterpolator.java | 3 +++
.../configadmin/plugin/interpolation/StandaloneInterpolatorTest.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git
a/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/StandaloneInterpolator.java
b/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/StandaloneInterpolator.java
index 7facda1..880026f 100644
---
a/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/StandaloneInterpolator.java
+++
b/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/StandaloneInterpolator.java
@@ -50,6 +50,9 @@ public class StandaloneInterpolator {
* @param secretsLocations The directories where secrets files can be
found.
*/
public StandaloneInterpolator(Map frameworkProperties,
String encoding, File ... secretsLocations) {
+if (secretsLocations == null)
+secretsLocations = new File[] {};
+
String locations = Arrays.asList(secretsLocations).stream()
.map(File::toString)
.collect(Collectors.joining(","));
diff --git
a/configadmin-plugins/interpolation/src/test/java/org/apache/felix/configadmin/plugin/interpolation/StandaloneInterpolatorTest.java
b/configadmin-plugins/interpolation/src/test/java/org/apache/felix/configadmin/plugin/interpolation/StandaloneInterpolatorTest.java
index be250b3..6566de1 100644
---
a/configadmin-plugins/interpolation/src/test/java/org/apache/felix/configadmin/plugin/interpolation/StandaloneInterpolatorTest.java
+++
b/configadmin-plugins/interpolation/src/test/java/org/apache/felix/configadmin/plugin/interpolation/StandaloneInterpolatorTest.java
@@ -62,7 +62,7 @@ public class StandaloneInterpolatorTest {
userVar = "USER";
}
-StandaloneInterpolator interpolator = new
StandaloneInterpolator(Collections.emptyMap());
+StandaloneInterpolator interpolator = new
StandaloneInterpolator(Collections.emptyMap(), null);
Dictionary dict = new Hashtable<>();
dict.put("someuser", "$[env:" + userVar + "]");
svn commit: r50840 - /release/felix/
Author: davidb Date: Mon Nov 8 13:41:26 2021 New Revision: 50840 Log: org.apache.felix.healthcheck.generalchecks-2.0.14 Added: release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14-javadoc.jar (with props) release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14-javadoc.jar.asc release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14-javadoc.jar.md5 release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14-javadoc.jar.sha1 release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14-source-release.tar.gz (with props) release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14-source-release.tar.gz.asc release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14-source-release.tar.gz.md5 release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14-source-release.tar.gz.sha1 release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14-source-release.zip (with props) release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14-source-release.zip.asc release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14-source-release.zip.md5 release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14-source-release.zip.sha1 release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14-sources.jar (with props) release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14-sources.jar.asc release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14-sources.jar.md5 release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14-sources.jar.sha1 release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14.jar (with props) release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14.jar.asc release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14.jar.md5 release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14.jar.sha1 release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14.pom release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14.pom.asc release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14.pom.md5 release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14.pom.sha1 Removed: release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12-javadoc.jar release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12-javadoc.jar.asc release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12-javadoc.jar.sha1 release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12-javadoc.jar.sha512 release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12-source-release.tar.gz release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12-source-release.tar.gz.asc release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12-source-release.tar.gz.sha1 release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12-source-release.tar.gz.sha512 release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12-source-release.zip release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12-source-release.zip.asc release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12-source-release.zip.sha1 release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12-source-release.zip.sha512 release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12-sources.jar release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12-sources.jar.asc release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12-sources.jar.sha1 release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12-sources.jar.sha512 release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12.jar release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12.jar.asc release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12.jar.sha1 release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12.jar.sha512 release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12.pom release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12.pom.asc release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12.pom.sha1 release/felix/org.apache.felix.healthcheck.generalchecks-2.0.12.pom.sha512 Added: release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14-javadoc.jar == Binary file - no diff available. Propchange: release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14-javadoc.jar -- svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14-javadoc.jar.asc == --- release/felix/org.apache.felix.healthcheck.generalchecks-2.0.14-javadoc.jar.asc (added) +++ release/felix
[felix-dev] annotated tag org.apache.felix.feature-1.0.0 updated (2cdb76e57e -> 5ff3d9b588)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to annotated tag org.apache.felix.feature-1.0.0 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.feature-1.0.0 was modified! *** from 2cdb76e57e (commit) to 5ff3d9b588 (tag) tagging 2cdb76e57e547004bf4fd29b2559ab4d4b1abe88 (commit) replaces org.apache.felix.main.distribution-7.0.4 by David Bosschaert on Mon May 23 16:01:06 2022 +0100 - Log - [maven-release-plugin] copy for tag org.apache.felix.feature-1.0.0 --- No new revisions were added by this update. Summary of changes:
[felix-dev] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. davidb 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 92ec5dde93 [maven-release-plugin] prepare for next development iteration 92ec5dde93 is described below commit 92ec5dde93b1647e7e9a5776ccb7e4a02fb66096 Author: David Bosschaert AuthorDate: Mon May 23 16:01:08 2022 +0100 [maven-release-plugin] prepare for next development iteration --- features/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/features/pom.xml b/features/pom.xml index e63bb3ab7d..fb785a5d1d 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -20,7 +20,7 @@ org.apache.felix.feature -1.0.0 +1.0.1-SNAPSHOT jar OSGi Feature Model API @@ -29,12 +29,12 @@ scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.feature-1.0.0 + HEAD 8 - 1653318039 + 1653318068
[felix-dev] branch master updated (d758b971ae -> 2cdb76e57e)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from d758b971ae [maven-release-plugin] prepare for next development iteration add 2cdb76e57e [maven-release-plugin] prepare release org.apache.felix.feature-1.0.0 No new revisions were added by this update. Summary of changes: features/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
[felix-dev] branch master updated: Change converter dependency to latest from OSGi
This is an automated email from the ASF dual-hosted git repository. davidb 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 f3c6e6bff9 Change converter dependency to latest from OSGi f3c6e6bff9 is described below commit f3c6e6bff9c6dc937c9042c13721763c1d90503e Author: David Bosschaert AuthorDate: Mon Aug 29 10:56:17 2022 +0100 Change converter dependency to latest from OSGi --- configadmin-plugins/interpolation/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configadmin-plugins/interpolation/pom.xml b/configadmin-plugins/interpolation/pom.xml index c3019a3b3c..379a6b9a04 100644 --- a/configadmin-plugins/interpolation/pom.xml +++ b/configadmin-plugins/interpolation/pom.xml @@ -119,9 +119,9 @@ provided -org.apache.felix -org.apache.felix.converter -1.0.14 +org.osgi +org.osgi.util.converter +1.0.9 provided
[felix-dev] branch master updated (7a02678174 -> aec1d91779)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from 7a02678174 [maven-release-plugin] prepare release org.apache.felix.configadmin.plugin.interpolation-1.2.6 add aec1d91779 [maven-release-plugin] prepare for next development iteration No new revisions were added by this update. Summary of changes: configadmin-plugins/interpolation/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[felix-dev] branch master updated (f3c6e6bff9 -> 7a02678174)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from f3c6e6bff9 Change converter dependency to latest from OSGi add 7a02678174 [maven-release-plugin] prepare release org.apache.felix.configadmin.plugin.interpolation-1.2.6 No new revisions were added by this update. Summary of changes: configadmin-plugins/interpolation/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[felix-dev] annotated tag org.apache.felix.configadmin.plugin.interpolation-1.2.6 updated (7a02678174 -> 0e37bd2326)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to annotated tag org.apache.felix.configadmin.plugin.interpolation-1.2.6 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.configadmin.plugin.interpolation-1.2.6 was modified! *** from 7a02678174 (commit) to 0e37bd2326 (tag) tagging 7a0267817472252f835f5e45d43af983d7512610 (commit) replaces maven-bundle-plugin-5.1.8 by David Bosschaert on Mon Aug 29 11:05:29 2022 +0100 - Log - [maven-release-plugin] copy for tag org.apache.felix.configadmin.plugin.interpolation-1.2.6 --- No new revisions were added by this update. Summary of changes:
svn commit: r56598 - /release/felix/
Author: davidb Date: Thu Sep 1 10:47:13 2022 New Revision: 56598 Log: org.apache.felix.configadmin.plugin.interpolation-1.2.6 Added: release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6-javadoc.jar (with props) release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6-javadoc.jar.asc release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6-javadoc.jar.md5 release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6-javadoc.jar.sha1 release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6-source-release.tar.gz (with props) release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6-source-release.tar.gz.asc release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6-source-release.tar.gz.md5 release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6-source-release.tar.gz.sha1 release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6-source-release.zip (with props) release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6-source-release.zip.asc release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6-source-release.zip.md5 release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6-source-release.zip.sha1 release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6-sources.jar (with props) release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6-sources.jar.asc release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6-sources.jar.md5 release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6-sources.jar.sha1 release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6.jar (with props) release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6.jar.asc release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6.jar.md5 release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6.jar.sha1 release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6.pom release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6.pom.asc release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6.pom.md5 release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6.pom.sha1 Removed: release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.4-javadoc.jar release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.4-javadoc.jar.asc release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.4-source-release.tar.gz release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.4-source-release.tar.gz.asc release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.4-source-release.tar.gz.asc.sha512 release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.4-source-release.tar.gz.sha512 release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.4-source-release.zip release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.4-source-release.zip.asc release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.4-source-release.zip.sha512 release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.4-sources.jar release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.4-sources.jar.asc release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.4.jar release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.4.jar.asc release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.4.pom release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.4.pom.asc Added: release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6-javadoc.jar == Binary file - no diff available. Propchange: release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6-javadoc.jar -- svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6-javadoc.jar.asc == --- release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6-javadoc.jar.asc (added) +++ release/felix/org.apache.felix.configadmin.plugin.interpolation-1.2.6-javadoc.jar.asc Thu Sep 1 10:47:13 2022 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE6xvDHSN2Fhyp8Ax73f1PYfJPDZ8FAmMMj+MACgkQ3f1PYfJP +DZ/L8g//QScjiufTg3YC0t3GW1trtN057mbqzosEKl/bRqZ9jDQmdEWiQDZG0mbI +yunUdPp+mrFUhgTpmpSW01lRBabzTYU6/5dPWnCp+7ppILdUHDKzTyVApSakGqBX +XkBqV5ii/Dtw4dQ7zHTIXoWc/vJ3OSchFcTL9l3Bz0WnPFCvzXbnBBSgsw1adSu/ +9gUb5rRlz+u/vtec8WshZ4alNMY2qMA6XTZOyiT7CrQyPcsb7V2+1lKx1PB9dZlz +/yqTTLRzGRzaonSe5lvUUt
[felix-dev] branch master updated: Configurator: move converter and johnzon deps to latest version
This is an automated email from the ASF dual-hosted git repository. davidb 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 f0fe4a234c Configurator: move converter and johnzon deps to latest version f0fe4a234c is described below commit f0fe4a234cbc44eb6cac45785533205b433a9780 Author: David Bosschaert AuthorDate: Tue Sep 20 09:37:54 2022 +0100 Configurator: move converter and johnzon deps to latest version --- configurator/pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configurator/pom.xml b/configurator/pom.xml index b65744397e..febfd86f58 100644 --- a/configurator/pom.xml +++ b/configurator/pom.xml @@ -103,9 +103,9 @@ provided -org.apache.felix -org.apache.felix.converter -1.0.0 +org.osgi +org.osgi.util.converter +1.0.9 provided @@ -159,7 +159,7 @@ org.apache.johnzon johnzon-core -1.2.3 +1.2.19 test
[felix-dev] branch master updated (f0fe4a234c -> 448c41e313)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from f0fe4a234c Configurator: move converter and johnzon deps to latest version add 448c41e313 [maven-release-plugin] prepare release org.apache.felix.configurator-1.0.16 No new revisions were added by this update. Summary of changes: configurator/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[felix-dev] annotated tag org.apache.felix.configurator-1.0.16 updated (448c41e313 -> 68f132312c)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to annotated tag org.apache.felix.configurator-1.0.16 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.configurator-1.0.16 was modified! *** from 448c41e313 (commit) to 68f132312c (tag) tagging 448c41e313b577998c59c32f53264aff2e7c243e (commit) replaces org.apache.felix.webconsole-4.8.4 by David Bosschaert on Tue Sep 20 09:40:50 2022 +0100 - Log - [maven-release-plugin] copy for tag org.apache.felix.configurator-1.0.16 --- No new revisions were added by this update. Summary of changes:
[felix-dev] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. davidb 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 623986ce7d [maven-release-plugin] prepare for next development iteration 623986ce7d is described below commit 623986ce7d81525e254f6a0f30fc73f48da2a637 Author: David Bosschaert AuthorDate: Tue Sep 20 09:40:53 2022 +0100 [maven-release-plugin] prepare for next development iteration --- configurator/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configurator/pom.xml b/configurator/pom.xml index cdad7c7654..db54c5d6df 100644 --- a/configurator/pom.xml +++ b/configurator/pom.xml @@ -33,13 +33,13 @@ Implementation of the OSGi Configurator Service Specification 1.0 -1.0.16 +1.0.17-SNAPSHOT scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.configurator-1.0.16 + HEAD
svn commit: r56963 - /release/felix/
Author: davidb Date: Fri Sep 23 13:53:56 2022 New Revision: 56963 Log: org.apache.felix.configurator-1.0.16 Added: release/felix/org.apache.felix.configurator-1.0.16-javadoc.jar (with props) release/felix/org.apache.felix.configurator-1.0.16-javadoc.jar.asc release/felix/org.apache.felix.configurator-1.0.16-javadoc.jar.md5 release/felix/org.apache.felix.configurator-1.0.16-javadoc.jar.sha1 release/felix/org.apache.felix.configurator-1.0.16-source-release.tar.gz (with props) release/felix/org.apache.felix.configurator-1.0.16-source-release.tar.gz.asc release/felix/org.apache.felix.configurator-1.0.16-source-release.tar.gz.md5 release/felix/org.apache.felix.configurator-1.0.16-source-release.tar.gz.sha1 release/felix/org.apache.felix.configurator-1.0.16-source-release.zip (with props) release/felix/org.apache.felix.configurator-1.0.16-source-release.zip.asc release/felix/org.apache.felix.configurator-1.0.16-source-release.zip.md5 release/felix/org.apache.felix.configurator-1.0.16-source-release.zip.sha1 release/felix/org.apache.felix.configurator-1.0.16-sources.jar (with props) release/felix/org.apache.felix.configurator-1.0.16-sources.jar.asc release/felix/org.apache.felix.configurator-1.0.16-sources.jar.md5 release/felix/org.apache.felix.configurator-1.0.16-sources.jar.sha1 release/felix/org.apache.felix.configurator-1.0.16.jar (with props) release/felix/org.apache.felix.configurator-1.0.16.jar.asc release/felix/org.apache.felix.configurator-1.0.16.jar.md5 release/felix/org.apache.felix.configurator-1.0.16.jar.sha1 release/felix/org.apache.felix.configurator-1.0.16.pom release/felix/org.apache.felix.configurator-1.0.16.pom.asc release/felix/org.apache.felix.configurator-1.0.16.pom.md5 release/felix/org.apache.felix.configurator-1.0.16.pom.sha1 Removed: release/felix/org.apache.felix.configurator-1.0.14-javadoc.jar release/felix/org.apache.felix.configurator-1.0.14-javadoc.jar.asc release/felix/org.apache.felix.configurator-1.0.14-javadoc.jar.sha1 release/felix/org.apache.felix.configurator-1.0.14-javadoc.jar.sha512 release/felix/org.apache.felix.configurator-1.0.14-source-release.tar.gz release/felix/org.apache.felix.configurator-1.0.14-source-release.tar.gz.asc release/felix/org.apache.felix.configurator-1.0.14-source-release.tar.gz.sha1 release/felix/org.apache.felix.configurator-1.0.14-source-release.tar.gz.sha512 release/felix/org.apache.felix.configurator-1.0.14-source-release.zip release/felix/org.apache.felix.configurator-1.0.14-source-release.zip.asc release/felix/org.apache.felix.configurator-1.0.14-source-release.zip.sha1 release/felix/org.apache.felix.configurator-1.0.14-source-release.zip.sha512 release/felix/org.apache.felix.configurator-1.0.14-sources.jar release/felix/org.apache.felix.configurator-1.0.14-sources.jar.asc release/felix/org.apache.felix.configurator-1.0.14-sources.jar.sha1 release/felix/org.apache.felix.configurator-1.0.14-sources.jar.sha512 release/felix/org.apache.felix.configurator-1.0.14.jar release/felix/org.apache.felix.configurator-1.0.14.jar.asc release/felix/org.apache.felix.configurator-1.0.14.jar.sha1 release/felix/org.apache.felix.configurator-1.0.14.jar.sha512 release/felix/org.apache.felix.configurator-1.0.14.pom release/felix/org.apache.felix.configurator-1.0.14.pom.asc release/felix/org.apache.felix.configurator-1.0.14.pom.sha1 release/felix/org.apache.felix.configurator-1.0.14.pom.sha512 Added: release/felix/org.apache.felix.configurator-1.0.16-javadoc.jar == Binary file - no diff available. Propchange: release/felix/org.apache.felix.configurator-1.0.16-javadoc.jar -- svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.configurator-1.0.16-javadoc.jar.asc == --- release/felix/org.apache.felix.configurator-1.0.16-javadoc.jar.asc (added) +++ release/felix/org.apache.felix.configurator-1.0.16-javadoc.jar.asc Fri Sep 23 13:53:56 2022 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE6xvDHSN2Fhyp8Ax73f1PYfJPDZ8FAmMpfNsACgkQ3f1PYfJP +DZ8BghAAp4w1I+Z44UM5GKyjuLujITEt1IQvq/N5EEg+DLFk8UjMkqsN3jiuteBM +zSrDlkuZns94eLAh1hzkKB6Sdx+c05M9oIQwU8wvKKB06z48ny//lbea52XKc4nd +z2VtoPGZvwbLL2c4vBUQHQGO+1ZdEStceMoUlC3gLdVwJm/OKClhkz66fvNS3Yt4 +okFejhfnRiPjQEhwK/Px6ExatqZMje7Kafjc13sfVQHSHRSjCW1oaORsAJO0E4NK +/C/6KVSxJ0RKl6DDGNbJziCeNjwQCtlKEWiSoCxKJhqLQl05d/RCBxunmqqpf0B/ +u6g428RMAP/lhGHl5pv4VvOKX6uyd4iDfXQiCKorPRGj19SYfRslkl7jeVWj9V8a +U6YIzpwXizGLutTnKOmofb1li9hGLZlxTOKwHyMd8gnFVYczC2qXjgD+6ptex2fU +9gCnFnZleBsVjNL4kvrsrFe9htGfdqL6CS/Iv32wZELZQl42sNnO0vh3FCxeiggx
svn commit: r65251 - /release/felix/
Author: davidb Date: Mon Nov 13 10:27:03 2023 New Revision: 65251 Log: org.apache.felix.cm.json-2.0.2 Added: release/felix/org.apache.felix.cm.json-2.0.2-javadoc.jar (with props) release/felix/org.apache.felix.cm.json-2.0.2-javadoc.jar.asc release/felix/org.apache.felix.cm.json-2.0.2-javadoc.jar.md5 release/felix/org.apache.felix.cm.json-2.0.2-javadoc.jar.sha1 release/felix/org.apache.felix.cm.json-2.0.2-source-release.tar.gz (with props) release/felix/org.apache.felix.cm.json-2.0.2-source-release.tar.gz.asc release/felix/org.apache.felix.cm.json-2.0.2-source-release.tar.gz.md5 release/felix/org.apache.felix.cm.json-2.0.2-source-release.tar.gz.sha1 release/felix/org.apache.felix.cm.json-2.0.2-source-release.zip (with props) release/felix/org.apache.felix.cm.json-2.0.2-source-release.zip.asc release/felix/org.apache.felix.cm.json-2.0.2-source-release.zip.md5 release/felix/org.apache.felix.cm.json-2.0.2-source-release.zip.sha1 release/felix/org.apache.felix.cm.json-2.0.2-sources.jar (with props) release/felix/org.apache.felix.cm.json-2.0.2-sources.jar.asc release/felix/org.apache.felix.cm.json-2.0.2-sources.jar.md5 release/felix/org.apache.felix.cm.json-2.0.2-sources.jar.sha1 release/felix/org.apache.felix.cm.json-2.0.2.jar (with props) release/felix/org.apache.felix.cm.json-2.0.2.jar.asc release/felix/org.apache.felix.cm.json-2.0.2.jar.md5 release/felix/org.apache.felix.cm.json-2.0.2.jar.sha1 release/felix/org.apache.felix.cm.json-2.0.2.pom release/felix/org.apache.felix.cm.json-2.0.2.pom.asc release/felix/org.apache.felix.cm.json-2.0.2.pom.md5 release/felix/org.apache.felix.cm.json-2.0.2.pom.sha1 Removed: release/felix/org.apache.felix.cm.json-2.0.0-javadoc.jar release/felix/org.apache.felix.cm.json-2.0.0-javadoc.jar.asc release/felix/org.apache.felix.cm.json-2.0.0-javadoc.jar.sha1 release/felix/org.apache.felix.cm.json-2.0.0-javadoc.jar.sha512 release/felix/org.apache.felix.cm.json-2.0.0-source-release.tar.gz release/felix/org.apache.felix.cm.json-2.0.0-source-release.tar.gz.asc release/felix/org.apache.felix.cm.json-2.0.0-source-release.tar.gz.sha1 release/felix/org.apache.felix.cm.json-2.0.0-source-release.tar.gz.sha512 release/felix/org.apache.felix.cm.json-2.0.0-source-release.zip release/felix/org.apache.felix.cm.json-2.0.0-source-release.zip.asc release/felix/org.apache.felix.cm.json-2.0.0-source-release.zip.sha1 release/felix/org.apache.felix.cm.json-2.0.0-source-release.zip.sha512 release/felix/org.apache.felix.cm.json-2.0.0-sources.jar release/felix/org.apache.felix.cm.json-2.0.0-sources.jar.asc release/felix/org.apache.felix.cm.json-2.0.0-sources.jar.sha1 release/felix/org.apache.felix.cm.json-2.0.0-sources.jar.sha512 release/felix/org.apache.felix.cm.json-2.0.0.jar release/felix/org.apache.felix.cm.json-2.0.0.jar.asc release/felix/org.apache.felix.cm.json-2.0.0.jar.sha1 release/felix/org.apache.felix.cm.json-2.0.0.jar.sha512 release/felix/org.apache.felix.cm.json-2.0.0.pom release/felix/org.apache.felix.cm.json-2.0.0.pom.asc release/felix/org.apache.felix.cm.json-2.0.0.pom.sha1 release/felix/org.apache.felix.cm.json-2.0.0.pom.sha512 Added: release/felix/org.apache.felix.cm.json-2.0.2-javadoc.jar == Binary file - no diff available. Propchange: release/felix/org.apache.felix.cm.json-2.0.2-javadoc.jar -- svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.cm.json-2.0.2-javadoc.jar.asc == --- release/felix/org.apache.felix.cm.json-2.0.2-javadoc.jar.asc (added) +++ release/felix/org.apache.felix.cm.json-2.0.2-javadoc.jar.asc Mon Nov 13 10:27:03 2023 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEECmZcRnC0eL8SI1zNM5UIZU9j7FQFAmVMsdUACgkQM5UIZU9j +7FTwVAf/aqgVvLghYAo/PDBzaGfMaaJlqO75DyvarLvboGiC1n4XPaI+3WkjTWNs +daniRn1dBDKf41gQ2yQlBVNjRcgQX5pdjSWxsSzKp7ONRY4iLbT0FXQNm1MpfSNy +ZAKo6MfJD5HJe8qjQmoA3lJvcLBJ4SeGXXcXRZ0vws0tjVQWFcCScOG7L0O/Eg2c +C4kdtgtHIpltnZGcwPvGkRGMFBVuElOGO8j8ANGjerElzZEovVhvgNWe5tZyC7Co +WVCHeGKeV77U1W7LDhXMU/6Tj/v7+FoPLSQ151CgPrWY1sq/thYeJYSCCS45dVDn +k3+1OqjsUNbg3GyvAFs3jqkgn9vCwQ== +=eYQJ +-END PGP SIGNATURE- Added: release/felix/org.apache.felix.cm.json-2.0.2-javadoc.jar.md5 == --- release/felix/org.apache.felix.cm.json-2.0.2-javadoc.jar.md5 (added) +++ release/felix/org.apache.felix.cm.json-2.0.2-javadoc.jar.md5 Mon Nov 13 10:27:03 2023 @@ -0,0 +1 @@ +78aa62ab9ca45e1fba39ecfb04c31d85 \ No newline at end of file Added: release/felix/org.apache.felix.cm.json-2.0.2-javadoc.jar.sha1
(felix-dev) 01/01: Merge pull request #317 from kwin/feature/FELIX-6704-improve-error-logging-in-configMgr
This is an automated email from the ASF dual-hosted git repository. davidb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git commit 6bb228df51719d495ba26b508fa946f7dab142f7 Merge: f0308f5688 499d3736ef Author: David Bosschaert AuthorDate: Thu May 16 09:53:18 2024 +0100 Merge pull request #317 from kwin/feature/FELIX-6704-improve-error-logging-in-configMgr FELIX-6704: Include config/factory PID in error message .../main/java/org/apache/felix/cm/impl/ConfigurationManager.java| 6 -- 1 file changed, 4 insertions(+), 2 deletions(-)
(felix-dev) branch master updated (f0308f5688 -> 6bb228df51)
This is an automated email from the ASF dual-hosted git repository. davidb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from f0308f5688 [maven-release-plugin] prepare for next development iteration add 499d3736ef FELIX-6704: Include config/factory PID in error message new 6bb228df51 Merge pull request #317 from kwin/feature/FELIX-6704-improve-error-logging-in-configMgr The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../main/java/org/apache/felix/cm/impl/ConfigurationManager.java| 6 -- 1 file changed, 4 insertions(+), 2 deletions(-)
