svn commit: r49814 - /release/felix/
Author: tjwatson Date: Tue Sep 7 15:35:40 2021 New Revision: 49814 Log: SCR 2.2.0-RC1 Added: release/felix/org.apache.felix.scr-2.2.0-RC1-javadoc.jar (with props) release/felix/org.apache.felix.scr-2.2.0-RC1-javadoc.jar.asc release/felix/org.apache.felix.scr-2.2.0-RC1-javadoc.jar.md5 release/felix/org.apache.felix.scr-2.2.0-RC1-javadoc.jar.sha1 release/felix/org.apache.felix.scr-2.2.0-RC1-source-release.tar.gz (with props) release/felix/org.apache.felix.scr-2.2.0-RC1-source-release.tar.gz.asc release/felix/org.apache.felix.scr-2.2.0-RC1-source-release.tar.gz.md5 release/felix/org.apache.felix.scr-2.2.0-RC1-source-release.tar.gz.sha1 release/felix/org.apache.felix.scr-2.2.0-RC1-source-release.zip (with props) release/felix/org.apache.felix.scr-2.2.0-RC1-source-release.zip.asc release/felix/org.apache.felix.scr-2.2.0-RC1-source-release.zip.md5 release/felix/org.apache.felix.scr-2.2.0-RC1-source-release.zip.sha1 release/felix/org.apache.felix.scr-2.2.0-RC1-sources.jar (with props) release/felix/org.apache.felix.scr-2.2.0-RC1-sources.jar.asc release/felix/org.apache.felix.scr-2.2.0-RC1-sources.jar.md5 release/felix/org.apache.felix.scr-2.2.0-RC1-sources.jar.sha1 release/felix/org.apache.felix.scr-2.2.0-RC1.jar (with props) release/felix/org.apache.felix.scr-2.2.0-RC1.jar.asc release/felix/org.apache.felix.scr-2.2.0-RC1.jar.md5 release/felix/org.apache.felix.scr-2.2.0-RC1.jar.sha1 release/felix/org.apache.felix.scr-2.2.0-RC1.pom release/felix/org.apache.felix.scr-2.2.0-RC1.pom.asc release/felix/org.apache.felix.scr-2.2.0-RC1.pom.md5 release/felix/org.apache.felix.scr-2.2.0-RC1.pom.sha1 Added: release/felix/org.apache.felix.scr-2.2.0-RC1-javadoc.jar == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.2.0-RC1-javadoc.jar -- svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.scr-2.2.0-RC1-javadoc.jar.asc == --- release/felix/org.apache.felix.scr-2.2.0-RC1-javadoc.jar.asc (added) +++ release/felix/org.apache.felix.scr-2.2.0-RC1-javadoc.jar.asc Tue Sep 7 15:35:40 2021 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEV20xNjAQvWxZ1evVjTfy8GChr1AFAmEyX/AACgkQjTfy8GCh +r1DNAhAAopKFEf9AaCU8sa3fOoMA191g2Q6QMsiHIbfhhTfC8hP7QRRaRxwgFBhW +OVXmCE15UUVkTQkpU4M3wJ53drf317U8mqXHi5sclvKP4qvA4O7+9CrmZMTEKkgg +okaXyIT5x8zpHg1TBIVh0fFyK0h8tJiCSaoBXUbQUVtWZHHN0k7tPBZpUMFaers5 +Xn72eSAkofGd8THP4LCrzroHW/gl/AOqU0+U0txGIAElVf74m2VD9PxVlAh+kw+5 +9BsykBUO0rFG5kofIte+k3AXp0NZrGFGvAbfO29d+9QruGteWSaLh6Up1GxEo8pq +++556OOSrp6HxfqIrxYfDD6FmE/oWkepw6qqI7CP15x87rkFtypchH/b9abbCWqp +2bcaNXj4603SVZX2g1bug43hvTh1xYDX+oxuHCP96No1JJSgAGQ28aHRSyFcIU0Q +u4/IEINnxm6tDfsp1mbs5I4scnFGUSW41MNYng2vVfmF8/14KGe3pcizmx5/ElCK +rkv3jRDCQJ2deTbaXNNqYhjKSRbFZDZMGa0SB3FD72DEL35X8XGlljXv2yWBlXPO +y4qcs4H0IaZyXNvHa33ACXmO2RR20V7BiZqNHAPQzbzvNS7CHdT8WslC3C5LZc2I +19srlFSCgEO9m3eOg7ZaDihW1GOuyHRShsw+wLiTkVepO75ewXw= +=y9uA +-END PGP SIGNATURE- Added: release/felix/org.apache.felix.scr-2.2.0-RC1-javadoc.jar.md5 == --- release/felix/org.apache.felix.scr-2.2.0-RC1-javadoc.jar.md5 (added) +++ release/felix/org.apache.felix.scr-2.2.0-RC1-javadoc.jar.md5 Tue Sep 7 15:35:40 2021 @@ -0,0 +1 @@ +d042b9bd4b9e84389a46e5a37d5971da \ No newline at end of file Added: release/felix/org.apache.felix.scr-2.2.0-RC1-javadoc.jar.sha1 == --- release/felix/org.apache.felix.scr-2.2.0-RC1-javadoc.jar.sha1 (added) +++ release/felix/org.apache.felix.scr-2.2.0-RC1-javadoc.jar.sha1 Tue Sep 7 15:35:40 2021 @@ -0,0 +1 @@ +5fdfb1de46923cd4bc18b3d230cdcb051cdc5244 \ No newline at end of file Added: release/felix/org.apache.felix.scr-2.2.0-RC1-source-release.tar.gz == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.2.0-RC1-source-release.tar.gz -- svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.scr-2.2.0-RC1-source-release.tar.gz.asc == --- release/felix/org.apache.felix.scr-2.2.0-RC1-source-release.tar.gz.asc (added) +++ release/felix/org.apache.felix.scr-2.2.0-RC1-source-release.tar.gz.asc Tue Sep 7 15:35:40 2021 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEV20xNjAQvWxZ1evVjTfy8GChr1AFAmEyX+8ACgkQjTfy8GCh +r1A8JQ//ae2o2Dn8TPDOxqG4vV1PNDJD00yEvOudC4jDuMy9O6ZPm4eKaW8HpZiE
[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] 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 (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] 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);
