(felix-atomos) branch master updated (83f21f0 -> b796fc1)
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/felix-atomos.git
from 83f21f0 Merge pull request #80 from
apache/dependabot/maven/atomos.maven/org.apache.maven-maven-core-3.8.1
add 8d757d3 Add test for empty packages
add 19d4ee1 Do not include empty directories as packages
new b796fc1 Merge pull request #81 from tjwatson/fixIssue76
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:
.../tests/index/bundles/IndexLaunchTest.java | 53 +++---
.../atomos/tests/index/bundles/TestClass.java} | 8 ++--
.../src/test/resources/atomos/bundles.index| 1 +
.../src/test/resources/testIndex/test.index| 1 +
.../apache/felix/atomos/impl/base/AtomosBase.java | 6 ++-
5 files changed, 45 insertions(+), 24 deletions(-)
copy
atomos.tests/{atomos.tests.testbundles/atomos.tests.testbundles.resources.a/src/main/java/org/apache/felix/atomos/tests/testbundles/resource/a/Clazz.java
=>
atomos.tests.index.bundles/src/test/java/org/apache/felix/atomos/tests/index/bundles/TestClass.java}
(81%)
(felix-atomos) 01/01: Merge pull request #81 from tjwatson/fixIssue76
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-atomos.git commit b796fc13a763498ea474f72cd91a5d98d9944f72 Merge: 83f21f0 19d4ee1 Author: Thomas Watson AuthorDate: Tue Jun 11 15:14:56 2024 -0500 Merge pull request #81 from tjwatson/fixIssue76 Don't add empty directories as packages provided by a bundle .../tests/index/bundles/IndexLaunchTest.java | 53 +++--- .../atomos/tests/index/bundles/TestClass.java | 18 .../src/test/resources/atomos/bundles.index| 1 + .../src/test/resources/testIndex/test.index| 1 + .../apache/felix/atomos/impl/base/AtomosBase.java | 6 ++- 5 files changed, 60 insertions(+), 19 deletions(-)
(felix-atomos) 01/01: Merge pull request #80 from apache/dependabot/maven/atomos.maven/org.apache.maven-maven-core-3.8.1
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-atomos.git commit 83f21f0d80a5477af185477d2da9339677742b06 Merge: 673559f fae61c3 Author: Thomas Watson AuthorDate: Tue Jun 11 12:29:21 2024 -0500 Merge pull request #80 from apache/dependabot/maven/atomos.maven/org.apache.maven-maven-core-3.8.1 Bump org.apache.maven:maven-core from 3.6.3 to 3.8.1 in /atomos.maven atomos.maven/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(felix-atomos) branch master updated (673559f -> 83f21f0)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-atomos.git from 673559f Merge pull request #79 from tjwatson/felixParentV8 add fae61c3 Bump org.apache.maven:maven-core from 3.6.3 to 3.8.1 in /atomos.maven new 83f21f0 Merge pull request #80 from apache/dependabot/maven/atomos.maven/org.apache.maven-maven-core-3.8.1 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: atomos.maven/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(felix-atomos) 01/01: Merge pull request #79 from tjwatson/felixParentV8
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-atomos.git commit 673559fe3d5293cb8ea99717d7c40faf98680ba1 Merge: 41e89d7 4bf0c9a Author: Thomas Watson AuthorDate: Tue Jun 11 11:07:19 2024 -0500 Merge pull request #79 from tjwatson/felixParentV8 Felix parent v8 .github/workflows/maven.yml | 2 +- .mvn/wrapper/MavenWrapperDownloader.java | 110 --- .mvn/wrapper/maven-wrapper.properties| 19 ++- atomos-parent/pom.xml| 2 +- mvnw | 226 +-- mvnw.cmd | 86 +--- pom.xml | 2 +- 7 files changed, 210 insertions(+), 237 deletions(-)
(felix-atomos) branch master updated (41e89d7 -> 673559f)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-atomos.git from 41e89d7 Merge pull request #75 from RefuX/master add dcd8632 Update to felix parent version 8 add c54fd19 Update mvnw version add 4bf0c9a Add test pass for Java 17 and 21 new 673559f Merge pull request #79 from tjwatson/felixParentV8 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: .github/workflows/maven.yml | 2 +- .mvn/wrapper/MavenWrapperDownloader.java | 110 --- .mvn/wrapper/maven-wrapper.properties| 19 ++- atomos-parent/pom.xml| 2 +- mvnw | 226 +-- mvnw.cmd | 86 +--- pom.xml | 2 +- 7 files changed, 210 insertions(+), 237 deletions(-) delete mode 100755 .mvn/wrapper/MavenWrapperDownloader.java mode change 100755 => 100644 mvnw.cmd
svn commit: r69622 - /release/felix/
Author: tjwatson Date: Mon Jun 10 15:19:03 2024 New Revision: 69622 Log: remove scr 2.2.10 Removed: release/felix/org.apache.felix.scr-2.2.10-javadoc.jar release/felix/org.apache.felix.scr-2.2.10-javadoc.jar.asc release/felix/org.apache.felix.scr-2.2.10-javadoc.jar.sha1 release/felix/org.apache.felix.scr-2.2.10-source-release.tar.gz release/felix/org.apache.felix.scr-2.2.10-source-release.tar.gz.asc release/felix/org.apache.felix.scr-2.2.10-source-release.tar.gz.sha1 release/felix/org.apache.felix.scr-2.2.10-source-release.tar.gz.sha512 release/felix/org.apache.felix.scr-2.2.10-source-release.tar.gz.sha512.sha1 release/felix/org.apache.felix.scr-2.2.10-source-release.zip release/felix/org.apache.felix.scr-2.2.10-source-release.zip.asc release/felix/org.apache.felix.scr-2.2.10-source-release.zip.sha1 release/felix/org.apache.felix.scr-2.2.10-source-release.zip.sha512 release/felix/org.apache.felix.scr-2.2.10-source-release.zip.sha512.sha1 release/felix/org.apache.felix.scr-2.2.10-sources.jar release/felix/org.apache.felix.scr-2.2.10-sources.jar.asc release/felix/org.apache.felix.scr-2.2.10-sources.jar.sha1 release/felix/org.apache.felix.scr-2.2.10.pom release/felix/org.apache.felix.scr-2.2.10.pom.asc release/felix/org.apache.felix.scr-2.2.10.pom.sha1
svn commit: r69621 - /release/felix/
Author: tjwatson Date: Mon Jun 10 15:10:57 2024 New Revision: 69621 Log: Felix SCR 2.2.12 release Added: release/felix/org.apache.felix.scr-2.2.12-javadoc.jar (with props) release/felix/org.apache.felix.scr-2.2.12-javadoc.jar.asc (with props) release/felix/org.apache.felix.scr-2.2.12-javadoc.jar.sha1 release/felix/org.apache.felix.scr-2.2.12-source-release.tar.gz (with props) release/felix/org.apache.felix.scr-2.2.12-source-release.tar.gz.asc (with props) release/felix/org.apache.felix.scr-2.2.12-source-release.tar.gz.sha1 release/felix/org.apache.felix.scr-2.2.12-source-release.tar.gz.sha512 release/felix/org.apache.felix.scr-2.2.12-source-release.zip (with props) release/felix/org.apache.felix.scr-2.2.12-source-release.zip.asc (with props) release/felix/org.apache.felix.scr-2.2.12-source-release.zip.sha1 release/felix/org.apache.felix.scr-2.2.12-source-release.zip.sha512 release/felix/org.apache.felix.scr-2.2.12-sources.jar (with props) release/felix/org.apache.felix.scr-2.2.12-sources.jar.asc (with props) release/felix/org.apache.felix.scr-2.2.12-sources.jar.sha1 release/felix/org.apache.felix.scr-2.2.12.jar (with props) release/felix/org.apache.felix.scr-2.2.12.jar.asc (with props) release/felix/org.apache.felix.scr-2.2.12.jar.sha1 release/felix/org.apache.felix.scr-2.2.12.pom release/felix/org.apache.felix.scr-2.2.12.pom.asc (with props) release/felix/org.apache.felix.scr-2.2.12.pom.sha1 Added: release/felix/org.apache.felix.scr-2.2.12-javadoc.jar == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.2.12-javadoc.jar -- svn:mime-type = application/zip Added: release/felix/org.apache.felix.scr-2.2.12-javadoc.jar.asc == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.2.12-javadoc.jar.asc -- svn:mime-type = application/pgp-signature Added: release/felix/org.apache.felix.scr-2.2.12-javadoc.jar.sha1 == --- release/felix/org.apache.felix.scr-2.2.12-javadoc.jar.sha1 (added) +++ release/felix/org.apache.felix.scr-2.2.12-javadoc.jar.sha1 Mon Jun 10 15:10:57 2024 @@ -0,0 +1 @@ +dc5bf1544ee2946728661b7d8a134ad0a8674a64 \ No newline at end of file Added: release/felix/org.apache.felix.scr-2.2.12-source-release.tar.gz == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.2.12-source-release.tar.gz -- svn:mime-type = application/x-gzip Added: release/felix/org.apache.felix.scr-2.2.12-source-release.tar.gz.asc == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.2.12-source-release.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: release/felix/org.apache.felix.scr-2.2.12-source-release.tar.gz.sha1 == --- release/felix/org.apache.felix.scr-2.2.12-source-release.tar.gz.sha1 (added) +++ release/felix/org.apache.felix.scr-2.2.12-source-release.tar.gz.sha1 Mon Jun 10 15:10:57 2024 @@ -0,0 +1 @@ +bdac7874fe2e3bafc2d877ec972c1463320a66b4 \ No newline at end of file Added: release/felix/org.apache.felix.scr-2.2.12-source-release.tar.gz.sha512 == --- release/felix/org.apache.felix.scr-2.2.12-source-release.tar.gz.sha512 (added) +++ release/felix/org.apache.felix.scr-2.2.12-source-release.tar.gz.sha512 Mon Jun 10 15:10:57 2024 @@ -0,0 +1 @@ +d02d4118ed14f443539f5aa33f008b1ea536812b49aec7999202fd6b32a978a811d84264cf64eea65b4b912fa61c394c2078d722668aef52b95e15201d9ce653 \ No newline at end of file Added: release/felix/org.apache.felix.scr-2.2.12-source-release.zip == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.2.12-source-release.zip -- svn:mime-type = application/zip Added: release/felix/org.apache.felix.scr-2.2.12-source-release.zip.asc == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.2.12-source-release.zip.asc
(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. tjwatson 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 b29cc5f8fd [maven-release-plugin] prepare for next development iteration b29cc5f8fd is described below commit b29cc5f8fd1d91e3bbbac0226d2a917559567bfa Author: Thomas Watson AuthorDate: Wed May 1 13:51:35 2024 -0500 [maven-release-plugin] prepare for next development iteration --- scr/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scr/pom.xml b/scr/pom.xml index ee979463b1..0cb8f53636 100644 --- a/scr/pom.xml +++ b/scr/pom.xml @@ -30,12 +30,12 @@ Implementation of the Declarative Services specification 1.5 org.apache.felix.scr -2.2.12 +2.2.13-SNAPSHOT scm:git:ssh://g...@github.com/apache/felix-dev.git scm:git:ssh://g...@github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.scr-2.2.12 + HEAD
(felix-dev) annotated tag org.apache.felix.scr-2.2.12 updated (1f371e3c6d -> f06ebc0129)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to annotated tag org.apache.felix.scr-2.2.12 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.scr-2.2.12 was modified! *** from 1f371e3c6d (commit) to f06ebc0129 (tag) tagging 1f371e3c6d6a2d2d14c851227217e43576e0bbff (commit) replaces org.apache.felix.http.jetty12-1.0.4 by Thomas Watson on Wed May 1 13:51:34 2024 -0500 - Log - [maven-release-plugin] copy for tag org.apache.felix.scr-2.2.12 --- No new revisions were added by this update. Summary of changes:
(felix-dev) branch master updated (7d5114c16e -> 1f371e3c6d)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from 7d5114c16e [maven-release-plugin] prepare for next development iteration add 1f371e3c6d [maven-release-plugin] prepare release org.apache.felix.scr-2.2.12 No new revisions were added by this update. Summary of changes: scr/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(felix-dev) 01/01: Merge pull request #311 from adamcin/FELIX-6699
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git commit b880e22b0cefe6fac6548a9db30ce2f18ff08bb6 Merge: 69bb629081 76ddb8 Author: Thomas Watson AuthorDate: Wed May 1 07:49:15 2024 -0500 Merge pull request #311 from adamcin/FELIX-6699 FELIX-6699 Skip parsing of repeated Service-Component entries scr/changelog.txt | 18 +++-- .../felix/scr/impl/BundleComponentActivator.java | 23 +- 2 files changed, 30 insertions(+), 11 deletions(-)
(felix-dev) branch master updated (69bb629081 -> b880e22b0c)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from 69bb629081 Fix import (#313) add 76ddb8 FELIX-6699 Skip parsing of repeated Service-Component entries new b880e22b0c Merge pull request #311 from adamcin/FELIX-6699 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: scr/changelog.txt | 18 +++-- .../felix/scr/impl/BundleComponentActivator.java | 23 +- 2 files changed, 30 insertions(+), 11 deletions(-)
svn commit: r66744 - /release/felix/
Author: tjwatson Date: Mon Jan 22 13:58:56 2024 New Revision: 66744 Log: Felix SCR 2.2.10 release Added: release/felix/org.apache.felix.scr-2.2.10-javadoc.jar (with props) release/felix/org.apache.felix.scr-2.2.10-javadoc.jar.asc (with props) release/felix/org.apache.felix.scr-2.2.10-javadoc.jar.sha1 release/felix/org.apache.felix.scr-2.2.10-source-release.tar.gz (with props) release/felix/org.apache.felix.scr-2.2.10-source-release.tar.gz.asc (with props) release/felix/org.apache.felix.scr-2.2.10-source-release.tar.gz.sha1 release/felix/org.apache.felix.scr-2.2.10-source-release.tar.gz.sha512 release/felix/org.apache.felix.scr-2.2.10-source-release.tar.gz.sha512.sha1 release/felix/org.apache.felix.scr-2.2.10-source-release.zip (with props) release/felix/org.apache.felix.scr-2.2.10-source-release.zip.asc (with props) release/felix/org.apache.felix.scr-2.2.10-source-release.zip.sha1 release/felix/org.apache.felix.scr-2.2.10-source-release.zip.sha512 release/felix/org.apache.felix.scr-2.2.10-source-release.zip.sha512.sha1 release/felix/org.apache.felix.scr-2.2.10-sources.jar (with props) release/felix/org.apache.felix.scr-2.2.10-sources.jar.asc (with props) release/felix/org.apache.felix.scr-2.2.10-sources.jar.sha1 release/felix/org.apache.felix.scr-2.2.10.pom release/felix/org.apache.felix.scr-2.2.10.pom.asc (with props) release/felix/org.apache.felix.scr-2.2.10.pom.sha1 Removed: release/felix/org.apache.felix.scr-2.2.6-javadoc.jar release/felix/org.apache.felix.scr-2.2.6-javadoc.jar.asc release/felix/org.apache.felix.scr-2.2.6-javadoc.jar.sha1 release/felix/org.apache.felix.scr-2.2.6-source-release.tar.gz release/felix/org.apache.felix.scr-2.2.6-source-release.tar.gz.asc release/felix/org.apache.felix.scr-2.2.6-source-release.tar.gz.sha1 release/felix/org.apache.felix.scr-2.2.6-source-release.zip release/felix/org.apache.felix.scr-2.2.6-source-release.zip.asc release/felix/org.apache.felix.scr-2.2.6-source-release.zip.sha1 release/felix/org.apache.felix.scr-2.2.6-sources.jar release/felix/org.apache.felix.scr-2.2.6-sources.jar.asc release/felix/org.apache.felix.scr-2.2.6-sources.jar.sha1 release/felix/org.apache.felix.scr-2.2.6.jar release/felix/org.apache.felix.scr-2.2.6.jar.asc release/felix/org.apache.felix.scr-2.2.6.jar.sha1 release/felix/org.apache.felix.scr-2.2.6.pom release/felix/org.apache.felix.scr-2.2.6.pom.asc release/felix/org.apache.felix.scr-2.2.6.pom.sha1 Added: release/felix/org.apache.felix.scr-2.2.10-javadoc.jar == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.2.10-javadoc.jar -- svn:mime-type = application/zip Added: release/felix/org.apache.felix.scr-2.2.10-javadoc.jar.asc == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.2.10-javadoc.jar.asc -- svn:mime-type = application/pgp-signature Added: release/felix/org.apache.felix.scr-2.2.10-javadoc.jar.sha1 == --- release/felix/org.apache.felix.scr-2.2.10-javadoc.jar.sha1 (added) +++ release/felix/org.apache.felix.scr-2.2.10-javadoc.jar.sha1 Mon Jan 22 13:58:56 2024 @@ -0,0 +1 @@ +f21c5a50a50655593436f784383172e35132ca33 \ No newline at end of file Added: release/felix/org.apache.felix.scr-2.2.10-source-release.tar.gz == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.2.10-source-release.tar.gz -- svn:mime-type = application/x-gzip Added: release/felix/org.apache.felix.scr-2.2.10-source-release.tar.gz.asc == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.2.10-source-release.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: release/felix/org.apache.felix.scr-2.2.10-source-release.tar.gz.sha1 == --- release/felix/org.apache.felix.scr-2.2.10-source-release.tar.gz.sha1 (added) +++ release/felix/org.apache.felix.scr-2.2.10-source-release.tar.gz.sha1 Mon Jan 22 13:58:56 2024 @@ -0,0 +1 @@ +ec1eeff156ac3d58f7818bb33f942042f5e33ee9 \ No newline at end of file Added: release/felix/org.apache.felix.scr-2.2.10-source-release.tar.gz.sha512
(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. tjwatson 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 1d44ee2e84 [maven-release-plugin] prepare for next development iteration 1d44ee2e84 is described below commit 1d44ee2e84b0f02bc410c49adec111db087457ba Author: Thomas Watson AuthorDate: Thu Jan 18 14:02:17 2024 -0600 [maven-release-plugin] prepare for next development iteration --- scr/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scr/pom.xml b/scr/pom.xml index 06bb4915cf..76db70cedb 100644 --- a/scr/pom.xml +++ b/scr/pom.xml @@ -30,12 +30,12 @@ Implementation of the Declarative Services specification 1.5 org.apache.felix.scr -2.2.10 +2.2.11-SNAPSHOT scm:git:ssh://g...@github.com/apache/felix-dev.git scm:git:ssh://g...@github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.scr-2.2.10 + HEAD
(felix-dev) annotated tag org.apache.felix.scr-2.2.10 updated (98a761f0b5 -> f54e42888c)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to annotated tag org.apache.felix.scr-2.2.10 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.scr-2.2.10 was modified! *** from 98a761f0b5 (commit) to f54e42888c (tag) tagging 98a761f0b5d2ec384b9b6ba3549428ece3c281c0 (commit) replaces org.apache.felix.scr-2.2.8 by Thomas Watson on Thu Jan 18 14:02:16 2024 -0600 - Log - [maven-release-plugin] copy for tag org.apache.felix.scr-2.2.10 --- No new revisions were added by this update. Summary of changes:
(felix-dev) branch master updated (d40368c853 -> 98a761f0b5)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from d40368c853 Correctly exclude impl packages from javadoc add 98a761f0b5 [maven-release-plugin] prepare release org.apache.felix.scr-2.2.10 No new revisions were added by this update. Summary of changes: scr/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(felix-dev) branch master updated: Correctly exclude impl packages from javadoc
This is an automated email from the ASF dual-hosted git repository.
tjwatson 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 d40368c853 Correctly exclude impl packages from javadoc
d40368c853 is described below
commit d40368c853e486e63c2200a613613831ba8659a2
Author: Thomas Watson
AuthorDate: Thu Jan 18 13:36:18 2024 -0600
Correctly exclude impl packages from javadoc
---
scr/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scr/pom.xml b/scr/pom.xml
index 324bed175e..5191fb6892 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -325,7 +325,7 @@
maven-javadoc-plugin
${project.build.sourceEncoding}
-*.impl
+
org.apache.felix.scr.impl:org.apache.felix.scr.impl.*
${java.version}
(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. tjwatson 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 f67eee9550 [maven-release-plugin] prepare for next development iteration f67eee9550 is described below commit f67eee95507bf21ae4c64ab3297ff28b0cbaea7a Author: Thomas Watson AuthorDate: Thu Jan 18 13:10:33 2024 -0600 [maven-release-plugin] prepare for next development iteration --- scr/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scr/pom.xml b/scr/pom.xml index 8ce85d0e3a..324bed175e 100644 --- a/scr/pom.xml +++ b/scr/pom.xml @@ -30,12 +30,12 @@ Implementation of the Declarative Services specification 1.5 org.apache.felix.scr -2.2.8 +2.2.9-SNAPSHOT scm:git:ssh://g...@github.com/apache/felix-dev.git scm:git:ssh://g...@github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.scr-2.2.8 + HEAD
(felix-dev) annotated tag org.apache.felix.scr-2.2.8 updated (926835df57 -> 1f4fde2e6b)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to annotated tag org.apache.felix.scr-2.2.8 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.scr-2.2.8 was modified! *** from 926835df57 (commit) to 1f4fde2e6b (tag) tagging 926835df57d210617f584cd91d1e0dbe6e8babbd (commit) replaces org.apache.felix.cm.json-2.0.6 by Thomas Watson on Thu Jan 18 13:10:32 2024 -0600 - Log - [maven-release-plugin] copy for tag org.apache.felix.scr-2.2.8 --- No new revisions were added by this update. Summary of changes:
(felix-dev) branch master updated (ef9380137e -> 926835df57)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from ef9380137e Add change log for 2.2.8 add 46bdb6c585 Using ssh scm urls for github add 926835df57 [maven-release-plugin] prepare release org.apache.felix.scr-2.2.8 No new revisions were added by this update. Summary of changes: scr/pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-)
(felix-dev) branch master updated: Add change log for 2.2.8
This is an automated email from the ASF dual-hosted git repository. tjwatson 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 ef9380137e Add change log for 2.2.8 ef9380137e is described below commit ef9380137e76467ea957e4feba2b5dd9bd2ae888 Author: Thomas Watson AuthorDate: Thu Jan 18 09:54:40 2024 -0600 Add change log for 2.2.8 --- scr/changelog.txt | 9 + 1 file changed, 9 insertions(+) diff --git a/scr/changelog.txt b/scr/changelog.txt index a9c23f153e..fee0dfee97 100644 --- a/scr/changelog.txt +++ b/scr/changelog.txt @@ -1,3 +1,12 @@ +Changes in 2.2.8 +** Improvement +* [FELIX-6463] Changing log levels for DS component getState and registration + +** Bug +* [FELIX-6616] Dynamic greedy 1..1 references may activate with no reference service bound +* [FELIX-6633] Dynamic references may miss events while causing deactivation +* [FELIX-6682] Felix SCR - 3 TestCases fail in OSGi TCK + Changes in 2.2.6 - ** Bug
(felix-dev) branch master updated (8b598e8628 -> 01577eef28)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from 8b598e8628 [maven-release-plugin] prepare for next development iteration new 7cd6f3f2c3 Update felix parent new ad746d6a44 Always delegate to ServiceObjects to ungetService new 01577eef28 Merge pull request #291 from tjwatson/scrFix6682 The 17057 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: scr/pom.xml | 2 +- .../apache/felix/scr/impl/helper/ComponentServiceObjectsHelper.java | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-)
(felix-dev) branch master updated: FELIX-6667 - Reresoliving hosts or resolving new fragments does not invalidate meta-data cache for SCR
This is an automated email from the ASF dual-hosted git repository.
tjwatson 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 29b07db15e FELIX-6667 - Reresoliving hosts or resolving new fragments
does not invalidate meta-data cache for SCR
new 6eda791006 Merge pull request #242 from tjwatson/FELIX-6667
29b07db15e is described below
commit 29b07db15e3f62162e993c2ba225251c5629cf69
Author: Thomas Watson
AuthorDate: Wed Nov 1 09:37:19 2023 -0500
FELIX-6667 - Reresoliving hosts or resolving new fragments does not
invalidate meta-data cache for SCR
This fix detects the UNRESOLVED event in addition to the UPDATED
and UNINSTALLED events to remove the meta-data cache for a bundle.
Additionally, this fix detects cases where a fragment is resolved
and dynamically attached to a host. In this case it also removes
the host meta-data cache.
---
.../java/org/apache/felix/scr/impl/Activator.java | 24 --
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
b/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
index 0cfde4ea08..f54e70f7ca 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
@@ -58,6 +58,7 @@ import org.osgi.framework.Constants;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
+import org.osgi.framework.namespace.HostNamespace;
import org.osgi.framework.wiring.BundleRevision;
import org.osgi.framework.wiring.BundleWire;
import org.osgi.framework.wiring.BundleWiring;
@@ -253,11 +254,30 @@ public class Activator extends AbstractExtender
public void bundleChanged(BundleEvent event)
{
super.bundleChanged(event);
-if (event.getType() == BundleEvent.UPDATED
-|| event.getType() == BundleEvent.UNINSTALLED)
+int eType = event.getType();
+if (eType == BundleEvent.UPDATED
+|| eType == BundleEvent.UNINSTALLED
+|| eType == BundleEvent.UNRESOLVED)
{
m_componentMetadataStore.remove(event.getBundle().getBundleId());
}
+if (eType == BundleEvent.RESOLVED)
+{
+BundleRevision revision =
event.getBundle().adapt(BundleRevision.class);
+if (revision != null && (revision.getTypes() &
BundleRevision.TYPE_FRAGMENT) == BundleRevision.TYPE_FRAGMENT)
+{
+BundleWiring wiring = revision.getWiring();
+List hostWires = wiring != null ?
wiring.getRequiredWires(HostNamespace.HOST_NAMESPACE) : null;
+if (hostWires != null && !hostWires.isEmpty())
+{
+for (BundleWire hostWire : hostWires)
+{
+// invalidate any hosts of newly resolved fragments
+
m_componentMetadataStore.remove(hostWire.getProvider().getBundle().getBundleId());
+}
+}
+}
+}
}
private static ConcurrentMap> load(
(felix-dev) branch master updated: FELIX-6633 : Dynamic references may miss events while causing deactivation
This is an automated email from the ASF dual-hosted git repository.
tjwatson 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 026b877c97 FELIX-6633 : Dynamic references may miss events while
causing deactivation
new d84e21bacb Merge pull request #219 from tjwatson/FELIX-6633
026b877c97 is described below
commit 026b877c97b3874dd32cd8a820c0b22574a84a08
Author: Thomas Watson
AuthorDate: Mon Aug 21 07:58:17 2023 -0500
FELIX-6633 : Dynamic references may miss events while causing deactivation
Ensure no new add events got missed when deactivating on removed service
This change follows the same pattern as other reference types but
also does it for dynamic references when they become unsatisifed.
The fix is to simply cause the dependency manager to be checked
again after the removed event gets processed to ensure the dependency
is not now satisified.
---
.../felix/scr/impl/manager/DependencyManager.java | 10 ++
.../scr/integration/ConfigurationChangeTest.java | 132 -
...test_simple_components_configuration_change.xml | 6 +-
3 files changed, 146 insertions(+), 2 deletions(-)
diff --git
a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
index 813c8230d3..94e8f14575 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
@@ -412,6 +412,11 @@ public class DependencyManager implements
ReferenceManager
m_componentManager.getLogger().log(Level.DEBUG,
"dm {0} tracking {1} MultipleDynamic removed (deactivate)
{2}",
null, getName(), trackingCount, serviceReference );
+if (event != null) {
+// After event has been processed make sure to check if we
missed anything
+// while deactivating; this will possibly reactivate
+event.addComponentManager(m_componentManager);
+}
}
ungetService(refPair);
}
@@ -1136,6 +1141,11 @@ public class DependencyManager implements
ReferenceManager
tracked(trackingCount);
untracked = false;
deactivateComponentManager();
+if (event != null) {
+// After event has been processed make sure to check if we
missed anything
+// while deactivating; this will possibly reactivate
+event.addComponentManager(m_componentManager);
+}
}
if (untracked) // not ours
diff --git
a/scr/src/test/java/org/apache/felix/scr/integration/ConfigurationChangeTest.java
b/scr/src/test/java/org/apache/felix/scr/integration/ConfigurationChangeTest.java
index 52d99c64aa..4d4a971e13 100644
---
a/scr/src/test/java/org/apache/felix/scr/integration/ConfigurationChangeTest.java
+++
b/scr/src/test/java/org/apache/felix/scr/integration/ConfigurationChangeTest.java
@@ -18,18 +18,29 @@
*/
package org.apache.felix.scr.integration;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Arrays;
+import java.util.Dictionary;
import java.util.Hashtable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
import org.apache.felix.scr.integration.components.SimpleComponent;
import org.apache.felix.scr.integration.components.SimpleServiceImpl;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceEvent;
+import org.osgi.framework.ServiceListener;
import org.osgi.framework.ServiceReference;
import org.osgi.service.component.ComponentConstants;
import org.osgi.service.component.ComponentFactory;
import org.osgi.service.component.ComponentInstance;
import org.osgi.service.component.runtime.dto.ComponentConfigurationDTO;
+import org.osgi.util.tracker.ServiceTracker;
import junit.framework.TestCase;
@@ -41,7 +52,7 @@ public class ConfigurationChangeTest extends ComponentTestBase
static
{
// uncomment to enable debugging of this test class
-// paxRunnerVmOption = DEBUG_VM_OPTION;
+//paxRunnerVmOption = DEBUG_VM_OPTION;
descriptorFile =
"/integration_test_simple_components_configuration_change.xml";
}
@@ -155,6 +166,19 @@ public class ConfigurationChangeTest extends
ComponentTestBase
multipleTest( pid, true );
}
+@Test
+public void test_optional_multiple_dynamic_config_cardinality() throws
Exception
+{
[felix-atomos] branch master updated (4d50bad -> 41e89d7)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-atomos.git from 4d50bad Merge pull request #70 from fipro78/master new ae3a091 https://github.com/apache/felix-atomos/issues/74 new f6d4b9c better naming new 70bd9d6 less verbiage new 685af88 code review feedback new 41e89d7 Merge pull request #75 from RefuX/master The 361 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: .../felix/atomos/impl/modules/AtomosModules.java | 30 -- 1 file changed, 22 insertions(+), 8 deletions(-)
[felix-dev] branch master updated: FELIX-6616 : reduce timing window for binding dynamic greedy refs
This is an automated email from the ASF dual-hosted git repository.
tjwatson 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 250b7bc91a FELIX-6616 : reduce timing window for binding dynamic
greedy refs
new f1f5bc7c26 Merge pull request #214 from tjwatson/FELIX-6616
250b7bc91a is described below
commit 250b7bc91a1e074d17bda846a4b17cc87f5391d1
Author: Thomas Watson
AuthorDate: Mon Jul 17 10:46:20 2023 -0500
FELIX-6616 : reduce timing window for binding dynamic greedy refs
For 1..1 and 0..1 dynamic greedy references it is possible that
the activating thread will bind a lower ranked service while
another thead is binding a higher ranked service. This can
result in some strange orders for bind methods.
This change reduces the timing window such that the activating
thread will immediately bind the higher ranked service as long
as another thread has indicated that it will bind the higher
ranked service. This still results in some extra bind calls
for the same higher ranked service but greatly reduces the
window where the activating thread will bind a lower ranked
service while the tracking thread is trying to bind a higher
ranked service.
This change moves the check for what ref to bind from the
activating thread to just before it will call bind on the
component object being activated. There is still a small
window where another thread may register a higher ranked
service right after the activating thread gets the ref
to bind and when it actually calls bind. If this proves
to be problematic then we may need an additional check
after bind during activate that makes sure the latest
tracked service is what actually got bound during activate.
---
.../org/apache/felix/scr/impl/manager/DependencyManager.java | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git
a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
index 2ce9c6386d..813c8230d3 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
@@ -957,8 +957,8 @@ public class DependencyManager implements
ReferenceManager
{
boolean invokedUnbind = false;
m_componentManager.invokeBindMethod(DependencyManager.this,
-bindingRefPair, trackingCount);
-if (!bindingRefPair.isFailed())
+refPair, trackingCount);
+if (!refPair.isFailed())
{
if (current != null)
{
@@ -971,7 +971,7 @@ public class DependencyManager implements
ReferenceManager
else if (cardinalitySatisfied(0))
{
m_componentManager.registerMissingDependency(DependencyManager.this,
-bindingRefPair.getRef(), trackingCount);
+refPair.getRef(), trackingCount);
}
RefPair next = null;
synchronized (monitor)
@@ -1210,9 +1210,10 @@ public class DependencyManager implements
ReferenceManager
synchronized (monitor)
{
trackingCount.set(this.trackingCount);
-return currentRefPair == null
+RefPair current = bindingRefPair != null ?
bindingRefPair : currentRefPair;
+return current == null
? Collections.> emptyList()
-: Collections.singleton(currentRefPair);
+: Collections.singleton(current);
}
}
else
svn commit: r59544 - /release/felix/
Author: tjwatson Date: Mon Jan 23 14:18:43 2023 New Revision: 59544 Log: scr 2.2.6 release Added: release/felix/org.apache.felix.scr-2.2.6-javadoc.jar (with props) release/felix/org.apache.felix.scr-2.2.6-javadoc.jar.asc (with props) release/felix/org.apache.felix.scr-2.2.6-javadoc.jar.sha1 release/felix/org.apache.felix.scr-2.2.6-source-release.tar.gz (with props) release/felix/org.apache.felix.scr-2.2.6-source-release.tar.gz.asc (with props) release/felix/org.apache.felix.scr-2.2.6-source-release.tar.gz.sha1 release/felix/org.apache.felix.scr-2.2.6-source-release.zip (with props) release/felix/org.apache.felix.scr-2.2.6-source-release.zip.asc (with props) release/felix/org.apache.felix.scr-2.2.6-source-release.zip.sha1 release/felix/org.apache.felix.scr-2.2.6-sources.jar (with props) release/felix/org.apache.felix.scr-2.2.6-sources.jar.asc (with props) release/felix/org.apache.felix.scr-2.2.6-sources.jar.sha1 release/felix/org.apache.felix.scr-2.2.6.jar (with props) release/felix/org.apache.felix.scr-2.2.6.jar.asc (with props) release/felix/org.apache.felix.scr-2.2.6.jar.sha1 release/felix/org.apache.felix.scr-2.2.6.pom release/felix/org.apache.felix.scr-2.2.6.pom.asc (with props) release/felix/org.apache.felix.scr-2.2.6.pom.sha1 Added: release/felix/org.apache.felix.scr-2.2.6-javadoc.jar == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.2.6-javadoc.jar -- svn:mime-type = application/zip Added: release/felix/org.apache.felix.scr-2.2.6-javadoc.jar.asc == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.2.6-javadoc.jar.asc -- svn:mime-type = application/pgp-signature Added: release/felix/org.apache.felix.scr-2.2.6-javadoc.jar.sha1 == --- release/felix/org.apache.felix.scr-2.2.6-javadoc.jar.sha1 (added) +++ release/felix/org.apache.felix.scr-2.2.6-javadoc.jar.sha1 Mon Jan 23 14:18:43 2023 @@ -0,0 +1 @@ +f3565fc740e62d4e78f85f7c713cbb4a1639920b \ No newline at end of file Added: release/felix/org.apache.felix.scr-2.2.6-source-release.tar.gz == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.2.6-source-release.tar.gz -- svn:mime-type = application/x-gzip Added: release/felix/org.apache.felix.scr-2.2.6-source-release.tar.gz.asc == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.2.6-source-release.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: release/felix/org.apache.felix.scr-2.2.6-source-release.tar.gz.sha1 == --- release/felix/org.apache.felix.scr-2.2.6-source-release.tar.gz.sha1 (added) +++ release/felix/org.apache.felix.scr-2.2.6-source-release.tar.gz.sha1 Mon Jan 23 14:18:43 2023 @@ -0,0 +1 @@ +0f7ca3db31e568afa8299efc4a423e3bc8e5b51c \ No newline at end of file Added: release/felix/org.apache.felix.scr-2.2.6-source-release.zip == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.2.6-source-release.zip -- svn:mime-type = application/zip Added: release/felix/org.apache.felix.scr-2.2.6-source-release.zip.asc == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.2.6-source-release.zip.asc -- svn:mime-type = application/pgp-signature Added: release/felix/org.apache.felix.scr-2.2.6-source-release.zip.sha1 == --- release/felix/org.apache.felix.scr-2.2.6-source-release.zip.sha1 (added) +++ release/felix/org.apache.felix.scr-2.2.6-source-release.zip.sha1 Mon Jan 23 14:18:43 2023 @@ -0,0 +1 @@ +abe1bd28c3ad262f7d2e2ed3ae103689e43dde7a \ No newline at end of file Added: release/felix/org.apache.felix.scr-2.2.6-sources.jar == Binary file - no diff available. Propchange
svn commit: r59545 - /release/felix/
Author: tjwatson Date: Mon Jan 23 14:20:13 2023 New Revision: 59545 Log: remove scr 2.2.4 Removed: release/felix/org.apache.felix.scr-2.2.4-javadoc.jar release/felix/org.apache.felix.scr-2.2.4-javadoc.jar.asc release/felix/org.apache.felix.scr-2.2.4-javadoc.jar.sha1 release/felix/org.apache.felix.scr-2.2.4-source-release.tar.gz release/felix/org.apache.felix.scr-2.2.4-source-release.tar.gz.asc release/felix/org.apache.felix.scr-2.2.4-source-release.tar.gz.sha1 release/felix/org.apache.felix.scr-2.2.4-source-release.tar.gz.sha512 release/felix/org.apache.felix.scr-2.2.4-source-release.zip release/felix/org.apache.felix.scr-2.2.4-source-release.zip.asc release/felix/org.apache.felix.scr-2.2.4-source-release.zip.sha1 release/felix/org.apache.felix.scr-2.2.4-source-release.zip.sha512 release/felix/org.apache.felix.scr-2.2.4-sources.jar release/felix/org.apache.felix.scr-2.2.4-sources.jar.asc release/felix/org.apache.felix.scr-2.2.4-sources.jar.sha1 release/felix/org.apache.felix.scr-2.2.4.jar release/felix/org.apache.felix.scr-2.2.4.jar.asc release/felix/org.apache.felix.scr-2.2.4.jar.sha1 release/felix/org.apache.felix.scr-2.2.4.pom release/felix/org.apache.felix.scr-2.2.4.pom.asc release/felix/org.apache.felix.scr-2.2.4.pom.sha1
[felix-dev] annotated tag org.apache.felix.scr-2.2.6 updated (8d195f9d13 -> d95289ad3d)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to annotated tag org.apache.felix.scr-2.2.6 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.scr-2.2.6 was modified! *** from 8d195f9d13 (commit) to d95289ad3d (tag) tagging 8d195f9d13486617c394a96f2ef1de1faab00dfe (commit) replaces org.apache.felix.http.webconsoleplugin-1.0.0 by Thomas Watson on Wed Jan 18 11:25:55 2023 -0600 - Log - [maven-release-plugin] copy for tag org.apache.felix.scr-2.2.6 --- No new revisions were added by this update. Summary of changes:
[felix-dev] branch master updated (8d195f9d13 -> dea1b8cd57)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from 8d195f9d13 [maven-release-plugin] prepare release org.apache.felix.scr-2.2.6 add dea1b8cd57 [maven-release-plugin] prepare for next development iteration No new revisions were added by this update. Summary of changes: scr/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[felix-dev] annotated tag org.apache.felix.scr-2.2.6 updated (8d195f9d13 -> 39ab0873c1)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to annotated tag org.apache.felix.scr-2.2.6 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.scr-2.2.6 was modified! *** from 8d195f9d13 (commit) to 39ab0873c1 (tag) tagging 8d195f9d13486617c394a96f2ef1de1faab00dfe (commit) replaces org.apache.felix.http.webconsoleplugin-1.0.0 by Thomas Watson on Wed Jan 18 10:41:00 2023 -0600 - Log - [maven-release-plugin] copy for tag org.apache.felix.scr-2.2.6 --- No new revisions were added by this update. Summary of changes:
[felix-dev] 01/02: Update change log for release
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git commit e283e192fe210c451aaea4ce6414458d847ce37f Author: Thomas Watson AuthorDate: Wed Jan 18 08:55:02 2023 -0600 Update change log for release --- scr/changelog.txt | 10 ++ 1 file changed, 10 insertions(+) diff --git a/scr/changelog.txt b/scr/changelog.txt index 541d41a33b..a9c23f153e 100644 --- a/scr/changelog.txt +++ b/scr/changelog.txt @@ -1,3 +1,13 @@ +Changes in 2.2.6 +- +** Bug +* [FELIX-6581] - use system context to clean up logger domains + +Changes in 2.2.4 +- +** Bug +* [FELIX-6564] Fixed NPE while retrieving component descriptions from SCR + Changes in 2.2.2 - ** Improvement
[felix-dev] branch master updated (af67d22497 -> 8d195f9d13)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from af67d22497 Update to latest http jetty snapshot new e283e192fe Update change log for release new 8d195f9d13 [maven-release-plugin] prepare release org.apache.felix.scr-2.2.6 The 2 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: scr/changelog.txt | 10 ++ scr/pom.xml | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-)
[felix-dev] 02/02: [maven-release-plugin] prepare release org.apache.felix.scr-2.2.6
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git commit 8d195f9d13486617c394a96f2ef1de1faab00dfe Author: Thomas Watson AuthorDate: Wed Jan 18 10:31:55 2023 -0600 [maven-release-plugin] prepare release org.apache.felix.scr-2.2.6 --- scr/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scr/pom.xml b/scr/pom.xml index 104f72236c..655ac9d7a2 100644 --- a/scr/pom.xml +++ b/scr/pom.xml @@ -30,12 +30,12 @@ Implementation of the Declarative Services specification 1.5 org.apache.felix.scr -2.2.5-SNAPSHOT +2.2.6 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.scr-2.2.6
[felix-dev] branch master updated: FELIX-6581 - use system context to clean up logger domains
This is an automated email from the ASF dual-hosted git repository.
tjwatson 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 619d36714a FELIX-6581 - use system context to clean up logger domains
619d36714a is described below
commit 619d36714a9a1258a4c1d56b8b0d581fa7860903
Author: Thomas Watson
AuthorDate: Fri Nov 11 09:32:01 2022 -0600
FELIX-6581 - use system context to clean up logger domains
Always using the system context to clean up the logger domians.
It is more simple to always use the system context for this
purpose instead of conditionally use it according to the
ds.global.extender configuration. There is no harm to using
always using the system context here because we only use it to
listen for stopped bundles to clean up used domains.
---
.../main/java/org/apache/felix/scr/impl/logger/LogManager.java | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/logger/LogManager.java
b/scr/src/main/java/org/apache/felix/scr/impl/logger/LogManager.java
index dd3cae05a1..0a5fecf6a7 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/logger/LogManager.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/logger/LogManager.java
@@ -51,6 +51,7 @@ class LogManager extends ServiceTracker
implements BundleListene
private static final String LOGGER_FACTORY_CLASS_NAME =
"org.osgi.service.log.LoggerFactory";
final BundleContext scrContext;
+final BundleContext systemContext;
final AtomicBoolean closed = new AtomicBoolean(false);
/*
@@ -150,6 +151,7 @@ class LogManager extends ServiceTracker
implements BundleListene
{
super(context, LOGGER_FACTORY_CLASS_NAME, null);
this.scrContext = context;
+this.systemContext =
context.getBundle(Constants.SYSTEM_BUNDLE_LOCATION).getBundleContext();
this.config = config;
}
@@ -174,7 +176,10 @@ class LogManager extends ServiceTracker
implements BundleListene
{
if (!config.isLogExtensionEnabled())
{
-scrContext.addBundleListener(this);
+// Use system context to do cleanup of domains.
+// This ensures we always can cleanup even when the SCR context
+// cannot see the bundle.
+systemContext.addBundleListener(this);
}
this.open();
}
@@ -305,7 +310,7 @@ class LogManager extends ServiceTracker
implements BundleListene
{
lock.close();
super.close();
-this.context.removeBundleListener(this);
+this.systemContext.removeBundleListener(this);
}
}
[felix-dev] branch master updated: [FELIX-6564] Fixed NPE while retrieving component descriptions from SCR
This is an automated email from the ASF dual-hosted git repository.
tjwatson 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 8815594fba [FELIX-6564] Fixed NPE while retrieving component
descriptions from SCR
new a27dd47244 Merge pull request #172 from amitjoy/fix/npe/scr
8815594fba is described below
commit 8815594fba7c7aeb121ae0cff33c67f36f486d36
Author: Amit Kumar Mondal
AuthorDate: Wed Sep 14 13:20:56 2022 +0200
[FELIX-6564] Fixed NPE while retrieving component descriptions from SCR
Fixes https://issues.apache.org/jira/browse/FELIX-6564
---
.../scr/impl/runtime/ServiceComponentRuntimeImpl.java | 17 +
1 file changed, 17 insertions(+)
diff --git
a/scr/src/main/java/org/apache/felix/scr/impl/runtime/ServiceComponentRuntimeImpl.java
b/scr/src/main/java/org/apache/felix/scr/impl/runtime/ServiceComponentRuntimeImpl.java
index 0f13941502..32573091e0 100644
---
a/scr/src/main/java/org/apache/felix/scr/impl/runtime/ServiceComponentRuntimeImpl.java
+++
b/scr/src/main/java/org/apache/felix/scr/impl/runtime/ServiceComponentRuntimeImpl.java
@@ -117,6 +117,10 @@ public class ServiceComponentRuntimeImpl implements
ServiceComponentRuntime
try
{
ComponentHolder holder = getHolderFromDescription( description);
+// the holder can also be null if the associated component is
deregistered
+if (holder == null) {
+return Collections.emptyList();
+}
// Get a fully filled out valid description DTO
description = holderToDescription(holder);
if ( description == null)
@@ -146,6 +150,9 @@ public class ServiceComponentRuntimeImpl implements
ServiceComponentRuntime
try
{
ComponentHolder holder = getHolderFromDescription( description);
+if (holder == null) {
+return false;
+}
return holder.isEnabled();
}
catch ( IllegalStateException ise)
@@ -163,6 +170,9 @@ public class ServiceComponentRuntimeImpl implements
ServiceComponentRuntime
try
{
final ComponentHolder holder = getHolderFromDescription(
description);
+if (holder == null) {
+throw new IllegalStateException("The component is not
available in the runtime");
+}
final boolean doUpdate = !holder.isEnabled();
final Promise result = holder.enableComponents(true);
if ( doUpdate ) {
@@ -185,6 +195,9 @@ public class ServiceComponentRuntimeImpl implements
ServiceComponentRuntime
try
{
final ComponentHolder holder = getHolderFromDescription(
description);
+if (holder == null) {
+throw new IllegalStateException("The component is not
available in the runtime");
+}
final boolean doUpdate = holder.isEnabled();
final Promise result = holder.disableComponents(true);
//synchronous
if ( doUpdate ) {
@@ -294,6 +307,10 @@ public class ServiceComponentRuntimeImpl implements
ServiceComponentRuntime
}
long bundleId = description.bundle.id;
Bundle b = context.getBundle(bundleId);
+if (b == null) {
+// the bundle is possibly uninstalled
+return null;
+}
String name = description.name;
return componentRegistry.getComponentHolder(b, name);
}
[felix-atomos] branch master updated: add handling for running build on Windows
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-atomos.git
The following commit(s) were added to refs/heads/master by this push:
new 6a71137 add handling for running build on Windows
new 4d50bad Merge pull request #70 from fipro78/master
6a71137 is described below
commit 6a7113717944be3c7bb7e917078a2e2daab259ec
Author: Dirk Fauth
AuthorDate: Thu Sep 22 19:08:57 2022 +0200
add handling for running build on Windows
---
.../substrate/impl/NativeImageArgumentsImpl.java| 2 +-
.../utils/substrate/impl/NativeImageCliUtil.java| 21 ++---
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git
a/atomos.utils/atomos.utils.substrate.impl/src/main/java/org/apache/felix/atomos/utils/substrate/impl/NativeImageArgumentsImpl.java
b/atomos.utils/atomos.utils.substrate.impl/src/main/java/org/apache/felix/atomos/utils/substrate/impl/NativeImageArgumentsImpl.java
index a702164..a7e998c 100644
---
a/atomos.utils/atomos.utils.substrate.impl/src/main/java/org/apache/felix/atomos/utils/substrate/impl/NativeImageArgumentsImpl.java
+++
b/atomos.utils/atomos.utils.substrate.impl/src/main/java/org/apache/felix/atomos/utils/substrate/impl/NativeImageArgumentsImpl.java
@@ -121,7 +121,7 @@ public class NativeImageArgumentsImpl implements
DefaultNativeImageArguments
.map(Path::toAbsolutePath)//
.sorted(NativeImageArgumentsImpl::byAbsolutePath)//
.map(Path::toString)//
-.collect(Collectors.joining(":"));
+.collect(Collectors.joining(NativeImageCliUtil.isWindows() ? ";" :
":"));
arguments.add(cp);
//--verbose
diff --git
a/atomos.utils/atomos.utils.substrate.impl/src/main/java/org/apache/felix/atomos/utils/substrate/impl/NativeImageCliUtil.java
b/atomos.utils/atomos.utils.substrate.impl/src/main/java/org/apache/felix/atomos/utils/substrate/impl/NativeImageCliUtil.java
index 7bbcda2..5b9eee2 100644
---
a/atomos.utils/atomos.utils.substrate.impl/src/main/java/org/apache/felix/atomos/utils/substrate/impl/NativeImageCliUtil.java
+++
b/atomos.utils/atomos.utils.substrate.impl/src/main/java/org/apache/felix/atomos/utils/substrate/impl/NativeImageCliUtil.java
@@ -34,6 +34,17 @@ public class NativeImageCliUtil
private static final String JAVA_HOME = "java.home";
+public static final String OS;
+private static final String EXECUTABLE;
+static {
+ OS = System.getProperty("os.name");
+ EXECUTABLE = isWindows() ? "native-image.cmd" : "native-image";
+}
+
+public static boolean isWindows() {
+ return (OS != null && OS.startsWith("Windows"));
+}
+
public static Path execute(final Path outputDir,
final BaseNativeImageArguments arguments) throws Exception
{
@@ -52,7 +63,11 @@ public class NativeImageCliUtil
+ "' with the path as an environment variable");
}
-final Path resultFile = executionDir.resolve(arguments.name());
+String resultFileName = arguments.name();
+if (isWindows()) {
+ resultFileName += ".exe";
+}
+final Path resultFile = executionDir.resolve(resultFileName);
final List commands = new ArrayList<>();
commands.add(exec.get().toAbsolutePath().toString());
@@ -91,7 +106,7 @@ public class NativeImageCliUtil
{
if (path == null)
{
-Optional oExec =
findNativeImageExecutable(Paths.get("native-image"));
+Optional oExec =
findNativeImageExecutable(Paths.get(EXECUTABLE));
if (oExec.isPresent())
{
return oExec;
@@ -122,7 +137,7 @@ public class NativeImageCliUtil
else if (Files.isDirectory(path))
{
final Optional candidate = findNativeImageExecutable(
-path.resolve("native-image"));
+path.resolve(EXECUTABLE));
if (candidate.isPresent())
{
return candidate;
[felix-atomos] branch master updated: Issue 60 - correctly delegate to platform for modules with no class loader
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-atomos.git
The following commit(s) were added to refs/heads/master by this push:
new 37b19b6 Issue 60 - correctly delegate to platform for modules with no
class loader
new 331939b Merge pull request #61 from tjwatson/issue60
37b19b6 is described below
commit 37b19b6649d3b9ceeec3d0085f116a41c0af4230
Author: Thomas Watson
AuthorDate: Thu Jun 23 14:17:16 2022 -0500
Issue 60 - correctly delegate to platform for modules with no class loader
It seems Module.getClassLoader will return null for boot layer class loaders
We need to just use the platform loader in this case to do proper delegation
If we don't do this the framework will use the Atomos content that wraps
the module content as the source for creating a bundle class loader.
---
.../org/apache/felix/atomos/impl/modules/ConnectContentModule.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/atomos/src/main/java/org/apache/felix/atomos/impl/modules/ConnectContentModule.java
b/atomos/src/main/java/org/apache/felix/atomos/impl/modules/ConnectContentModule.java
index aafaf6c..da389b1 100644
---
a/atomos/src/main/java/org/apache/felix/atomos/impl/modules/ConnectContentModule.java
+++
b/atomos/src/main/java/org/apache/felix/atomos/impl/modules/ConnectContentModule.java
@@ -27,6 +27,7 @@ import org.osgi.framework.connect.ConnectContent;
public class ConnectContentModule implements ConnectContent
{
+ static final ClassLoader platformLoader =
ClassLoader.getPlatformClassLoader();
final Module module;
final ModuleReference reference;
final AtomosLayerModules atomosLayer;
@@ -61,7 +62,7 @@ public class ConnectContentModule implements ConnectContent
@Override
public Optional getClassLoader()
{
-return Optional.ofNullable(module.getClassLoader());
+return Optional.ofNullable(module.getClassLoader()).or(() ->
Optional.of(ConnectContentModule.platformLoader));
}
@Override
svn commit: r55179 - /release/felix/
Author: tjwatson Date: Fri Jun 17 20:32:29 2022 New Revision: 55179 Log: Remove SCR 2.2.0 release Removed: release/felix/org.apache.felix.scr-2.2.0-javadoc.jar release/felix/org.apache.felix.scr-2.2.0-javadoc.jar.asc release/felix/org.apache.felix.scr-2.2.0-javadoc.jar.md5 release/felix/org.apache.felix.scr-2.2.0-javadoc.jar.sha1 release/felix/org.apache.felix.scr-2.2.0-source-release.tar.gz release/felix/org.apache.felix.scr-2.2.0-source-release.tar.gz.asc release/felix/org.apache.felix.scr-2.2.0-source-release.tar.gz.md5 release/felix/org.apache.felix.scr-2.2.0-source-release.tar.gz.sha1 release/felix/org.apache.felix.scr-2.2.0-source-release.zip release/felix/org.apache.felix.scr-2.2.0-source-release.zip.asc release/felix/org.apache.felix.scr-2.2.0-source-release.zip.md5 release/felix/org.apache.felix.scr-2.2.0-source-release.zip.sha1 release/felix/org.apache.felix.scr-2.2.0-sources.jar release/felix/org.apache.felix.scr-2.2.0-sources.jar.asc release/felix/org.apache.felix.scr-2.2.0-sources.jar.md5 release/felix/org.apache.felix.scr-2.2.0-sources.jar.sha1 release/felix/org.apache.felix.scr-2.2.0.jar release/felix/org.apache.felix.scr-2.2.0.jar.asc release/felix/org.apache.felix.scr-2.2.0.jar.md5 release/felix/org.apache.felix.scr-2.2.0.jar.sha1 release/felix/org.apache.felix.scr-2.2.0.pom release/felix/org.apache.felix.scr-2.2.0.pom.asc release/felix/org.apache.felix.scr-2.2.0.pom.md5 release/felix/org.apache.felix.scr-2.2.0.pom.sha1
svn commit: r55178 - /release/felix/
Author: tjwatson Date: Fri Jun 17 20:31:24 2022 New Revision: 55178 Log: SCR 2.2.2 release Added: release/felix/org.apache.felix.scr-2.2.2-javadoc.jar (with props) release/felix/org.apache.felix.scr-2.2.2-javadoc.jar.asc (with props) release/felix/org.apache.felix.scr-2.2.2-javadoc.jar.md5 release/felix/org.apache.felix.scr-2.2.2-javadoc.jar.sha1 release/felix/org.apache.felix.scr-2.2.2-source-release.tar.gz (with props) release/felix/org.apache.felix.scr-2.2.2-source-release.tar.gz.asc (with props) release/felix/org.apache.felix.scr-2.2.2-source-release.tar.gz.md5 release/felix/org.apache.felix.scr-2.2.2-source-release.tar.gz.sha1 release/felix/org.apache.felix.scr-2.2.2-source-release.zip (with props) release/felix/org.apache.felix.scr-2.2.2-source-release.zip.asc (with props) release/felix/org.apache.felix.scr-2.2.2-source-release.zip.md5 release/felix/org.apache.felix.scr-2.2.2-source-release.zip.sha1 release/felix/org.apache.felix.scr-2.2.2-sources.jar (with props) release/felix/org.apache.felix.scr-2.2.2-sources.jar.asc (with props) release/felix/org.apache.felix.scr-2.2.2-sources.jar.md5 release/felix/org.apache.felix.scr-2.2.2-sources.jar.sha1 release/felix/org.apache.felix.scr-2.2.2.jar (with props) release/felix/org.apache.felix.scr-2.2.2.jar.asc (with props) release/felix/org.apache.felix.scr-2.2.2.jar.md5 release/felix/org.apache.felix.scr-2.2.2.jar.sha1 release/felix/org.apache.felix.scr-2.2.2.pom release/felix/org.apache.felix.scr-2.2.2.pom.asc (with props) release/felix/org.apache.felix.scr-2.2.2.pom.md5 release/felix/org.apache.felix.scr-2.2.2.pom.sha1 Added: release/felix/org.apache.felix.scr-2.2.2-javadoc.jar == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.2.2-javadoc.jar -- svn:mime-type = application/zip Added: release/felix/org.apache.felix.scr-2.2.2-javadoc.jar.asc == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.2.2-javadoc.jar.asc -- svn:mime-type = application/pgp-signature Added: release/felix/org.apache.felix.scr-2.2.2-javadoc.jar.md5 == --- release/felix/org.apache.felix.scr-2.2.2-javadoc.jar.md5 (added) +++ release/felix/org.apache.felix.scr-2.2.2-javadoc.jar.md5 Fri Jun 17 20:31:24 2022 @@ -0,0 +1 @@ +2cd4d607083f0cfa4a535b9c751758de \ No newline at end of file Added: release/felix/org.apache.felix.scr-2.2.2-javadoc.jar.sha1 == --- release/felix/org.apache.felix.scr-2.2.2-javadoc.jar.sha1 (added) +++ release/felix/org.apache.felix.scr-2.2.2-javadoc.jar.sha1 Fri Jun 17 20:31:24 2022 @@ -0,0 +1 @@ +a49b1bbab09830a1703549b84e624d95ab1fc509 \ No newline at end of file Added: release/felix/org.apache.felix.scr-2.2.2-source-release.tar.gz == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.2.2-source-release.tar.gz -- svn:mime-type = application/x-gzip Added: release/felix/org.apache.felix.scr-2.2.2-source-release.tar.gz.asc == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.2.2-source-release.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: release/felix/org.apache.felix.scr-2.2.2-source-release.tar.gz.md5 == --- release/felix/org.apache.felix.scr-2.2.2-source-release.tar.gz.md5 (added) +++ release/felix/org.apache.felix.scr-2.2.2-source-release.tar.gz.md5 Fri Jun 17 20:31:24 2022 @@ -0,0 +1 @@ +a35081e18889af77f15aa0b1b115052c \ No newline at end of file Added: release/felix/org.apache.felix.scr-2.2.2-source-release.tar.gz.sha1 == --- release/felix/org.apache.felix.scr-2.2.2-source-release.tar.gz.sha1 (added) +++ release/felix/org.apache.felix.scr-2.2.2-source-release.tar.gz.sha1 Fri Jun 17 20:31:24 2022 @@ -0,0 +1 @@ +f0b492cd05aee40b552843a1609fa8d723f32f40 \ No newline at end of file Added: release/felix/org.apache.felix.scr-2.2.2-source-release.zip == Binary file - no diff available. Propchange
[felix-dev] branch master updated (0d1854ac9a -> 18cd9503c6)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from 0d1854ac9a Update JakartaServlet contract add 51539c90ae Update change log for release add 0e32ad0466 [maven-release-plugin] prepare release org.apache.felix.scr-2.2.2 new 18cd9503c6 [maven-release-plugin] prepare for next development iteration 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: scr/changelog.txt | 8 scr/pom.xml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)
[felix-dev] 01/01: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git commit 18cd9503c6f87e8bb2f29a661c28f402f20f66ae Author: Thomas Watson AuthorDate: Thu Jun 9 11:11:13 2022 -0500 [maven-release-plugin] prepare for next development iteration --- scr/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scr/pom.xml b/scr/pom.xml index 787d684548..6dfcc4eca5 100644 --- a/scr/pom.xml +++ b/scr/pom.xml @@ -30,12 +30,12 @@ Implementation of the Declarative Services specification 1.5 org.apache.felix.scr -2.2.2 +2.2.3-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.scr-2.2.2 + HEAD
[felix-dev] annotated tag org.apache.felix.scr-2.2.2 updated (0e32ad0466 -> 43f71b702b)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to annotated tag org.apache.felix.scr-2.2.2 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.scr-2.2.2 was modified! *** from 0e32ad0466 (commit) to 43f71b702b (tag) tagging 0e32ad04664b19aeba87880eee89a0bb79745fc8 (commit) replaces org.apache.felix.main.distribution-7.0.5 by Thomas Watson on Thu Jun 9 11:11:01 2022 -0500 - Log - [maven-release-plugin] copy for tag org.apache.felix.scr-2.2.2 --- No new revisions were added by this update. Summary of changes:
[felix-atomos] branch master updated (ef300cd -> 5bbca59)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-atomos.git from ef300cd Merge pull request #58 from tjwatson/issue57 new ecc24d5 Fix the jaxrs native build new 3be7973 Fail build if native-image executable is not found. new 5bbca59 Merge pull request #59 from tjwatson/issue57 The 352 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: atomos.examples/atomos.examples.jaxrs/pom.xml | 1 + atomos.examples/atomos.examples.jaxrs/reflectAgentConfig.json | 10 -- .../atomos.examples.jaxrs/reflectConfig_felix_atomos.json | 7 +++ .../reflectConfig_felix_atomos.json | 7 +++ .../utils/core/plugins/finaliser/ni/NativeImagePlugin.java| 11 --- .../felix/atomos/utils/substrate/impl/NativeImageCliUtil.java | 8 6 files changed, 27 insertions(+), 17 deletions(-)
[felix-atomos] branch master updated (ecce585 -> ef300cd)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-atomos.git from ecce585 Hint to use --add-modules=ALL-MODULE-PATH new 77432eb Update dependencies for equinox and log new 114842f Use native-maven-plugin for graalvm native builds new e51500d Fix native plugin for Graal VM 22.1 new 38890e4 Add org.eclipse.jetty.util.ModuleLocation for the maven example new ef300cd Merge pull request #58 from tjwatson/issue57 The 349 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: atomos-parent/pom.xml | 4 ++-- atomos.examples/atomos.examples.substrate.lib/pom.xml | 10 ++ atomos.examples/atomos.examples.substrate.maven/pom.xml| 1 + .../felix/atomos/utils/substrate/impl/NativeImageCliUtil.java | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-)
[felix-atomos] branch master updated: Hint to use --add-modules=ALL-MODULE-PATH
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-atomos.git The following commit(s) were added to refs/heads/master by this push: new ecce585 Hint to use --add-modules=ALL-MODULE-PATH ecce585 is described below commit ecce5855e19d2758921ed9e7dd4f6ce949852a4a Author: Thomas Watson AuthorDate: Thu May 5 11:08:55 2022 -0500 Hint to use --add-modules=ALL-MODULE-PATH Without --add-modules=ALL-MODULE-PATH only the required modules for the module specified with `-m` are loaded. --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3fad5b7..df4fdcd 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,9 @@ The `Atomos` class provides a convenient way to launch an OSGi framework impleme The following `java` command can be run using the module path: -`java -p bundles -m org.apache.felix.atomos` +`java --add-modules=ALL-MODULE-PATH -p bundles -m org.apache.felix.atomos` + +Note that for module path usage the Java option `--add-modules=ALL-MODULE-PATH` is used to enable all modules found in the `bundles/` directory to be loaded into the Java module system. In both cases Atomos will discover all the JARs contained in the `bundles/` directory. For each bundle JAR included in `bundles/` the launcher will install and start each bundle in an OSGi framework instance. The bundles are loaded using the class loader provided by the JVM itself. In this case the framework is not in control of the class loading for the bundles contained on the class path or the module path.
[felix-dev] branch master updated: FELIX-6521 - Stop exporting org.osgi.service.component packages
This is an automated email from the ASF dual-hosted git repository. tjwatson 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 bb03476133 FELIX-6521 - Stop exporting org.osgi.service.component packages new dc0d442ed4 Merge pull request #145 from tjwatson/importComponentPackages bb03476133 is described below commit bb03476133c54babb184c0f33af0f5005d4a5fcf Author: Thomas Watson AuthorDate: Mon Apr 25 10:01:51 2022 -0500 FELIX-6521 - Stop exporting org.osgi.service.component packages Require the spec package org.osgi.service.component and its subpackages to be imported. --- scr/bnd.bnd | 5 + .../java/org/apache/felix/scr/integration/ComponentTestBase.java | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/scr/bnd.bnd b/scr/bnd.bnd index 72a5c1ed6c..f42aaf5beb 100644 --- a/scr/bnd.bnd +++ b/scr/bnd.bnd @@ -14,10 +14,7 @@ Require-Capability: osgi.ee;\ filter:="(|(&(osgi.ee=JavaSE)(version=1.7))(&(osgi.ee=JavaSE/compact1)(version=1.8)))" Export-Package: org.apache.felix.scr.component;version=1.1.0;provide:=true, \ - org.apache.felix.scr.info;version=1.0.0;provide:=true, \ - org.osgi.service.component;version=1.5;provide:=true, \ - org.osgi.service.component.runtime;version=1.5;provide:=true, \ - org.osgi.service.component.runtime.dto;version=1.5;provide:=true + org.apache.felix.scr.info;version=1.0.0;provide:=true Private-Package: org.apache.felix.scr.impl.* diff --git a/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java b/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java index bab72bc0b7..39724c1b0f 100644 --- a/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java +++ b/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java @@ -190,6 +190,7 @@ public abstract class ComponentTestBase mavenBundle( "org.apache.felix", "org.apache.felix.configadmin", felixCaVersion ) ), mavenBundle( "org.osgi", "org.osgi.util.promise"), mavenBundle( "org.osgi", "org.osgi.util.function"), +mavenBundle( "org.osgi", "org.osgi.service.component"), mavenBundle( "org.ops4j.pax.url", "pax-url-aether"), junitBundles(), frameworkProperty( "org.osgi.framework.bsnversion" ).value( bsnVersionUniqueness ), systemProperty( "ds.factory.enabled" ).value( Boolean.toString( NONSTANDARD_COMPONENT_FACTORY_BEHAVIOR ) ),
[felix-dev] branch master updated: Replace use of PackageAdmin with FrameworkWiring
This is an automated email from the ASF dual-hosted git repository.
tjwatson 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 8ee5835206 Replace use of PackageAdmin with FrameworkWiring
new 99d55010de Merge pull request #144 from tjwatson/scrRemovePackageAdmin
8ee5835206 is described below
commit 8ee58352065c94620af3e14dce555c78d8498c52
Author: Thomas Watson
AuthorDate: Fri Apr 22 14:29:07 2022 -0500
Replace use of PackageAdmin with FrameworkWiring
---
scr/bnd.bnd| 3 -
.../java/org/apache/felix/scr/impl/Activator.java | 14 +-
.../scr/impl/config/ScrConfigurationImpl.java | 8 +-
.../felix/scr/impl/config/ScrManagedService.java | 2 +-
.../felix/scr/impl/inject/internal/ClassUtils.java | 166 -
5 files changed, 104 insertions(+), 89 deletions(-)
diff --git a/scr/bnd.bnd b/scr/bnd.bnd
index 6b1f5e1388..72a5c1ed6c 100644
--- a/scr/bnd.bnd
+++ b/scr/bnd.bnd
@@ -24,14 +24,11 @@ Private-Package: org.apache.felix.scr.impl.*
# Configuration Admin is optional and dynamic, but allow eager wiring by
importing it
# LogService is optional but if present the R7.0 version 1.4 is sufficient.
# Metatype import is optional and dynamic, but allow eager wiring by importing
it
-# PackageAdmin is used to find reference types if the component's bundle does
not import it.
-#R4.0 version 1.2 is sufficient.
# optional import for Gogo annotations
Import-Package: \
org.osgi.service.cm;version="[1.6,2)";resolution:=optional, \
org.osgi.service.log;version="[1.4,2)";resolution:=optional, \
org.osgi.service.metatype;version="[1.2,2)";resolution:=optional, \
- org.osgi.service.packageadmin;version="[1.2,2)";resolution:=optional,\
org.apache.felix.service.command;resolution:=optional, \
*
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
b/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
index 05a5d8a718..0cfde4ea08 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
@@ -61,6 +61,7 @@ import org.osgi.framework.ServiceRegistration;
import org.osgi.framework.wiring.BundleRevision;
import org.osgi.framework.wiring.BundleWire;
import org.osgi.framework.wiring.BundleWiring;
+import org.osgi.framework.wiring.FrameworkWiring;
import org.osgi.namespace.extender.ExtenderNamespace;
import org.osgi.service.component.ComponentConstants;
import org.osgi.service.component.runtime.ServiceComponentRuntime;
@@ -121,8 +122,7 @@ public class Activator extends AbstractExtender
m_context = context;
m_bundle = context.getBundle();
m_trueCondition = findTrueCondition(context);
-// set bundle context for PackageAdmin tracker
-ClassUtils.setBundleContext( context );
+
ClassUtils.setFrameworkWiring(context.getBundle(Constants.SYSTEM_BUNDLE_LOCATION).adapt(FrameworkWiring.class));
// get the configuration
m_configuration.start( m_context ); //this will call restart, which
calls super.start.
}
@@ -155,7 +155,7 @@ public class Activator extends AbstractExtender
}
}
-public void restart(boolean globalExtender)
+public void restart(boolean globalExtender, boolean initialStart)
{
m_componentMetadataStore = load(m_context, logger,
m_configuration.cacheMetadata());
@@ -168,14 +168,14 @@ public class Activator extends AbstractExtender
{
m_globalContext = m_context;
}
-if ( ClassUtils.m_packageAdmin != null )
+if (!initialStart)
{
logger.log(Level.INFO,
"Stopping to restart with new globalExtender setting: {0}",
null,
globalExtender);
-//this really is a restart, not the initial start
-// the initial start where m_globalContext is null should skip
this as m_packageAdmin should not yet be set.
+// this really is a restart, not the initial start;
+// first stop the extender
try
{
super.stop( context );
@@ -417,7 +417,7 @@ public class Activator extends AbstractExtender
m_componentActor.terminate();
m_componentActor = null;
}
-ClassUtils.close();
+ClassUtils.setFrameworkWiring(null);
}
//-- Component Management -
diff --git
a/scr/src/main/java/org/apache/felix/scr/impl/config/ScrConfigurationImpl.java
b/scr/src/main/java/org/apache/felix/scr/impl/config/ScrConfigurationImpl.java
index 9a0417ab6a..2e7aadf377 100644
---
a/scr/src/main/java/org/apache/felix/scr/impl/config/ScrConfigurationImpl.java
+++
b/scr/src/main/java/org
[felix-dev] branch master updated: FELIX-6511: Cancel the SCR Component Registry's changeCountTimer on deactivation.
This is an automated email from the ASF dual-hosted git repository.
tjwatson 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 ce1c7a9 FELIX-6511: Cancel the SCR Component Registry's
changeCountTimer on deactivation.
new f3597cc Merge pull request #131 from chrisr3/chrisr3-scr-shutdown
ce1c7a9 is described below
commit ce1c7a9b8483e24d1e489d6edc8a2776f5df348b
Author: Chris Rankin
AuthorDate: Fri Mar 11 11:54:18 2022 +
FELIX-6511: Cancel the SCR Component Registry's changeCountTimer on
deactivation.
---
scr/src/main/java/org/apache/felix/scr/impl/Activator.java | 1 +
.../main/java/org/apache/felix/scr/impl/ComponentRegistry.java | 9 -
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
b/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
index 71b4f05..05a5d8a 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
@@ -407,6 +407,7 @@ public class Activator extends AbstractExtender
// dispose component registry
if ( m_componentRegistry != null )
{
+m_componentRegistry.shutdown();
m_componentRegistry = null;
}
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java
b/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java
index 7169f87..a4cb54d 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java
@@ -732,7 +732,7 @@ public class ComponentRegistry
final Timer timer;
synchronized ( this.changeCountTimerLock ) {
if ( this.changeCountTimer == null ) {
-this.changeCountTimer = new Timer();
+this.changeCountTimer = new Timer("SCR Component
Registry", true);
}
timer = this.changeCountTimer;
}
@@ -774,4 +774,11 @@ public class ComponentRegistry
}
}
}
+
+public void shutdown() {
+final Timer timer = changeCountTimer;
+if (timer != null) {
+timer.cancel();
+}
+}
}
[felix-antora-site] branch main updated: SCR 2.2.0
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/felix-antora-site.git The following commit(s) were added to refs/heads/main by this push: new 8647e11 SCR 2.2.0 8647e11 is described below commit 8647e110ab16e20eae5cf403bb2601bf6c825fe8 Author: Thomas Watson AuthorDate: Wed Feb 23 08:54:55 2022 -0600 SCR 2.2.0 --- downloads.list | 2 +- modules/ROOT/examples/downloads.yml | 2 +- modules/ROOT/pages/news.adoc| 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/downloads.list b/downloads.list index 4ac2a2e..28855a5 100644 --- a/downloads.list +++ b/downloads.list @@ -95,7 +95,7 @@ OSGi OBR service API|org.osgi.service.obr|1.0.2|project||doc/changelog.txt Preferences|org.apache.felix.prefs|1.1.0 Remote Shell|org.apache.felix.shell.remote|1.1.2|project||doc/changelog.txt Resolver|org.apache.felix.resolver|2.0.2|||doc/changelog.txt -SCR (Declarative Services)|org.apache.felix.scr|2.1.26 +SCR (Declarative Services)|org.apache.felix.scr|2.2.0 SCR Compat (Declarative Services)|org.apache.felix.scr.compat|1.0.4 SCR Annotations|org.apache.felix.scr.annotations|1.12.0 SCR DS Annotations|org.apache.felix.scr.ds-annotations|1.2.10 diff --git a/modules/ROOT/examples/downloads.yml b/modules/ROOT/examples/downloads.yml index 210833f..2d41c92 100644 --- a/modules/ROOT/examples/downloads.yml +++ b/modules/ROOT/examples/downloads.yml @@ -264,7 +264,7 @@ subprojects: - title: SCR (Declarative Services) artifactId: org.apache.felix.scr -version: 2.1.26 +version: 2.2.0 source_classifier: source-release changelog: felix-dev/blob/master/scr/changelog.txt diff --git a/modules/ROOT/pages/news.adoc b/modules/ROOT/pages/news.adoc index 82164f4..3ab6dcd 100644 --- a/modules/ROOT/pages/news.adoc +++ b/modules/ROOT/pages/news.adoc @@ -1,5 +1,7 @@ = News + +* Apache Felix SCR 2.2.0 (February 23rd) * Apache Felix Http Jetty 4.2.0, Http Servlet API 1.2.0, Http Bridge 4.2.0, and Http Base 4.2.0 (February 20th) * Apache Felix Health Check Core 2.0.14 (February 17th, 2022) * Apache Felix Health Check Core 2.0.12, Health Check General Checks 3.0.0 (January 3rd, 2022)
svn commit: r52710 - /release/felix/
Author: tjwatson Date: Wed Feb 23 14:44:00 2022 New Revision: 52710 Log: SCR 2.2.2 release Added: release/felix/org.apache.felix.scr-2.2.0-javadoc.jar (with props) release/felix/org.apache.felix.scr-2.2.0-javadoc.jar.asc release/felix/org.apache.felix.scr-2.2.0-javadoc.jar.md5 release/felix/org.apache.felix.scr-2.2.0-javadoc.jar.sha1 release/felix/org.apache.felix.scr-2.2.0-source-release.tar.gz (with props) release/felix/org.apache.felix.scr-2.2.0-source-release.tar.gz.asc release/felix/org.apache.felix.scr-2.2.0-source-release.tar.gz.md5 release/felix/org.apache.felix.scr-2.2.0-source-release.tar.gz.sha1 release/felix/org.apache.felix.scr-2.2.0-source-release.zip (with props) release/felix/org.apache.felix.scr-2.2.0-source-release.zip.asc release/felix/org.apache.felix.scr-2.2.0-source-release.zip.md5 release/felix/org.apache.felix.scr-2.2.0-source-release.zip.sha1 release/felix/org.apache.felix.scr-2.2.0-sources.jar (with props) release/felix/org.apache.felix.scr-2.2.0-sources.jar.asc release/felix/org.apache.felix.scr-2.2.0-sources.jar.md5 release/felix/org.apache.felix.scr-2.2.0-sources.jar.sha1 release/felix/org.apache.felix.scr-2.2.0.jar (with props) release/felix/org.apache.felix.scr-2.2.0.jar.asc release/felix/org.apache.felix.scr-2.2.0.jar.md5 release/felix/org.apache.felix.scr-2.2.0.jar.sha1 release/felix/org.apache.felix.scr-2.2.0.pom release/felix/org.apache.felix.scr-2.2.0.pom.asc release/felix/org.apache.felix.scr-2.2.0.pom.md5 release/felix/org.apache.felix.scr-2.2.0.pom.sha1 Removed: release/felix/org.apache.felix.scr-2.1.30-javadoc.jar release/felix/org.apache.felix.scr-2.1.30-javadoc.jar.asc release/felix/org.apache.felix.scr-2.1.30-javadoc.jar.md5 release/felix/org.apache.felix.scr-2.1.30-javadoc.jar.sha1 release/felix/org.apache.felix.scr-2.1.30-source-release.tar.gz release/felix/org.apache.felix.scr-2.1.30-source-release.tar.gz.asc release/felix/org.apache.felix.scr-2.1.30-source-release.tar.gz.md5 release/felix/org.apache.felix.scr-2.1.30-source-release.tar.gz.sha1 release/felix/org.apache.felix.scr-2.1.30-source-release.zip release/felix/org.apache.felix.scr-2.1.30-source-release.zip.asc release/felix/org.apache.felix.scr-2.1.30-source-release.zip.md5 release/felix/org.apache.felix.scr-2.1.30-source-release.zip.sha1 release/felix/org.apache.felix.scr-2.1.30-sources.jar release/felix/org.apache.felix.scr-2.1.30-sources.jar.asc release/felix/org.apache.felix.scr-2.1.30-sources.jar.md5 release/felix/org.apache.felix.scr-2.1.30-sources.jar.sha1 release/felix/org.apache.felix.scr-2.1.30.jar release/felix/org.apache.felix.scr-2.1.30.jar.asc release/felix/org.apache.felix.scr-2.1.30.jar.md5 release/felix/org.apache.felix.scr-2.1.30.jar.sha1 release/felix/org.apache.felix.scr-2.2.0-RC1-javadoc.jar 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 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 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 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 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-javadoc.jar == Binary file - no diff available. Propchange: release/felix/org.apache.felix.scr-2.2.0-javadoc.jar -- svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.scr-2.2.0-javadoc.jar.asc == --- release/felix/org.apache.felix.scr-2.2.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. tjwatson 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 e693156 [maven-release-plugin] prepare for next development iteration e693156 is described below commit e69315666ea326d09ce56e9ccbc712253becc585 Author: Thomas Watson AuthorDate: Tue Feb 1 13:28:35 2022 -0600 [maven-release-plugin] prepare for next development iteration --- scr/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scr/pom.xml b/scr/pom.xml index c61de64..0056ab7 100644 --- a/scr/pom.xml +++ b/scr/pom.xml @@ -30,12 +30,12 @@ Implementation of the Declarative Services specification 1.5 org.apache.felix.scr -2.2.0 +2.2.1-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.scr-2.2.0 + HEAD
[felix-dev] annotated tag org.apache.felix.scr-2.2.0 updated (b5c220d -> c658e64)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to annotated tag org.apache.felix.scr-2.2.0 in repository https://gitbox.apache.org/repos/asf/felix-dev.git. *** WARNING: tag org.apache.felix.scr-2.2.0 was modified! *** from b5c220d (commit) to c658e64 (tag) tagging b5c220d64ea4251f3abe40b6713aac0717d1173c (commit) replaces org.apache.felix.fileinstall-3.7.4 by Thomas Watson on Tue Feb 1 13:28:33 2022 -0600 - Log - [maven-release-plugin] copy for tag org.apache.felix.scr-2.2.0 --- No new revisions were added by this update. Summary of changes:
[felix-dev] branch master updated (6d19201 -> b5c220d)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git. from 6d19201 Merge pull request #128 from amitjoy/bugfix/FELIX-6501 add e066891 Prepare for release add 4750d8f Update changelog for release add b5c220d [maven-release-plugin] prepare release org.apache.felix.scr-2.2.0 No new revisions were added by this update. Summary of changes: scr/changelog.txt | 9 + scr/pom.xml | 4 ++-- scr/src/main/appended-resources/META-INF/DEPENDENCIES | 6 ++ 3 files changed, 17 insertions(+), 2 deletions(-)
[felix-dev] branch master updated: [FELIX-6501] Fixed issue with ConcurrentModificationException
This is an automated email from the ASF dual-hosted git repository.
tjwatson 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 65c7d77 [FELIX-6501] Fixed issue with ConcurrentModificationException
new 6d19201 Merge pull request #128 from amitjoy/bugfix/FELIX-6501
65c7d77 is described below
commit 65c7d7704996b5c656447ec425c83093a15a52df
Author: Amit Kumar Mondal
AuthorDate: Tue Feb 1 17:03:12 2022 +0100
[FELIX-6501] Fixed issue with ConcurrentModificationException
---
.../org/apache/felix/scr/impl/manager/ComponentContextImpl.java | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git
a/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentContextImpl.java
b/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentContextImpl.java
index ff0616b..4ca1d85 100644
---
a/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentContextImpl.java
+++
b/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentContextImpl.java
@@ -19,11 +19,11 @@
package org.apache.felix.scr.impl.manager;
-import java.util.Collections;
+import java.util.Comparator;
import java.util.Dictionary;
import java.util.HashMap;
import java.util.Map;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -334,6 +334,9 @@ public class ComponentContextImpl implements
ScrComponentContext {
private Map, Object> createNewFieldHandlerMap()
{
-return Collections.synchronizedMap(new TreeMap<>((o1, o2) ->
o1.getRef().compareTo(o2.getRef(;
+// it's not safe to use synchronized map to prevent concurrent
modification exceptions
+// hence, concurrent collection is used as it provides higher
concurrency and scalability
+// while preserving thread safety
+return new
ConcurrentSkipListMap<>(Comparator.comparing(RefPair::getRef));
}
}
[felix-atomos] branch master updated: Enable github issues for Atomos
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-atomos.git The following commit(s) were added to refs/heads/master by this push: new 9376200 Enable github issues for Atomos 9376200 is described below commit 9376200ca1a11183a5ebfe3ddb6e582a7652f073 Author: Thomas Watson AuthorDate: Fri Jan 21 07:36:17 2022 -0600 Enable github issues for Atomos --- .asf.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.asf.yaml b/.asf.yaml index 9bffbe1..18180d9 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -7,4 +7,6 @@ github: - jlink - substrate ghp_branch: gh-pages + features: +issues: true
[felix-atomos] branch master updated: Fix case where directory content lookup can break out
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-atomos.git
The following commit(s) were added to refs/heads/master by this push:
new 7169b71 Fix case where directory content lookup can break out
new a59b561 Merge pull request #49 from tjwatson/fixContentBreakOut
7169b71 is described below
commit 7169b7197041da8335c6e11effec3467a8ec7405
Author: Thomas Watson
AuthorDate: Thu Jan 13 08:39:17 2022 -0600
Fix case where directory content lookup can break out
---
.../atomos/impl/content/ConnectContentFile.java| 34 +++-
.../impl/content/ConnectContentFileTest.java | 46 ++
2 files changed, 71 insertions(+), 9 deletions(-)
diff --git
a/atomos/src/main/java/org/apache/felix/atomos/impl/content/ConnectContentFile.java
b/atomos/src/main/java/org/apache/felix/atomos/impl/content/ConnectContentFile.java
index 5194505..6c9a7d3 100644
---
a/atomos/src/main/java/org/apache/felix/atomos/impl/content/ConnectContentFile.java
+++
b/atomos/src/main/java/org/apache/felix/atomos/impl/content/ConnectContentFile.java
@@ -136,21 +136,37 @@ public class ConnectContentFile implements ConnectContent
{
return Optional.empty();
}
-if (path.contains(POINTER_UPPER_DIRECTORY))
+if (path.contains(POINTER_UPPER_DIRECTORY) && !isInContent(file))
{
-try
+return Optional.empty();
+}
+return Optional.of(file);
+}
+
+boolean isInContent(File file)
+{
+try
+{
+String canonicalizedRoot = root.getCanonicalPath();
+if (!canonicalizedRoot.endsWith(File.separator))
{
-if
(!file.getCanonicalPath().startsWith(root.getCanonicalPath()))
-{
-return Optional.empty();
-}
+canonicalizedRoot += File.separator;
+}
+String canonicalizedChild = file.getCanonicalPath();
+if (file.isDirectory() &&
!canonicalizedChild.endsWith(File.separator))
+{
+canonicalizedChild += File.separator;
}
-catch (IOException e)
+if (!canonicalizedChild.startsWith(canonicalizedRoot))
{
-return Optional.empty();
+return false;
}
}
-return Optional.of(file);
+catch (IOException e)
+{
+return false;
+}
+return true;
}
@Override
diff --git
a/atomos/src/test/java/org/apache/felix/atomos/impl/content/ConnectContentFileTest.java
b/atomos/src/test/java/org/apache/felix/atomos/impl/content/ConnectContentFileTest.java
new file mode 100644
index 000..8476ed3
--- /dev/null
+++
b/atomos/src/test/java/org/apache/felix/atomos/impl/content/ConnectContentFileTest.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed 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.atomos.impl.content;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Optional;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.osgi.framework.connect.ConnectContent;
+import org.osgi.framework.connect.ConnectContent.ConnectEntry;
+
+public class ConnectContentFileTest
+{
+@Test
+void testBreakout(@TempDir Path tmpDir) throws IOException
+{
+Files.createDirectories(tmpDir);
+Path content1 = tmpDir.resolve("testcontent");
+Path content2 = tmpDir.resolve("testcontentbreakout");
+Files.createDirectory(content1);
+Files.createDirectory(content2);
+Path file = content2.resolve("file");
+Files.createFile(file);
+ConnectContent connectContent = new
ConnectContentFile(content1.toFile(),
+Optional::empty);
+Optional entry = connectContent.getEntry(
+"../testcontentbreakout/file");
+assertTrue(entry.isEmpty(), "Found unexpected entry.");
+}
+}
[felix-atomos] 01/01: Merge pull request #48 from apache/issues/felix703
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-atomos.git commit 65a5f2a97616d45bb8b65c2cfeaec43d365859c6 Merge: 987492e d8deda3 Author: Thomas Watson AuthorDate: Mon Jan 10 12:42:34 2022 -0600 Merge pull request #48 from apache/issues/felix703 Update to latest framework implementations atomos-parent/pom.xml | 4 +- atomos.examples/atomos.examples.jlink/pom.xml | 212 +- 2 files changed, 5 insertions(+), 211 deletions(-)
[felix-atomos] branch master updated (987492e -> 65a5f2a)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-atomos.git. from 987492e Update to Felix SCR 2.1.26 release add 88d14bf Update to felix 7.0.3 add d8deda3 Update to Equinox framework 3.17.100 new 65a5f2a Merge pull request #48 from apache/issues/felix703 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: atomos-parent/pom.xml | 4 +- atomos.examples/atomos.examples.jlink/pom.xml | 212 +- 2 files changed, 5 insertions(+), 211 deletions(-)
[felix-atomos] branch issues/felix703 updated (88d14bf -> d8deda3)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to branch issues/felix703 in repository https://gitbox.apache.org/repos/asf/felix-atomos.git. from 88d14bf Update to felix 7.0.3 add d8deda3 Update to Equinox framework 3.17.100 No new revisions were added by this update. Summary of changes: atomos-parent/pom.xml | 2 +- atomos.examples/atomos.examples.jlink/pom.xml | 139 +- 2 files changed, 3 insertions(+), 138 deletions(-)
[felix-dev] 01/02: Merge branch 'scrR8'
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git commit 6591e106369e346e483fad13f12007302f232452 Merge: 3bac62e 4e8021e Author: Thomas Watson AuthorDate: Thu Dec 9 09:59:26 2021 -0600 Merge branch 'scrR8' scr/bnd.bnd| 8 +- scr/changelog.txt | 4 + scr/pom.xml| 14 +- .../java/org/apache/felix/scr/impl/Activator.java | 40 +++- .../felix/scr/impl/BundleComponentActivator.java | 15 +- .../apache/felix/scr/impl/helper/Coercions.java| 2 + .../impl/helper/ComponentServiceObjectsHelper.java | 85 +++ .../felix/scr/impl/inject/ScrComponentContext.java | 2 + .../apache/felix/scr/impl/inject/ValueUtils.java | 140 +++- .../felix/scr/impl/inject/field/FieldHandler.java | 55 +++-- .../felix/scr/impl/inject/internal/ClassUtils.java | 6 +- .../inject/internal/ComponentConstructorImpl.java | 19 +- .../scr/impl/inject/methods/ActivateMethod.java| 3 +- .../felix/scr/impl/inject/methods/BaseMethod.java | 8 +- .../felix/scr/impl/inject/methods/BindMethod.java | 3 +- .../SuitableMethodNotAccessibleException.java | 1 + .../scr/impl/manager/AbstractComponentManager.java | 9 +- .../scr/impl/manager/AbstractPrototypeRefPair.java | 1 - .../felix/scr/impl/manager/ComponentActivator.java | 2 + .../scr/impl/manager/ComponentContextImpl.java | 6 + .../scr/impl/manager/ComponentFactoryImpl.java | 2 +- .../impl/manager/ConfigurableComponentHolder.java | 12 +- .../felix/scr/impl/manager/DependencyManager.java | 134 +++ .../scr/impl/manager/ExtendedServiceEvent.java | 3 +- .../PrototypeServiceFactoryComponentManager.java | 2 +- .../manager/ServiceFactoryComponentManager.java| 2 +- .../felix/scr/impl/manager/ServiceTracker.java | 62 +++-- .../scr/impl/manager/SingleComponentManager.java | 6 +- .../felix/scr/impl/metadata/ComponentMetadata.java | 14 +- .../apache/felix/scr/impl/metadata/DSVersion.java | 8 +- .../felix/scr/impl/metadata/PropertyMetadata.java | 16 ++ .../felix/scr/impl/metadata/ReferenceMetadata.java | 69 ++ .../impl/runtime/ServiceComponentRuntimeImpl.java | 78 +-- .../apache/felix/scr/impl/xml/XmlConstants.java| 4 + .../org/apache/felix/scr/impl/xml/XmlHandler.java | 41 +++- .../scr/impl/BundleComponentActivatorTest.java | 8 +- .../felix/scr/impl/ComponentRegistryKeyTest.java | 2 +- .../java/org/apache/felix/scr/impl/MockBundle.java | 45 +++- .../scr/impl/inject/internal/AnnotationTest.java | 1 - .../impl/inject/methods/ActivateMethodTest.java| 43 ++-- .../scr/impl/inject/methods/BindMethodTest.java| 26 +-- .../manager/ConfiguredComponentHolderTest.java | 67 +++--- .../scr/impl/manager/RegistrationManagerTest.java | 3 +- .../impl/manager/SingleComponentManagerTest.java | 28 ++- .../felix/scr/impl/manager/components/T1.java | 37 +-- .../felix/scr/impl/manager/components/T1MapSR.java | 2 +- .../felix/scr/impl/manager/components2/T2.java | 19 +- .../felix/scr/impl/metadata/ComponentBase.java | 24 +- .../impl/metadata/ComponentMetaDataCacheTest.java | 6 +- .../scr/impl/metadata/ComponentMetadataTest.java | 3 +- .../felix/scr/impl/metadata/XmlHandlerTest.java| 97 .../scr/impl/metadata/instances/AcceptMethod.java | 2 + .../scr/impl/metadata/instances/BaseObject.java| 7 +- .../scr/impl/metadata/instances/Level1Object.java | 3 +- .../scr/impl/metadata/instances/Level3Object.java | 7 +- .../scr/impl/metadata/instances2/Level2Object.java | 11 +- .../runtime/ServiceComponentRuntimeImplTest.java | 9 +- .../apache/felix/scr/impl/xml/XmlHandlerTest.java | 70 +- .../scr/integration/AnyServiceReferenceTest.java | 254 + .../scr/integration/CircularReferenceTest.java | 4 +- .../scr/integration/ComponentConstructorTest.java | 2 +- .../scr/integration/ComponentDisposeTest.java | 2 +- .../scr/integration/ComponentFactoryTest.java | 27 ++- .../scr/integration/ComponentOptionalTest.java | 216 ++ .../felix/scr/integration/ComponentTestBase.java | 36 +-- .../scr/integration/ConfigurationChangeTest.java | 8 +- .../ConfigurationComponentFactoryTest.java | 3 +- .../felix/scr/integration/Felix3680_2Test.java | 4 +- .../felix/scr/integration/Felix4188Test.java | 2 +- .../felix/scr/integration/Felix4350Test.java | 18 +- .../felix/scr/integration/Felix4984Test.java | 16 +- .../felix/scr/integration/Felix5248Test.java | 2 + .../felix/scr/integration/Felix5276Test.java | 1 + .../felix/scr/integration/Felix5356Test.java | 4 +- .../felix/scr/integration/Felix627
[felix-dev] branch master updated (3bac62e -> e34274d)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git. from 3bac62e FELIX-6482 : Root directory used if location for multipart is set to empty string add 49599cc Update minor version for OSGi R8 SCR implementation add b186ccc Merge branch 'master' into scrR8 add 35c51c7 OSGi R8 - Add support for satisfying condition add 6afbad6 Merge branch 'master' into scrR8 add 7898ad9 Add DS namespace version 1.5.0 for OSGi R8 add 7723726 Move satisfying condition tests to integration tests add 5b25fb8 Add support for AnyService add ce11b7a Fix compile warnings in SCR add 44c33f3 Merge branch 'master' into scrR8 add ee34b77 Update SCR capability versions to DS spec version 1.5 add f343822 Merge branch 'master' into scrR8 add 9ab0150 Merge branch 'master' into scrR8 add c107424 Force Java 8 compiler add 5d167e2 Add support for Optional to be injected add 2de0937 Merge branch 'master' into scrR8 add e1b5490 Merge branch 'master' into scrR8 add 6701c6c Add Optional service injection tests add bd2823a Use the correct target when missing any service target add 4bdb29f Fix for field-collection-type attribute for injection to Optional add a86ef80 Add implicit target property as first in the list of properties add b503f5d Reference target attributes must not override component properties add 4f2f15e Merge branch 'master' into scrR8 add cc4d67d [SCR] Update OSGi API dependency to R8 RC1 add ea98e8b Update change log for SCR 2.2.0-RC1 add bcb93e5 [maven-release-plugin] prepare release org.apache.felix.scr-2.2.0-RC1 add 70ed0d6 [maven-release-plugin] prepare for next development iteration add 4e8021e FELIX-6458 : (#101) new 6591e10 Merge branch 'scrR8' new e34274d Bump org.osgi.service.component to final version for R8 The 2 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: scr/bnd.bnd| 8 +- scr/changelog.txt | 4 + scr/pom.xml| 14 +- .../java/org/apache/felix/scr/impl/Activator.java | 40 +++- .../felix/scr/impl/BundleComponentActivator.java | 15 +- .../apache/felix/scr/impl/helper/Coercions.java| 2 + .../impl/helper/ComponentServiceObjectsHelper.java | 85 +++ .../felix/scr/impl/inject/ScrComponentContext.java | 2 + .../apache/felix/scr/impl/inject/ValueUtils.java | 140 +++- .../felix/scr/impl/inject/field/FieldHandler.java | 55 +++-- .../felix/scr/impl/inject/internal/ClassUtils.java | 6 +- .../inject/internal/ComponentConstructorImpl.java | 19 +- .../scr/impl/inject/methods/ActivateMethod.java| 3 +- .../felix/scr/impl/inject/methods/BaseMethod.java | 8 +- .../felix/scr/impl/inject/methods/BindMethod.java | 3 +- .../SuitableMethodNotAccessibleException.java | 1 + .../scr/impl/manager/AbstractComponentManager.java | 9 +- .../scr/impl/manager/AbstractPrototypeRefPair.java | 1 - .../felix/scr/impl/manager/ComponentActivator.java | 2 + .../scr/impl/manager/ComponentContextImpl.java | 6 + .../scr/impl/manager/ComponentFactoryImpl.java | 2 +- .../impl/manager/ConfigurableComponentHolder.java | 12 +- .../felix/scr/impl/manager/DependencyManager.java | 134 +++ .../scr/impl/manager/ExtendedServiceEvent.java | 3 +- .../PrototypeServiceFactoryComponentManager.java | 2 +- .../manager/ServiceFactoryComponentManager.java| 2 +- .../felix/scr/impl/manager/ServiceTracker.java | 62 +++-- .../scr/impl/manager/SingleComponentManager.java | 6 +- .../felix/scr/impl/metadata/ComponentMetadata.java | 14 +- .../apache/felix/scr/impl/metadata/DSVersion.java | 8 +- .../felix/scr/impl/metadata/PropertyMetadata.java | 16 ++ .../felix/scr/impl/metadata/ReferenceMetadata.java | 69 ++ .../impl/runtime/ServiceComponentRuntimeImpl.java | 78 +-- .../apache/felix/scr/impl/xml/XmlConstants.java| 4 + .../org/apache/felix/scr/impl/xml/XmlHandler.java | 41 +++- .../scr/impl/BundleComponentActivatorTest.java | 8 +- .../felix/scr/impl/ComponentRegistryKeyTest.java | 2 +- .../java/org/apache/felix/scr/impl/MockBundle.java | 45 +++- .../scr/impl/inject/internal/AnnotationTest.java | 1 - .../impl/inject/methods/ActivateMethodTest.java| 43 ++-- .../scr/impl/inject/methods/BindMethodTest.java| 26 +-- .../manager/ConfiguredComponentH
[felix-dev] 02/02: Bump org.osgi.service.component to final version for R8
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git commit e34274d38ab29b017f265839c57fb82f9e789040 Author: Thomas Watson AuthorDate: Thu Dec 9 15:44:44 2021 -0600 Bump org.osgi.service.component to final version for R8 OSGi R8 final version is 1.5.0 --- scr/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scr/pom.xml b/scr/pom.xml index f96db8a..4512d9a 100644 --- a/scr/pom.xml +++ b/scr/pom.xml @@ -91,7 +91,7 @@ org.osgi org.osgi.service.component -1.5.0-RC1 +1.5.0 provided
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 scrR8 updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch scrR8 in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/scrR8 by this push: new 70ed0d6 [maven-release-plugin] prepare for next development iteration 70ed0d6 is described below commit 70ed0d6bbf540d99ea19fa60ef51e5118cf41f23 Author: Thomas Watson AuthorDate: Fri Sep 3 12:31:40 2021 -0500 [maven-release-plugin] prepare for next development iteration --- scr/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scr/pom.xml b/scr/pom.xml index 56e2282..8208173 100644 --- a/scr/pom.xml +++ b/scr/pom.xml @@ -30,12 +30,12 @@ Implementation of the Declarative Services specification 1.5 org.apache.felix.scr -2.2.0-RC1 +2.2.0-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.scr-2.2.0-RC1 + HEAD
[felix-dev] annotated tag org.apache.felix.scr-2.2.0-RC1 updated (bcb93e5 -> 8cb03ff)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to annotated tag org.apache.felix.scr-2.2.0-RC1 in repository https://gitbox.apache.org/repos/asf/felix-dev.git. *** WARNING: tag org.apache.felix.scr-2.2.0-RC1 was modified! *** from bcb93e5 (commit) to 8cb03ff (tag) tagging bcb93e5a97ee7e3006ad863ff4c9b24ff5db8934 (commit) replaces org.apache.felix.feature-0.9.0-RC1 by Thomas Watson on Fri Sep 3 12:31:38 2021 -0500 - Log - [maven-release-plugin] copy for tag org.apache.felix.scr-2.2.0-RC1 --- No new revisions were added by this update. Summary of changes:
[felix-dev] branch scrR8 updated (4f2f15e -> bcb93e5)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to branch scrR8 in repository https://gitbox.apache.org/repos/asf/felix-dev.git. from 4f2f15e Merge branch 'master' into scrR8 add cc4d67d [SCR] Update OSGi API dependency to R8 RC1 add ea98e8b Update change log for SCR 2.2.0-RC1 add bcb93e5 [maven-release-plugin] prepare release org.apache.felix.scr-2.2.0-RC1 No new revisions were added by this update. Summary of changes: scr/changelog.txt | 4 scr/pom.xml | 18 +++--- 2 files changed, 7 insertions(+), 15 deletions(-)
[felix-dev] 01/01: Merge branch 'master' into scrR8
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch scrR8 in repository https://gitbox.apache.org/repos/asf/felix-dev.git commit 4f2f15e000eb1adf70984c64f27791da4ee98b51 Merge: b503f5d b50b6af Author: Thomas Watson AuthorDate: Fri Sep 3 09:19:47 2021 -0500 Merge branch 'master' into scrR8 cm.json/pom.xml| 2 +- configadmin-plugins/interpolation/README.md| 7 +- configadmin-plugins/interpolation/pom.xml | 2 +- .../plugin/interpolation/Activator.java| 2 +- .../InterpolationConfigurationPlugin.java | 11 +- .../interpolation/StandaloneInterpolator.java | 83 ++ .../InterpolationConfigurationPluginTest.java | 12 +- .../interpolation/StandaloneInterpolatorTest.java | 124 +++ .../interpolation/src/test/resources/res1/my.db| 1 + converter/converter/pom.xml| 2 +- .../interpolation => features}/pom.xml | 110 ++- .../org/apache/felix/feature/impl/Activator.java | 34 + .../felix/feature/impl/ArtifactBuilderImpl.java| 116 +++ .../felix/feature/impl/BuilderFactoryImpl.java | 59 ++ .../felix/feature/impl/BundleBuilderImpl.java | 116 +++ .../feature/impl/ConfigurationBuilderImpl.java | 112 +++ .../felix/feature/impl/ExtensionBuilderImpl.java | 151 .../felix/feature/impl/FeatureBuilderImpl.java | 275 ++ .../felix/feature/impl/FeatureServiceImpl.java | 460 ++ .../java/org/apache/felix/feature/impl/IDImpl.java | 221 + .../org.osgi.service.feature.FeatureService| 1 + .../felix/feature/impl/BundleBuilderImplTest.java | 105 +++ .../felix/feature/impl/FeatureServiceImplTest.java | 314 +++ .../src/test/resources/features/test-exfeat1.json | 26 + .../src/test/resources/features/test-exfeat2.json | 9 + .../src/test/resources/features/test-feature.json | 38 + .../src/test/resources/features/test-feature2.json | 19 + framework.security/doc/changelog.txt | 6 + framework.security/pom.xml | 4 +- framework/doc/changelog.txt| 11 + framework/pom.xml | 3 + .../org/apache/felix/framework/BundleImpl.java | 3 +- .../apache/felix/framework/BundleRevisionImpl.java | 17 +- .../org/apache/felix/framework/DTOFactory.java | 20 +- .../org/apache/felix/framework/URLHandlers.java| 34 +- .../framework/URLHandlersStreamHandlerProxy.java | 77 +- .../apache/felix/framework/util/SecureAction.java | 60 +- healthcheck/core/pom.xml | 23 +- .../core/impl/executor/HealthCheckResultCache.java | 9 +- healthcheck/generalchecks/pom.xml | 54 +- .../hc/generalchecks/BundlesStartedCheck.java | 20 +- .../apache/felix/hc/generalchecks/CpuCheck.java| 2 +- .../felix/hc/generalchecks/DiskSpaceCheck.java | 2 +- .../felix/hc/generalchecks/DsComponentsCheck.java | 152 ++-- .../hc/generalchecks/FrameworkStartCheck.java | 4 +- .../felix/hc/generalchecks/HttpRequestsCheck.java | 174 ++-- .../felix/hc/generalchecks/JmxAttributeCheck.java | 30 +- .../apache/felix/hc/generalchecks/MemoryCheck.java | 4 +- .../hc/generalchecks/ScriptedHealthCheck.java | 14 +- .../felix/hc/generalchecks/ServicesCheck.java | 34 +- .../felix/hc/generalchecks/ThreadUsageCheck.java | 6 +- .../generalchecks/scrutil/DsRootCauseAdapter.java | 9 +- .../generalchecks/scrutil/DsRootCauseAnalyzer.java | 11 +- http/base/pom.xml | 2 +- .../http/base/internal/dispatch/Dispatcher.java| 15 +- http/bridge/pom.xml| 4 +- http/itest/pom.xml | 2 +- http/jetty/pom.xml | 12 +- .../jetty/internal/ConfigMetaTypeProvider.java | 22 +- http/servlet-api/pom.xml | 8 +- inventory/pom.xml | 5 +- main.distribution/doc/changelog.txt| 6 + main.distribution/doc/changelog_framework.txt | 11 + main.distribution/doc/changelog_main.txt | 6 + main.distribution/doc/changelog_resolver.txt | 6 + main.distribution/pom.xml | 2 +- main/doc/changelog.txt | 6 + main/pom.xml | 3 + resolver/doc/changelog.txt | 6 + rootcause/bnd.bnd | 0 rootcause/pom.xml | 35 +- .../java/org/apache/felix/rootcause/DSComp.java| 6 + .../java/org/apache/felix/rootcause/DSRef.java | 7 + .../org/apache/felix/rootcause/DSRootCause.java| 122 ++- .../apache/felix/rootcause/RootCauseCommand.java | 11 +- .../apache/felix/rootcause/RootCausePrinter
[felix-dev] branch scrR8 updated (b503f5d -> 4f2f15e)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to branch scrR8 in repository https://gitbox.apache.org/repos/asf/felix-dev.git. from b503f5d Reference target attributes must not override component properties add 143ba44 Move OSGi Converter to OSGi at Eclipse add 7af9efd Revert commit 143ba444db23ca1746a8e28824025bb6b2327ca8 for now. add f065b19 [maven-release-plugin] prepare release org.apache.felix.converter-1.0.16 add 1f9722e [maven-release-plugin] prepare for next development iteration add 9387b52 [maven-release-plugin] prepare release org.apache.felix.converter-1.0.18 add 693d09c [maven-release-plugin] prepare for next development iteration add 7c78fc7 FELIX-6422 : Use property type password in metatype info for passwords add f070d00 FELIX-6423 : Use property type password for password add e013310 Update webconsole changelog add 4b28bcb FELIX-6424 : Update commons-io to 2.8.0 add 03fb0e5 FELIX-6425 : Update Jetty to 9.4.42.v20210604 add 22f6264 FELIX-6426: Update tomcat dependency to 8.5.66 (#78) add fd13f2c Remove import package header add b0c6079 [maven-release-plugin] prepare release org.apache.felix.http.servlet-api-1.1.4 add 8a65c36 [maven-release-plugin] prepare for next development iteration add c6eab25 FELIX-6427 : Obfuscate configuration properties marked as password in metatype in configuration printer add e08d253 FELIX-6428 : Provide a compatibility switch to enable password detection heuristic add 9738d2a Update to inventory release add b31df58 [maven-release-plugin] prepare release org.apache.felix.inventory-1.1.0 add d7c6ff9 [maven-release-plugin] prepare for next development iteration add 53ce5c5 [maven-release-plugin] prepare release org.apache.felix.webconsole-4.6.2 add d215906 [maven-release-plugin] prepare for next development iteration add 8a1a50c [maven-release-plugin] prepare release org.apache.felix.http.jetty-4.1.10 add d16746b [maven-release-plugin] prepare for next development iteration add e187a3e FELIX-6430: fix usage of unsave (#80) add 5425822 Minor comment cleanup add 8208244 Minor cleanup add 94ac077 Update changelogs add f04fdb2 Cleanup add 71cf760 FELIX-6430: fallback to builtin url handlers if we can't reflect on unsave add f82dedc Update changelog add ad47a52 [maven-release-plugin] prepare release org.apache.felix.resolver-2.0.4 add 6a59be9 [maven-release-plugin] prepare for next development iteration add ea222cd Update version after release add a8663af [maven-release-plugin] prepare release org.apache.felix.framework-7.0.1 add 16998aa [maven-release-plugin] prepare for next development iteration add c52bd45 [maven-release-plugin] prepare release org.apache.felix.framework.security-2.8.1 add 505f29c [maven-release-plugin] prepare for next development iteration add 1bca484 [maven-release-plugin] prepare release org.apache.felix.main-7.0.1 add 88ec06a [maven-release-plugin] prepare for next development iteration add 47cadd3 Update framework version add da3f110 [maven-release-plugin] prepare release org.apache.felix.main.distribution-7.0.1 add 2d8f01f [maven-release-plugin] prepare for next development iteration add 09c897e FELIX-6436 : Exclude default values (from metatype) in Configuration add 0d0ca21 Update changelog.txt in preparation for SCR 2.1.28 release add 057bb85 Fix javadoc generation with JDK11 add e98ed85 [maven-release-plugin] prepare release org.apache.felix.scr-2.1.28 add 8df85ce [maven-release-plugin] prepare for next development iteration add bbadfa2 FELIX-6441 Make it possible to run the Configuration Interpolation independently of Configuration Admin add 67ab32b Merge pull request #83 from bosschaert/FELIX-6441-sq add 744f1e4 FELIX-6441 - mention StandaloneInterpolator in README add 53ef77e FELIX-6441 Make it possible to run the Configuration Interpolation independently of Configuration Admin add 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 add 1f68433 [maven-release-plugin] prepare for next development iteration add 194d23e FELIX-6399 : Reduce resource consumption during component checks add c0431fb FELIX-6401 : Add deprecation annotations to systemready api add 5f82178 FELIX-6400 : Reduce resource consumption during component checks add 53490bf FELIX-6442 : NPE when generating ServiceReferenceDTOs (#86) add cf2cf3c Introduced thread-safety while updating field during deactivation phase add 6695a8a Merge pull request #81 from amitjoy/bug/FELIX-6439/npe-treemap add f0d8815 FELIX
[felix-dev] branch master updated: Introduced thread-safety while updating field during deactivation phase
This is an automated email from the ASF dual-hosted git repository.
tjwatson 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 cf2cf3c Introduced thread-safety while updating field during
deactivation phase
new 6695a8a Merge pull request #81 from amitjoy/bug/FELIX-6439/npe-treemap
cf2cf3c is described below
commit cf2cf3c57801944650ca846f452adf0b0d3755da
Author: Amit Kumar Mondal
AuthorDate: Thu Jul 22 14:46:07 2021 +0200
Introduced thread-safety while updating field during deactivation phase
The problem occurred when multiple injected services tried to be removed
from the component's injection. It is highly likely because of the usage of
TreeMap in such concurrent environment. Since TreeMap has never been written to
be used in a concurrent environment, we should use ConcurrentSkipListMap
instead as all the features of TreeMap have been introduced in
ConcurrentSkipListMap and it is very much suitable for concurrent environment.
Introduced thread-safety while updating field during deactivation phase
---
.../apache/felix/scr/impl/inject/field/FieldHandler.java | 16 ++--
.../felix/scr/impl/manager/ComponentContextImpl.java | 13 ++---
2 files changed, 12 insertions(+), 17 deletions(-)
diff --git
a/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldHandler.java
b/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldHandler.java
index 49f4964..541e88b 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldHandler.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldHandler.java
@@ -25,6 +25,7 @@ import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArraySet;
@@ -42,7 +43,6 @@ import org.apache.felix.scr.impl.logger.ComponentLogger;
import org.apache.felix.scr.impl.logger.InternalLogger.Level;
import org.apache.felix.scr.impl.metadata.ReferenceMetadata;
import org.osgi.framework.BundleContext;
-import org.osgi.service.log.LogLevel;
/**
* Handler for field references
@@ -186,15 +186,19 @@ public class FieldHandler
// unbind needs only be done, if reference is dynamic and
optional
if ( mType == METHOD_TYPE.UNBIND )
{
-if ( this.metadata.isOptional() && !this.metadata.isStatic() )
+Map, Object> boundValues =
bp.getComponentContext().getBoundValues(metadata.getName());
+synchronized (boundValues)
{
-// we only reset if it was previously set with this value
-if (
bp.getComponentContext().getBoundValues(metadata.getName()).size() == 1 )
+if ( this.metadata.isOptional() &&
!this.metadata.isStatic() )
{
-this.setFieldValue(componentInstance, null);
+// we only reset if it was previously set with this
value
+if ( boundValues.size() == 1 )
+{
+this.setFieldValue(componentInstance, null);
+}
}
+boundValues.remove(refPair);
}
-
bp.getComponentContext().getBoundValues(metadata.getName()).remove(refPair);
}
// updated needs only be done, if the value type is map or tuple
// If it's a dynamic reference, the value can be updated
diff --git
a/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentContextImpl.java
b/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentContextImpl.java
index 3204e18..faaa498 100644
---
a/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentContextImpl.java
+++
b/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentContextImpl.java
@@ -19,7 +19,7 @@
package org.apache.felix.scr.impl.manager;
-import java.util.Comparator;
+import java.util.Collections;
import java.util.Dictionary;
import java.util.HashMap;
import java.util.Map;
@@ -328,15 +328,6 @@ public class ComponentContextImpl implements
ScrComponentContext {
private Map, Object> createNewFieldHandlerMap()
{
-return new TreeMap<>(
-new Comparator>()
-{
-
-@Override
-public int compare(final RefPair o1, final RefPair
o2)
-{
-return o1.getRef().compareTo(o2.getRef());
-}
-});
+return Collections.synchronizedMap(new TreeMap<>((o1, o2) ->
o1.getRef().compareTo(o2.getRef(;
}
}
[felix-dev] branch scrR8 updated: Reference target attributes must not override component properties
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch scrR8
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/scrR8 by this push:
new b503f5d Reference target attributes must not override component
properties
b503f5d is described below
commit b503f5d018b1749d9e226de378ddb423d894198f
Author: Thomas Watson
AuthorDate: Tue Jun 22 15:25:04 2021 -0500
Reference target attributes must not override component properties
For DS 15 components the reference target attributes must not
override the component properties specified by the property or
properties elements, regardless of the order the reference
element occurs in the component XML.
For DS components <1.5 the order the reference occurs
must still work such that the last one specified
wins
---
.../felix/scr/impl/metadata/ComponentMetadata.java | 30 -
.../felix/scr/impl/metadata/PropertyMetadata.java | 16 +
.../org/apache/felix/scr/impl/xml/XmlHandler.java | 6 +-
.../scr/integration/SatisfyingConditionTest.java | 26
.../integration_test_satisfying_condition.xml | 73 --
5 files changed, 124 insertions(+), 27 deletions(-)
diff --git
a/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java
b/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java
index 0892720..92da7a7 100644
---
a/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java
+++
b/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java
@@ -327,16 +327,6 @@ public class ComponentMetadata
*/
public void addProperty( PropertyMetadata newProperty )
{
-addProperty(newProperty, false);
-}
-
-public void addFirstProperty(PropertyMetadata newProperty)
-{
-addProperty(newProperty, true);
-}
-
-private void addProperty(PropertyMetadata newProperty, boolean first)
-{
if ( m_validated )
{
return;
@@ -345,14 +335,7 @@ public class ComponentMetadata
{
throw new IllegalArgumentException( "Cannot add a null property" );
}
-if (first)
-{
-m_propertyMetaData.add(0, newProperty);
-}
-else
-{
-m_propertyMetaData.add(newProperty);
-}
+m_propertyMetaData.add(newProperty);
}
/**
@@ -965,7 +948,16 @@ public class ComponentMetadata
for ( PropertyMetadata propMeta: m_propertyMetaData )
{
propMeta.validate( this );
-m_properties.put( propMeta.getName(), propMeta.getValue() );
+if (m_dsVersion.isDS15() && propMeta.isReferenceTarget())
+{
+// for DS 15 the reference target property must not override,
+// only add if the key does not exist yet
+m_properties.putIfAbsent(propMeta.getName(),
propMeta.getValue());
+}
+else
+{
+m_properties.put(propMeta.getName(), propMeta.getValue());
+}
}
m_propertyMetaData.clear();
diff --git
a/scr/src/main/java/org/apache/felix/scr/impl/metadata/PropertyMetadata.java
b/scr/src/main/java/org/apache/felix/scr/impl/metadata/PropertyMetadata.java
index 5dd37dd..10ed223 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/metadata/PropertyMetadata.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/metadata/PropertyMetadata.java
@@ -28,7 +28,9 @@ import java.util.StringTokenizer;
*
*/
public class PropertyMetadata {
+// true if property is from a reference target attribute
+private final boolean m_referenceTarget;
// Name of the property (required)
private String m_name;
@@ -43,6 +45,16 @@ public class PropertyMetadata {
// Flag that indicates if this PropertyMetadata has been validated and
thus has become immutable
private boolean m_validated = false;
+public PropertyMetadata()
+{
+this(false);
+}
+
+public PropertyMetadata(boolean referenceTarget)
+{
+m_referenceTarget = referenceTarget;
+}
+
/**
* Set the name
*
@@ -130,6 +142,10 @@ public class PropertyMetadata {
return m_value;
}
+public boolean isReferenceTarget()
+{
+return m_referenceTarget;
+}
/**
* Method used to verify if the semantics of this metadata are correct
*/
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java
b/scr/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java
index 755f02a..00a0546 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java
@@ -392,7 +392,7 @@ public class XmlHandler e
[felix-dev] 02/02: Add implicit target property as first in the list of properties
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch scrR8
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit a86ef80595ca82b8ec61d5a4422447779f37499e
Author: Thomas Watson
AuthorDate: Thu Jun 17 08:41:14 2021 -0500
Add implicit target property as first in the list of properties
For the implicit satisfying condition reference add the target property
as the first in the list of properties. This allows any explicitly
specified properties in the component descriptor to override the
implicit target property for this reference.
---
.../felix/scr/impl/metadata/ComponentMetadata.java | 20 +-
.../org/apache/felix/scr/impl/xml/XmlHandler.java | 8
.../scr/integration/SatisfyingConditionTest.java | 44 --
.../integration_test_satisfying_condition.xml | 43 +
4 files changed, 102 insertions(+), 13 deletions(-)
diff --git
a/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java
b/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java
index a250880..0892720 100644
---
a/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java
+++
b/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java
@@ -327,6 +327,16 @@ public class ComponentMetadata
*/
public void addProperty( PropertyMetadata newProperty )
{
+addProperty(newProperty, false);
+}
+
+public void addFirstProperty(PropertyMetadata newProperty)
+{
+addProperty(newProperty, true);
+}
+
+private void addProperty(PropertyMetadata newProperty, boolean first)
+{
if ( m_validated )
{
return;
@@ -335,10 +345,16 @@ public class ComponentMetadata
{
throw new IllegalArgumentException( "Cannot add a null property" );
}
-m_propertyMetaData.add( newProperty );
+if (first)
+{
+m_propertyMetaData.add(0, newProperty);
+}
+else
+{
+m_propertyMetaData.add(newProperty);
+}
}
-
/**
* Used to add a factory property to the instance
*
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java
b/scr/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java
index 10f2153..755f02a 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java
@@ -504,6 +504,14 @@ public class XmlHandler extends DefaultHandler
trueReference.setInterface(ReferenceMetadata.CONDITION_SERVICE_CLASS);
trueReference.setPolicy(ReferenceMetadata.POLICY_DYNAMIC);
m_currentComponent.addDependency(trueReference);
+// Here we add the target property for the implicit satisfying
condition
+// first such that any properties that are specified
explicitly can
+// be used to override this implicit property
+PropertyMetadata prop = new PropertyMetadata();
+prop.setName(
+ReferenceMetadata.REFERENCE_NAME_SATISFYING_CONDITION +
".target");
+prop.setValue(ReferenceMetadata.CONDITION_TRUE_FILTER);
+m_currentComponent.addFirstProperty(prop);
}
}
}
diff --git
a/scr/src/test/java/org/apache/felix/scr/integration/SatisfyingConditionTest.java
b/scr/src/test/java/org/apache/felix/scr/integration/SatisfyingConditionTest.java
index 58c589c..1533507 100644
---
a/scr/src/test/java/org/apache/felix/scr/integration/SatisfyingConditionTest.java
+++
b/scr/src/test/java/org/apache/felix/scr/integration/SatisfyingConditionTest.java
@@ -86,21 +86,30 @@ public class SatisfyingConditionTest extends
ComponentTestBase
@Test
public void test_default_satisfying_condition() throws Exception
{
-final String componentname = "satisfying.condition.default";
+doTargetTrueCondition("satisfying.condition.default");
+}
+@Test
+public void test_specified_satisfying_condition() throws Exception
+{
+doTargetTrueCondition("satisfying.condition.reference.specified");
+}
+
+void doTargetTrueCondition(final String componentname) throws Exception
+{
ComponentConfigurationDTO configDTO =
getDisabledConfigurationAndEnable(
componentname,
ComponentConfigurationDTO.ACTIVE);
-assertEquals("Wrong number of references.", 1,
+assertEquals("Wrong number of references.", 2,
configDTO.satisfiedReferences.length);
-SatisfiedReferenceDTO satisfiedDTO = configDTO.satisfiedReferences[0];
+SatisfiedReferenceDTO satisfiedDTO = configDTO.satisfiedReferences[1];
assertEq
[felix-dev] 01/02: Fix for field-collection-type attribute for injection to Optional
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch scrR8
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 4bdb29fbd520f040b1952754aa8d8cc5e86f14da
Author: Thomas Watson
AuthorDate: Wed Jun 16 16:00:32 2021 -0500
Fix for field-collection-type attribute for injection to Optional
---
.../apache/felix/scr/impl/inject/ValueUtils.java | 130 +++--
.../felix/scr/impl/inject/field/FieldHandler.java | 8 +-
.../inject/internal/ComponentConstructorImpl.java | 9 +-
.../felix/scr/impl/inject/methods/BindMethod.java | 3 +-
.../felix/scr/impl/metadata/ReferenceMetadata.java | 61 +++---
.../impl/runtime/ServiceComponentRuntimeImpl.java | 2 +-
.../org/apache/felix/scr/impl/xml/XmlHandler.java | 2 +-
.../impl/metadata/ComponentMetaDataCacheTest.java | 6 +-
8 files changed, 100 insertions(+), 121 deletions(-)
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/inject/ValueUtils.java
b/scr/src/main/java/org/apache/felix/scr/impl/inject/ValueUtils.java
index 4f2af5c..fc8c242 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/inject/ValueUtils.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/inject/ValueUtils.java
@@ -196,27 +196,8 @@ public class ValueUtils {
}
else
{
-String colType = field != null ? metadata.getFieldCollectionType()
: metadata.getParameterCollectionType();
-if ( ReferenceMetadata.FIELD_VALUE_TYPE_SERVICE.equals(colType) )
-{
-valueType = ValueType.ref_serviceType;
-}
-else if (
ReferenceMetadata.FIELD_VALUE_TYPE_REFERENCE.equals(colType) )
-{
-valueType = ValueType.ref_serviceReference;
-}
-else if (
ReferenceMetadata.FIELD_VALUE_TYPE_SERVICEOBJECTS.equals(colType) )
-{
-valueType = ValueType.ref_serviceObjects;
-}
-else if (
ReferenceMetadata.FIELD_VALUE_TYPE_PROPERTIES.equals(colType) )
-{
-valueType = ValueType.ref_map;
-}
-else if ( ReferenceMetadata.FIELD_VALUE_TYPE_TUPLE.equals(colType)
)
-{
-valueType = ValueType.ref_tuple;
-}
+String colType = metadata.getCollectionType();
+valueType = getCollectionValueType(colType);
// multiple cardinality, field type must be collection or subtype
if ( !ClassUtils.COLLECTION_CLASS.isAssignableFrom(typeClass) )
@@ -282,6 +263,29 @@ public class ValueUtils {
return valueType;
}
+public static ValueType getCollectionValueType(String colType)
+{
+if (colType == null)
+{
+return ValueType.ref_serviceType;
+}
+switch (colType)
+{
+case ReferenceMetadata.FIELD_VALUE_TYPE_SERVICE:
+return ValueType.ref_serviceType;
+case ReferenceMetadata.FIELD_VALUE_TYPE_REFERENCE:
+return ValueType.ref_serviceReference;
+case ReferenceMetadata.FIELD_VALUE_TYPE_SERVICEOBJECTS:
+return ValueType.ref_serviceObjects;
+case ReferenceMetadata.FIELD_VALUE_TYPE_PROPERTIES:
+return ValueType.ref_map;
+case ReferenceMetadata.FIELD_VALUE_TYPE_TUPLE:
+return ValueType.ref_tuple;
+default:
+return ValueType.ignore;
+}
+}
+
/**
* Get the value for the value type
* @param componentType The class of the component
@@ -293,48 +297,56 @@ public class ValueUtils {
*/
@SuppressWarnings("unchecked")
public static Object getValue(
-final String componentType,
-final ValueType type,
-final Class targetType,
-final ScrComponentContext componentContext,
-final RefPair refPair)
+final String componentType,
+final ValueType type,
+final Class targetType,
+final ScrComponentContext componentContext,
+final RefPair refPair,
+final ReferenceMetadata referenceMetaData)
{
-final Object value;
switch ( type )
{
-case ignore : value = null;
- break;
-case componentContext : value = componentContext;
- break;
-case bundleContext : value =
componentContext.getBundleContext();
- break;
-case config_map : // note: getProperties() returns a
ReadOnlyDictionary which is a Map
- value =
componentContext.getProperties();
- break;
-case config_annotation : value =
Annotations.toObject(
[felix-dev] branch scrR8 updated (bd2823a -> a86ef80)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to branch scrR8 in repository https://gitbox.apache.org/repos/asf/felix-dev.git. from bd2823a Use the correct target when missing any service target new 4bdb29f Fix for field-collection-type attribute for injection to Optional new a86ef80 Add implicit target property as first in the list of properties The 2 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: .../apache/felix/scr/impl/inject/ValueUtils.java | 130 +++-- .../felix/scr/impl/inject/field/FieldHandler.java | 8 +- .../inject/internal/ComponentConstructorImpl.java | 9 +- .../felix/scr/impl/inject/methods/BindMethod.java | 3 +- .../felix/scr/impl/metadata/ComponentMetadata.java | 20 +++- .../felix/scr/impl/metadata/ReferenceMetadata.java | 61 +++--- .../impl/runtime/ServiceComponentRuntimeImpl.java | 2 +- .../org/apache/felix/scr/impl/xml/XmlHandler.java | 10 +- .../impl/metadata/ComponentMetaDataCacheTest.java | 6 +- .../scr/integration/SatisfyingConditionTest.java | 44 +-- .../integration_test_satisfying_condition.xml | 43 +++ 11 files changed, 202 insertions(+), 134 deletions(-)
[felix-dev] branch scrR8 updated: Use the correct target when missing any service target
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch scrR8
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/scrR8 by this push:
new bd2823a Use the correct target when missing any service target
bd2823a is described below
commit bd2823adc0433afea64424374067026e9d37b0f9
Author: Thomas Watson
AuthorDate: Mon Jun 7 19:13:59 2021 -0500
Use the correct target when missing any service target
---
.../main/java/org/apache/felix/scr/impl/manager/DependencyManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
index 32b9e07..2ce9c63 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
@@ -2487,7 +2487,7 @@ public class DependencyManager implements
ReferenceManager
// append target
if (target != null)
{
-initialReferenceFilterSB.append(m_target);
+initialReferenceFilterSB.append(target);
}
if (multipleExpr)
{
[felix-dev] 02/02: Add Optional service injection tests
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch scrR8
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 6701c6cc5ed2d8eea91217ac31c487bf9a57bb43
Author: Thomas Watson
AuthorDate: Wed Feb 17 09:55:27 2021 -0600
Add Optional service injection tests
If a reference uses an interface of java.lang.Optional
then the injected object should be an Optional obtained
as a service object
---
.../scr/integration/ComponentOptionalTest.java | 76 +-
.../components/InjectOptionalComponent.java| 59 ++---
.../resources/integration_test_inject_optional.xml | 25 +++
3 files changed, 136 insertions(+), 24 deletions(-)
diff --git
a/scr/src/test/java/org/apache/felix/scr/integration/ComponentOptionalTest.java
b/scr/src/test/java/org/apache/felix/scr/integration/ComponentOptionalTest.java
index efd13e7..0613c47 100644
---
a/scr/src/test/java/org/apache/felix/scr/integration/ComponentOptionalTest.java
+++
b/scr/src/test/java/org/apache/felix/scr/integration/ComponentOptionalTest.java
@@ -21,12 +21,15 @@ package org.apache.felix.scr.integration;
import static org.junit.Assert.assertEquals;
+import java.util.Optional;
+
import org.apache.felix.scr.integration.components.ConstructorSingleReference;
import org.apache.felix.scr.integration.components.InjectOptionalComponent;
import
org.apache.felix.scr.integration.components.InjectOptionalComponent.Mode;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
+import org.osgi.framework.ServiceRegistration;
import org.osgi.service.component.runtime.dto.ComponentConfigurationDTO;
@@ -60,14 +63,26 @@ public class ComponentOptionalTest extends ComponentTestBase
cmp1.checkMode(mode, null);
}
-ComponentConfigurationDTO ref1DTO = getDisabledConfigurationAndEnable(
-SINGLE_REFERENCE1,
-mode.isDynamic() && !mode.isMandatory()//
-? ComponentConfigurationDTO.ACTIVE
-: ComponentConfigurationDTO.SATISFIED);
-ConstructorSingleReference ref1Service =
getServiceFromConfiguration(ref1DTO,
-ConstructorSingleReference.class);
-
+Object ref1Service;
+ComponentConfigurationDTO ref1DTO;
+ServiceRegistration ref1Reg;
+if (mode.isOptionalService())
+{
+ref1Service = Optional.of("Test1");
+ref1DTO = null;
+ref1Reg = bundleContext.registerService(Optional.class,
+(Optional) ref1Service, null);
+}
+else
+{
+ref1DTO = getDisabledConfigurationAndEnable(
+SINGLE_REFERENCE1, mode.isDynamic() && !mode.isMandatory()//
+? ComponentConfigurationDTO.ACTIVE
+: ComponentConfigurationDTO.SATISFIED);
+ref1Service = getServiceFromConfiguration(ref1DTO,
+ConstructorSingleReference.class);
+ref1Reg = null;
+}
cc = findComponentConfigurationByName(componentname,
mode.getSecondState());
InjectOptionalComponent cmp2 = this.getServiceFromConfiguration(cc,
InjectOptionalComponent.class);
@@ -86,12 +101,24 @@ public class ComponentOptionalTest extends
ComponentTestBase
cmp2.checkMode(mode, null);
}
-ComponentConfigurationDTO ref2DTO = getDisabledConfigurationAndEnable(
-SINGLE_REFERENCE2, ComponentConfigurationDTO.SATISFIED);
-
-ConstructorSingleReference ref2Service =
getServiceFromConfiguration(ref2DTO,
-ConstructorSingleReference.class);
-
+Object ref2Service;
+ComponentConfigurationDTO ref2DTO;
+ServiceRegistration ref2Reg;
+if (mode.isOptionalService())
+{
+ref2Service = Optional.of("Test2");
+ref2DTO = null;
+ref2Reg = bundleContext.registerService(Optional.class,
+(Optional) ref2Service, null);
+}
+else
+{
+ref2DTO = getDisabledConfigurationAndEnable(
+SINGLE_REFERENCE2, ComponentConfigurationDTO.SATISFIED);
+ref2Service = getServiceFromConfiguration(ref2DTO,
+ConstructorSingleReference.class);
+ref2Reg = null;
+}
if (mode.isMandatory() || mode.isDynamic())
{
cmp2.checkMode(mode, ref1Service);
@@ -101,7 +128,14 @@ public class ComponentOptionalTest extends
ComponentTestBase
cmp2.checkMode(mode, null);
}
-disableAndCheck(ref1DTO);
+if (ref1Reg != null)
+{
+ref1Reg.unregister();
+}
+if (ref1DTO != null)
+{
+disableAndCheck(ref1DTO);
+}
if (mode.isDynamic())
{
@@ -167,4 +201,16 @@ public class ComponentOpt
[felix-dev] branch scrR8 updated (2de0937 -> 6701c6c)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to branch scrR8 in repository https://gitbox.apache.org/repos/asf/felix-dev.git. from 2de0937 Merge branch 'master' into scrR8 add 9725b1e FELIX-6375 : Configuration Admin Service not available with org.apache.felix.webconsole_4.6.0.all add 111525f FELIX-6375 : Configuration Admin Service not available with org.apache.felix.webconsole_4.6.0.all add d641cd2 FELIX-6371 : JSONConfigurationWriter does not escape backslash and other chars add 80a500d FELIX-6371 : JSONConfigurationWriter does not escape backslash and other chars add de42f92 Bump version to 1.1.0-SNAPSHOT add 896c139 FELIX-6375 : Require Java 8 as minimum version add 6a75e12 FELIX-6009 : Metatype AD empty String default value add 170485f Update changelog add 26a666d [maven-release-plugin] prepare release org.apache.felix.metatype-1.2.4 add 28250c3 [maven-release-plugin] prepare for next development iteration add a0af23b FELIX-6278: Update Dependency Manager with latest bndtools version add 76d77a0 FELIX-6278: added toplevel changelog file, which was removed by mistake add b5e7aba FELIX-6278: Fixed license/readme files. add 12c52d0 FELIX-6380 : Make configuration map case-insensitive add 308c199 [dependency manager] prepare for next r17 development iteration add 64e2e1f FELIX-6380 : Make configuration map case-insensitive add 677a94c [maven-release-plugin] prepare release org.apache.felix.cm.json-1.0.4 add 3069e3e [maven-release-plugin] prepare for next development iteration add 1291b8f Fix typo (#68) add d268db5 FELIX-6383 : Unable to persist state to state.ser add 18ff48c FELIX-6383 : Unable to persist state to state.ser add fd328c8 [maven-release-plugin] prepare release org.apache.felix.cm.json-1.0.6 add 35238c4 [maven-release-plugin] prepare for next development iteration add 0aa232a Add test cases with spaces in values add bc66937 FELIX-6287: Support running the framework and the main on the module path add c562829 FELIX-6287: set override existing to true for the moditect plugin add 0e8c8da FELIX-6384 support empty directive values add 0b07b35 Merge pull request #69 from kwin/feature/support-empty-default-values add 56da82c Update dependencies to latest version add b3c1ba1 [maven-release-plugin] prepare release org.apache.felix.configadmin.plugin.interpolation-1.1.2 add 22bc647 [maven-release-plugin] prepare for next development iteration add bf03b9d Update change log for 2.1.26 add 67fae3d [maven-release-plugin] prepare release org.apache.felix.scr-2.1.26 add e8fbf5b [maven-release-plugin] prepare for next development iteration add 532788d FELIX-6386 : Unable to read persisted state from state.ser add 884aae0 [maven-release-plugin] prepare release org.apache.felix.configurator-1.0.14 add f93e648 [maven-release-plugin] prepare for next development iteration add 2408520 FELIX-6391 - Update embedded commons-io to 2.8.0 (#72) add 90eee74 FELIX-6392 : Webconsole configadmin javascript error: Uncaught TypeError: parsers is undefined add bfeba55 FELIX-6394 : Update Jetty to 9.4.38.v20210224 add b7d4807 Update to latest http jetty snapshot add 2c6d92c [maven-release-plugin] prepare release org.apache.felix.http.jetty-4.1.6 add 3432cfb [maven-release-plugin] prepare for next development iteration add 9417fc7 FELIX-6388 : ERROR: Bundle org.apache.felix.log [4] EventDispatcher: Error during dispatch. (java.lang.NullPointerException) add 4c9f671 [FELIX-6337] Maven Bundle Plugin generates incorrect Provide-Capability add 6f12db3 Merge pull request #58 from Fenrock/felix6337 add b0b577b Revert "[FELIX-6337] Maven Bundle Plugin generates incorrect Provide-Capability" add 94928ea Revert "[FELIX-6269] Reformat header / capabilities clauses to ensure predictable builds" add e9e674b Revert "FELIX-6193 - Update maven-archiver + plexus-utils (#8)" add 1b0471e [maven-release-plugin] prepare release maven-bundle-plugin-5.1.2 add 3e5671a [maven-release-plugin] prepare for next development iteration add 6aef60e [FELIX-6397] Allow java.* packages export in ResourceBuilder (as it's required since R7) add e6cf27e [maven-release-plugin] prepare release org.apache.felix.utils-1.11.8 add 8736598 [maven-release-plugin] prepare for next development iteration add 2278487 FELIX-6390 Refactor the default authentication mechanism of the (#71) add 00c9523 FELIX-6398: Update packages to osgi.core 8 add b54de6e FELIX-6405 : Update Jetty version to 9.4.39 add b0c1196 [maven-release-plugin] prepare release org.apache.felix.http.jetty-4.1.8 add 1499b19 [maven
[felix-dev] 01/02: Merge branch 'master' into scrR8
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch scrR8
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit e1b549051b706187ab0dd1fb94912cb5f70f7d38
Merge: 2de0937 88c71ec
Author: Thomas Watson
AuthorDate: Tue Jun 1 12:42:11 2021 -0500
Merge branch 'master' into scrR8
cm.json/pom.xml| 12 +-
.../org/apache/felix/cm/json/Configurations.java | 2 +-
.../cm/json/impl/ConfigurationReaderImpl.java | 12 +-
.../felix/cm/json/impl/OrderedDictionary.java | 274 ++--
.../org/apache/felix/cm/json/package-info.java | 2 +-
.../cm/json/impl/ConfigurationReaderImplTest.java | 9 +
.../felix/cm/json/impl/OrderedDictionaryTest.java | 134 ++
.../resources/configs/single-duplicatekeys.json| 4 +
configadmin-plugins/interpolation/README.md| 7 +-
configadmin-plugins/interpolation/pom.xml | 6 +-
.../InterpolationConfigurationPlugin.java | 27 +-
.../plugin/interpolation/Interpolator.java | 7 +-
.../InterpolationConfigurationPluginTest.java | 43 +-
.../interpolation/src/test/resources/foo.bar | 1 +
.../src/test/resources/{ => other}/testfile.txt| 0
configadmin/README.md | 2 +-
configadmin/pom.xml| 2 +-
.../apache/felix/cm/file/ConfigurationHandler.java | 4 +-
.../felix/cm/file/ConfigurationHandlerTest.java| 60 +++
configurator/pom.xml | 4 +-
.../felix/configurator/impl/model/Config.java | 20 +-
.../org/osgi/util/converter/ConvertingImpl.java| 8 +-
.../org/osgi/util/converter/ConverterTest.java | 33 ++
.../.gradle-wrapper/gradle-wrapper.properties | 2 +-
dependencymanager/changelog.txt| 16 +
dependencymanager/cnf/build.bnd| 13 +
dependencymanager/cnf/ext/libraries.bnd| 2 +-
dependencymanager/cnf/repository.mvn | 14 +-
dependencymanager/gradle.properties| 4 +-
.../bnd.bnd| 2 +-
.../changelog.txt | 13 +
.../resources/DEPENDENCIES | 2 +-
.../resources/NOTICE | 2 +-
.../bnd.bnd| 2 +-
.../changelog.txt | 13 +
.../resources/DEPENDENCIES | 2 +-
.../resources/NOTICE | 2 +-
.../.settings/org.eclipse.jdt.core.prefs | 28 +-
.../bnd.bnd| 2 +-
.../changelog.txt | 13 +
.../resources/DEPENDENCIES | 2 +-
.../resources/NOTICE | 2 +-
.../bnd.bnd| 2 +-
.../changelog.txt | 13 +
.../resources/DEPENDENCIES | 2 +-
.../resources/NOTICE | 2 +-
.../org.apache.felix.dependencymanager/bnd.bnd | 2 +-
.../changelog.txt | 13 +-
.../resources/DEPENDENCIES | 2 +-
.../resources/NOTICE | 2 +-
dependencymanager/release/README.release | 26 +-
dependencymanager/release/build.gradle | 29 +-
dependencymanager/release/resources/bin/NOTICE | 2 +-
dependencymanager/release/resources/bin/README.bin | 21 +-
dependencymanager/release/resources/src/NOTICE | 2 +-
dependencymanager/release/resources/src/README.src | 21 +-
fileinstall/doc/changelog.txt | 11 +
fileinstall/pom.xml| 40 +-
.../fileinstall/internal/ConfigInstaller.java | 308 --
.../fileinstall/internal/DirectoryWatcher.java | 8 +-
.../apache/felix/fileinstall/internal/Scanner.java | 38 +-
.../apache/felix/fileinstall/internal/Util.java| 8 +
.../apache/felix/fileinstall/internal/Watcher.java | 28 +-
.../felix/fileinstall/internal/WatcherScanner.java | 6 +-
.../fileinstall/internal/ConfigInstallerTest.java | 179 ++--
framework.security/pom.xml | 4 +-
framework/pom.xml | 57 ++-
.../framework/URLHandlersBundleURLConnection.java | 35 +-
.../java/org/apache/felix/framework/util/Util.java | 18 +-
framework/src/main/java/org/osgi/dto/DTO.java | 462 +++--
.../src/main/java/org/osgi/dto/package-info.java | 6 +-
.../java/org/osgi/resource/dto/CapabilityDTO.java | 2 +-
.../org/osgi/resource/dto/CapabilityRefDTO.java| 2 +-
.../java/org/osgi/resource/dto/RequirementDTO.java | 2 +-
.../org/osgi/resource/dto/RequirementRefDTO.java | 2 +-
.../java/org/osgi
[felix-dev] 01/05: Update framework implementations
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git commit b747b7d1d057c57cd2c78380ee1fdea1d0094195 Author: Thomas Watson AuthorDate: Tue May 11 12:18:49 2021 -0500 Update framework implementations Older versions of the framework implementations do not support Java 11. --- scr/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scr/pom.xml b/scr/pom.xml index fa63fe9..39b66e9 100644 --- a/scr/pom.xml +++ b/scr/pom.xml @@ -380,7 +380,7 @@ org.apache.felix org.apache.felix.framework -4.6.0 +6.0.4 test @@ -389,9 +389,9 @@ equinox -org.eclipse +org.eclipse.platform org.eclipse.osgi -3.8.0.v20120529-1548 +3.16.200 test
[felix-dev] 04/05: Fix test cases to tolerate both felix and equinox
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit d59927bdfefae1dee66a07d1a6b183e0e6184913
Author: Thomas Watson
AuthorDate: Tue May 18 10:42:37 2021 -0500
Fix test cases to tolerate both felix and equinox
---
.../java/org/apache/felix/scr/integration/ComponentConcurrencyTest.java | 1 +
.../test/java/org/apache/felix/scr/integration/ComponentTestBase.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git
a/scr/src/test/java/org/apache/felix/scr/integration/ComponentConcurrencyTest.java
b/scr/src/test/java/org/apache/felix/scr/integration/ComponentConcurrencyTest.java
index 73e8ae6..24d0919 100644
---
a/scr/src/test/java/org/apache/felix/scr/integration/ComponentConcurrencyTest.java
+++
b/scr/src/test/java/org/apache/felix/scr/integration/ComponentConcurrencyTest.java
@@ -29,6 +29,7 @@ public class ComponentConcurrencyTest extends
ComponentTestBase
restrictedLogging = true;
ignoredWarnings = new String[] {"FrameworkEvent: ERROR",
"FrameworkEvent ERROR",
+"FrameworkEvent: WARNING",
"Could not get service from ref",
"Failed creating the component instance; see log for reason",
"Cannot create component instance due to failure to bind
reference",
diff --git
a/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java
b/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java
index 0966c5b..03471ab 100644
--- a/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java
+++ b/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java
@@ -952,7 +952,7 @@ public abstract class ComponentTestBase
{
if ( m_warnings.size() < 1024 )
{
-m_warnings.add( entry.getMessage() );
+m_warnings.add(entry.getMessage() +
entry.getError());
}
else
{
[felix-dev] 05/05: FELIX-6408 - NPE in MultipleStaticReluctantCustomizer.modifiedService
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 20272ad9aeb3dfd312163de2d0b013e5bb292aec
Author: Thomas Watson
AuthorDate: Tue May 11 12:26:31 2021 -0500
FELIX-6408 - NPE in MultipleStaticReluctantCustomizer.modifiedService
Check for null on calls to this.refs.get().
---
.../main/java/org/apache/felix/scr/impl/manager/DependencyManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
index 7e99e2a..c39585a 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
@@ -667,7 +667,7 @@ public class DependencyManager implements
ReferenceManager
null, getName(), trackingCount, serviceReference );
boolean reactivate = false;
Collection> refs = this.refs.get();
-if (isActive() && refs.contains(refPair))
+if (isActive() && refs != null && refs.contains(refPair))
{
reactivate =
m_componentManager.invokeUpdatedMethod(DependencyManager.this, refPair,
trackingCount);
}
[felix-dev] 03/05: Hide LoggerFactory from Equinox for unit test.
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 4dc2ed1865f5a2d0c6a1918b33a358b4edb753b2
Author: Thomas Watson
AuthorDate: Tue May 11 12:20:17 2021 -0500
Hide LoggerFactory from Equinox for unit test.
---
.../org/apache/felix/scr/impl/logger/LoggerTest.java | 18 ++
1 file changed, 18 insertions(+)
diff --git a/scr/src/test/java/org/apache/felix/scr/impl/logger/LoggerTest.java
b/scr/src/test/java/org/apache/felix/scr/impl/logger/LoggerTest.java
index faa534e..22f8e85 100644
--- a/scr/src/test/java/org/apache/felix/scr/impl/logger/LoggerTest.java
+++ b/scr/src/test/java/org/apache/felix/scr/impl/logger/LoggerTest.java
@@ -31,6 +31,7 @@ import java.io.FilterOutputStream;
import java.io.IOException;
import java.io.PrintStream;
import java.io.StringWriter;
+import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.ServiceLoader;
@@ -42,8 +43,11 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.hooks.service.FindHook;
import org.osgi.framework.launch.Framework;
import org.osgi.service.log.LogLevel;
import org.osgi.service.log.Logger;
@@ -70,6 +74,20 @@ public class LoggerTest {
.newFramework(configuration);
framework.init();
framework.start();
+// hide LoggerFactory from equinox
+framework.getBundleContext().registerService(FindHook.class, new
FindHook()
+{
+
+@Override
+public void find(BundleContext context, String name, String filter,
+boolean allServices, Collection>
references)
+{
+if (name != null &&
"org.osgi.service.log.LoggerFactory".equals(name))
+{
+references.removeIf((r) -> r.getBundle().getBundleId() ==
0);
+}
+}
+}, null);
scr = framework.getBundleContext().installBundle("scr",
makeBundle("scr").openInputStream());
component =
framework.getBundleContext().installBundle("component",
[felix-dev] 02/05: Update to compile with Java 8
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit addf139ccd96be4cfa6b0b739cb257ff13e2b3a8
Author: Thomas Watson
AuthorDate: Tue May 11 12:19:23 2021 -0500
Update to compile with Java 8
---
scr/pom.xml | 6 ++
1 file changed, 6 insertions(+)
diff --git a/scr/pom.xml b/scr/pom.xml
index 39b66e9..0b9c77f 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -66,6 +66,12 @@
${bundle.build.name}/${project.build.finalName}.jar
1.9.0
+
+8
+${java.version}
+${java.version}
+${java.version}
+${java.version}
[felix-dev] branch master updated (c1197d9 -> 20272ad)
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git. from c1197d9 Merge pull request #75 from amitjoy/scr-logging-enhancement new b747b7d Update framework implementations new addf139 Update to compile with Java 8 new 4dc2ed1 Hide LoggerFactory from Equinox for unit test. new d59927b Fix test cases to tolerate both felix and equinox new 20272ad FELIX-6408 - NPE in MultipleStaticReluctantCustomizer.modifiedService The 5 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: scr/pom.xml| 12 +--- .../felix/scr/impl/manager/DependencyManager.java | 2 +- .../org/apache/felix/scr/impl/logger/LoggerTest.java | 18 ++ .../scr/integration/ComponentConcurrencyTest.java | 1 + .../felix/scr/integration/ComponentTestBase.java | 2 +- 5 files changed, 30 insertions(+), 5 deletions(-)
[felix-dev] branch master updated: [FELIX-6407] SCR Logging Fixes and Improvements
This is an automated email from the ASF dual-hosted git repository.
tjwatson 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 589ccc2 [FELIX-6407] SCR Logging Fixes and Improvements
new c1197d9 Merge pull request #75 from amitjoy/scr-logging-enhancement
589ccc2 is described below
commit 589ccc23875ca6afe411aa37b860b667de86c702
Author: Amit Kumar Mondal
AuthorDate: Wed May 5 04:02:26 2021 +0200
[FELIX-6407] SCR Logging Fixes and Improvements
1. Fixed Problem with Extended Logging
2. Introduced functionality to disable logging
Fixes #FELIX-6407
Signed-off-by: Amit Kumar Mondal
---
.../java/org/apache/felix/scr/impl/Activator.java | 6 +-
.../scr/impl/config/ScrConfigurationImpl.java | 54 +---
.../felix/scr/impl/logger/ExtLogManager.java | 15 ++--
.../felix/scr/impl/logger/LogConfiguration.java| 97 +
.../apache/felix/scr/impl/logger/LogManager.java | 32 ++-
.../apache/felix/scr/impl/logger/NoOpLogger.java | 71
.../felix/scr/impl/logger/ScrLogManager.java | 30 +--
.../felix/scr/impl/logger/ScrLoggerFactory.java| 71
.../felix/scr/impl/manager/ScrConfiguration.java | 24 +-
.../apache/felix/scr/impl/logger/LoggerTest.java | 99 +++---
10 files changed, 397 insertions(+), 102 deletions(-)
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
b/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
index a419f43..3183581 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
@@ -43,7 +43,7 @@ import java.util.concurrent.locks.ReentrantLock;
import org.apache.felix.scr.impl.config.ScrConfigurationImpl;
import org.apache.felix.scr.impl.inject.internal.ClassUtils;
import org.apache.felix.scr.impl.logger.InternalLogger.Level;
-import org.apache.felix.scr.impl.logger.ScrLogManager;
+import org.apache.felix.scr.impl.logger.ScrLoggerFactory;
import org.apache.felix.scr.impl.logger.ScrLogger;
import org.apache.felix.scr.impl.manager.ComponentHolder;
import org.apache.felix.scr.impl.metadata.ComponentMetadata;
@@ -657,10 +657,10 @@ public class Activator extends AbstractExtender
// TODO we only set the logger once
// If the need arises to be able to dynamically set the logger type
// then more work is needed to do that switch
-// for now we only can configure ds.log.extension with context
properties
+// for now we only can configure 'ds.log.extension' and
'ds.log.enabled' with context properties
if (logger == null)
{
-logger = ScrLogManager.scr(m_context, m_configuration);
+logger = ScrLoggerFactory.create(m_context, m_configuration);
}
}
diff --git
a/scr/src/main/java/org/apache/felix/scr/impl/config/ScrConfigurationImpl.java
b/scr/src/main/java/org/apache/felix/scr/impl/config/ScrConfigurationImpl.java
index 6d6fd20..9a0417a 100644
---
a/scr/src/main/java/org/apache/felix/scr/impl/config/ScrConfigurationImpl.java
+++
b/scr/src/main/java/org/apache/felix/scr/impl/config/ScrConfigurationImpl.java
@@ -82,7 +82,10 @@ public class ScrConfigurationImpl implements ScrConfiguration
private boolean infoAsService;
private boolean cacheMetadata;
-private boolean logExtension;
+
+private boolean isLogEnabled;
+
+private boolean isLogExtensionEnabled;
private long lockTimeout = DEFAULT_LOCK_TIMEOUT_MILLISECONDS;
@@ -179,7 +182,8 @@ public class ScrConfigurationImpl implements
ScrConfiguration
serviceChangecountTimeout =
DEFAULT_SERVICE_CHANGECOUNT_TIMEOUT_MILLISECONDS;
newGlobalExtender = false;
cacheMetadata = false;
-logExtension = false;
+isLogEnabled = true;
+isLogExtensionEnabled = false;
}
else
{
@@ -192,7 +196,8 @@ public class ScrConfigurationImpl implements
ScrConfiguration
serviceChangecountTimeout =
getServiceChangecountTimeout();
newGlobalExtender = getDefaultGlobalExtender();
cacheMetadata = getDefaultCacheMetadata();
-logExtension = getDefaultLogExtension();
+isLogEnabled = getDefaultLogEnabled();
+isLogExtensionEnabled = getDefaultLogExtension();
}
}
else
@@ -213,7 +218,8 @@ public class ScrConfigurationImpl implements
ScrConfiguration
newGlobalExtender = VALUE_TRUE.equalsIgnoreCase(
String.valueOf( config.get(
[felix-atomos] branch gh-pages updated: Use /felix-atomos base url
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch gh-pages in repository https://gitbox.apache.org/repos/asf/felix-atomos.git The following commit(s) were added to refs/heads/gh-pages by this push: new 177614c Use /felix-atomos base url 177614c is described below commit 177614ca61e868e869e28f250a0ca9f367ebe044 Author: Thomas Watson AuthorDate: Fri Mar 5 16:35:24 2021 -0600 Use /felix-atomos base url --- _config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_config.yml b/_config.yml index fe5870a..57ce80a 100644 --- a/_config.yml +++ b/_config.yml @@ -4,8 +4,8 @@ email: d...@felix.apache.org description: > # this means to ignore newlines until "baseurl:" A Java Module Runtime that uses OSGi Connect to represent Java modules and other content as bundles in an OSGi framework instance. -baseurl: "" -url: "" +baseurl: "/felix-atomos" +url: "/felix-atomos" show_excerpts: true # set to false to remove excerpts on the homepage theme: minima
[felix-atomos] branch gh-pages updated: Basic updates to gh-pages layout
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch gh-pages
in repository https://gitbox.apache.org/repos/asf/felix-atomos.git
The following commit(s) were added to refs/heads/gh-pages by this push:
new a86e913 Basic updates to gh-pages layout
a86e913 is described below
commit a86e913d24600af7502a6f30df1421925bab32d6
Author: Thomas Watson
AuthorDate: Fri Mar 5 16:23:55 2021 -0600
Basic updates to gh-pages layout
---
.gitignore | 47 ++
404.html | 25 ++
Gemfile| 31 +++
Gemfile.lock | 270 +
_config.yml| 12 ++-
about.markdown | 13 +++
6 files changed, 355 insertions(+), 43 deletions(-)
diff --git a/.gitignore b/.gitignore
index e902dd6..f40fbd8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,42 +1,5 @@
-*#
-*.iml
-*.ipr
-*.iws
-*.jar
-*.sw?
-*~
-.#*
-.*.md.html
-.DS_Store
-.classpath
-.factorypath
-.gradle
-.idea
-.metadata
-.project
-.recommenders
-.settings
-.springBeans
-.theia
-/build
-/code
-_site/
-activemq-data
-bin
-build
-build.log
-dependency-reduced-pom.xml
-dump.rdb
-interpolated*.xml
-lib/
-manifest.yml
-overridedb.*
-settings.xml
-target
-transaction-logs
-.flattened-pom.xml
-secrets.yml
-.gradletasknamecache
-.sts4-cache
-configuration/
-felix-cache/
+_site
+.sass-cache
+.jekyll-cache
+.jekyll-metadata
+vendor
diff --git a/404.html b/404.html
new file mode 100644
index 000..086a5c9
--- /dev/null
+++ b/404.html
@@ -0,0 +1,25 @@
+---
+permalink: /404.html
+layout: default
+---
+
+
+ .container {
+margin: 10px auto;
+max-width: 600px;
+text-align: center;
+ }
+ h1 {
+margin: 30px 0;
+font-size: 4em;
+line-height: 1;
+letter-spacing: -1px;
+ }
+
+
+
+ 404
+
+ Page not found :(
+ The requested page could not be found.
+
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 000..7cbb75e
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,31 @@
+source "https://rubygems.org";
+# Hello! This is where you manage which Jekyll version is used to run.
+# When you want to use a different version, change it below, save the
+# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
+#
+# bundle exec jekyll serve
+#
+# This will help ensure the proper Jekyll version is running.
+# Happy Jekylling!
+# gem "jekyll", "~> 4.2.0"
+gem "github-pages", "~> 212", group: :jekyll_plugins
+# This is the default theme for new Jekyll sites. You may change this to
anything you like.
+gem "minima", "~> 2.5"
+# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
+# uncomment the line below. To upgrade, run `bundle update github-pages`.
+# gem "github-pages", group: :jekyll_plugins
+# If you have any plugins, put them here!
+group :jekyll_plugins do
+ gem "jekyll-feed", "~> 0.12"
+end
+
+# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data
gem
+# and associated library.
+platforms :mingw, :x64_mingw, :mswin, :jruby do
+ gem "tzinfo", "~> 1.2"
+ gem "tzinfo-data"
+end
+
+# Performance-booster for watching directories on Windows
+gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
+
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 000..b564d29
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,270 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+activesupport (6.0.3.5)
+ concurrent-ruby (~> 1.0, >= 1.0.2)
+ i18n (>= 0.7, < 2)
+ minitest (~> 5.1)
+ tzinfo (~> 1.1)
+ zeitwerk (~> 2.2, >= 2.2.2)
+addressable (2.7.0)
+ public_suffix (>= 2.0.2, < 5.0)
+coffee-script (2.4.1)
+ coffee-script-source
+ execjs
+coffee-script-source (1.11.1)
+colorator (1.1.0)
+commonmarker (0.17.13)
+ ruby-enum (~> 0.5)
+concurrent-ruby (1.1.8)
+dnsruby (1.61.5)
+ simpleidn (~> 0.1)
+em-websocket (0.5.2)
+ eventmachine (>= 0.12.9)
+ http_parser.rb (~> 0.6.0)
+ethon (0.12.0)
+ ffi (>= 1.3.0)
+eventmachine (1.2.7)
+execjs (2.7.0)
+faraday (1.3.0)
+ faraday-net_http (~> 1.0)
+ multipart-post (>= 1.2, < 3)
+ ruby2_keywords
+faraday-net_http (1.0.1)
+ffi (1.14.2)
+forwardable-extended (2.6.0)
+gemoji (3.0.1)
+github-pages (212)
+ github-pages-health-check (= 1.17.0)
+ jekyll (= 3.9.0)
+ jekyll-avatar (= 0.7.0)
+ jekyll-coffeescript (= 1.1.1)
+ jekyll-commonmark-ghpages (= 0.1.6)
+ jekyll-default-layout (= 0.1.4)
+ jekyll-feed (= 0.15.1)
+ jekyll-gist (= 1.5.0)
+ jekyll-github-metadata (= 2.13.0)
+ jekyll-mentions (= 1.6.0)
+ jekyll-optional-front-matter (= 0.3.2)
+ jekyll-paginate (= 1.1.0)
+ j
[felix-atomos] branch gh-pages updated: Do not show excerpts
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch gh-pages in repository https://gitbox.apache.org/repos/asf/felix-atomos.git The following commit(s) were added to refs/heads/gh-pages by this push: new 4db67b9 Do not show excerpts 4db67b9 is described below commit 4db67b986f98428d5229dc9556877868ab8f55f2 Author: Thomas Watson AuthorDate: Fri Mar 5 12:38:14 2021 -0600 Do not show excerpts --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 382b9ea..2f7fae1 100644 --- a/_config.yml +++ b/_config.yml @@ -4,6 +4,6 @@ email: d...@felix.apache.org description: > # this means to ignore newlines until "baseurl:" A Java Module Runtime that uses OSGi Connect to represent Java modules and other content as bundles in an OSGi framework instance. -show_excerpts: true # set to false to remove excerpts on the homepage +show_excerpts: false # set to false to remove excerpts on the homepage theme: minima
[felix-atomos] branch gh-pages updated: Add initial example readmes
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch gh-pages in repository https://gitbox.apache.org/repos/asf/felix-atomos.git The following commit(s) were added to refs/heads/gh-pages by this push: new 9558873 Add initial example readmes 9558873 is described below commit 9558873514285bf5438e8012c8b42fd997f0cfb8 Author: Thomas Watson AuthorDate: Fri Mar 5 12:32:49 2021 -0600 Add initial example readmes --- atomos.examples/README.md | 10 +++ atomos.examples/SUBSTRATE.md | 27 atomos.examples/atomos.examples.android/README.md | 10 +++ atomos.examples/atomos.examples.index/README.md| 15 .../atomos.examples.jaxrs.bundle/pom.xml | 79 ++ atomos.examples/atomos.examples.jaxrs/README.md| 11 +++ atomos.examples/atomos.examples.jlink/README.md| 37 ++ .../atomos.examples.springloader/README.md | 15 .../atomos.examples.substrate.lib/README.md| 8 +++ 9 files changed, 212 insertions(+) diff --git a/atomos.examples/README.md b/atomos.examples/README.md new file mode 100644 index 000..195b368 --- /dev/null +++ b/atomos.examples/README.md @@ -0,0 +1,10 @@ +# Atomos Examples + +The following examples are available: +1. [Atomos Index example](atomos.examples.index/README.md) - Assembles an executable JAR which uses an Atomos index for bundle entry content. +1. [Atomos jlink example](atomos.examples.jlink/README.md) - Assembles a jlink image that loads the framework and a set of bundles as modules included in a fit for purpose JVM image +1. [Atomos Spring Loader example](atomos.examples.springloader/README.md) - Assembles an executable JAR that uses the Spring Jar loader to load bundle content from embedded JAR files. +1. [Atomos native-image lib folder example](atomos.examples.substrate.lib/README.md) - Assembles a native image using Graal Substrate to load the framework and a set of bundles +1. [Atomos native-image maven plugin example](atomos.examples.substrate.maven/README.md) - Assembles a native image using Graal Substrate with the atomos-maven-plugin +1. [Atomos Android example](atomos.examples.android/README.md) - Uses the result of the [Atomos index example](atomos.examples.index/README.md) to build an Android application +1. [Atomos JAX-RS example](atomos.examples.jaxrs/README.md) - Uses Aries JAX-RS [whiteboard](https://github.com/apache/aries-jax-rs-whiteboard) implementation for a simple JAX-RS resource example. diff --git a/atomos.examples/SUBSTRATE.md b/atomos.examples/SUBSTRATE.md new file mode 100644 index 000..edf8d91 --- /dev/null +++ b/atomos.examples/SUBSTRATE.md @@ -0,0 +1,27 @@ +# Building Substrate Examples + +The example projects that build Graal Substrate native-images are not built as part of the main Atomos build because they require an installation of GraalVM CE 21.0.0.2 (Java 8 or Java 11 can be used) and the native-image tools for Substrate. The Java 11 version of Graal Substrate does not currently support full introspection at image runtime of the Java Platform Module System. Atomos Module support expects to have full introspection of the Java Platform Module System when running on Jav [...] + +To build the native image examples you must install the native image support for Graal (see https://www.graalvm.org/docs/reference-manual/native-image/). You need to run the `gu` command that comes with Graal VM: + +`gu install native-image` + +If you are using GraalVM CE 21.0.0.2 Java 11 then you can build all of Atomos, including the substrate examples, with the following single maven build using the `substrate` profile: + +`./mvnw clean install -Pjava8 -Psubstrate -Pequinox` + +There is currently an issue using GraalVM to build the jlink example image (see https://github.com/oracle/graal/issues/3090) +that prevents running the complete build because the jlink example will fail. +If using GraalVM CE 21.0.0.2 Java 8 then you must first use Java 11 for the main Atomos build using the Java 8 profile: + +`./mvnw clean install -Pjava8 -Pequinox` + +To use the Felix Framework use `-Pfelix` instead of `-Pequinox` + +Note that `install` target must be used so that Atomos is installed into your local m2 repository. This still requires Java 11 to be used to build but the result allows the `atomos.framework` JAR to be used on Java 8. Next you must switch to a Java installation of Graal with the Substrate native-image tools installed and then run the maven builds for the substrate example projects: + +For the [Atomos native-image lib folder example](atomos.examples.substrate.lib/README.md) a directory `target/atomos_lib/` is created. This contains all the original bundle JARs that got compiled into the native image `atomos`. In order to launch the native `atomos` you must be in the directory containing both `atomos` and the `atomos_lib/` folder. This is a
svn commit: r1071553 - /websites/production/felix/content/
Author: tjwatson Date: Tue Feb 23 17:39:45 2021 New Revision: 1071553 Log: Publishing svnmucc operation to felix site by tjwatson Added: websites/production/felix/content/ - copied from r1071552, websites/staging/felix/trunk/content/
svn commit: r1886848 - in /felix/site/trunk/content: documentation/development/release-management-nexus.mdtext downloads.list news.mdtext
Author: tjwatson Date: Tue Feb 23 17:37:05 2021 New Revision: 1886848 URL: http://svn.apache.org/viewvc?rev=1886848&view=rev Log: Atomos 1.0.0 Release Modified: felix/site/trunk/content/documentation/development/release-management-nexus.mdtext felix/site/trunk/content/downloads.list felix/site/trunk/content/news.mdtext Modified: felix/site/trunk/content/documentation/development/release-management-nexus.mdtext URL: http://svn.apache.org/viewvc/felix/site/trunk/content/documentation/development/release-management-nexus.mdtext?rev=1886848&r1=1886847&r2=1886848&view=diff == --- felix/site/trunk/content/documentation/development/release-management-nexus.mdtext (original) +++ felix/site/trunk/content/documentation/development/release-management-nexus.mdtext Tue Feb 23 17:37:05 2021 @@ -190,6 +190,10 @@ If you are not a member of the Apache Fe the PMC to execute this step. + +It is recommended to use the check_staged_release.sh script to download your release prior to releasing the staging repository. This will make the task of uploading the release to the Felix releases repository easier. + + We use the distribution mechanism as described in [How do I upload a release (newer way)?](https://www.apache.org/dev/release.html#upload-ci) 1. Check out the [Felix releases repository](https://dist.apache.org/repos/dist/release/felix); Modified: felix/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/felix/site/trunk/content/downloads.list?rev=1886848&r1=1886847&r2=1886848&view=diff == --- felix/site/trunk/content/downloads.list (original) +++ felix/site/trunk/content/downloads.list Tue Feb 23 17:37:05 2021 @@ -29,6 +29,7 @@ framework|7.0.0 #bundle's release tag folder in SVN (default: changelog.txt) #Use - to not have a changelog link # +Atomos|org.apache.felix.atomos|1.0.0 AutoConf Resource Processor|org.apache.felix.deployment.rp.autoconf|0.1.8 Bundle Repository|org.apache.felix.bundlerepository|2.0.10|||doc/changelog.txt CM Json|org.apache.felix.cm.json|1.0.6 @@ -131,6 +132,7 @@ Maven junit4osgi Plugin|maven-junit4osgi Maven OBR Plugin|maven-obr-plugin|1.2.0|||- Maven SCR Plugin|maven-scr-plugin|1.26.4 OSGi Check Maven Plugin|osgicheck-maven-plugin|0.1.0 +Atomos Maven Plugin|atomos-maven-plugin|0.9.0 # (3) Ant Tasks # This list is sorted by the title before writing the table Modified: felix/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/felix/site/trunk/content/news.mdtext?rev=1886848&r1=1886847&r2=1886848&view=diff == --- felix/site/trunk/content/news.mdtext (original) +++ felix/site/trunk/content/news.mdtext Tue Feb 23 17:37:05 2021 @@ -1,5 +1,6 @@ Title: News +* Apache Felix Atomos 1.0.0 (February 23rd, 2021) * Apache Felix SCR 2.1.26 (February 22th, 2021) * Apache Felix CM Json 1.0.6 released (February 3rd, 2021) * Apache Felix CM Json 1.0.4 released (January 29th, 2021)
svn commit: r46291 [1/2] - /release/felix/
Author: tjwatson Date: Tue Feb 23 16:50:00 2021 New Revision: 46291 Log: atomos-1.0.0 release Added: release/felix/atomos-distribution-1.0.0-source-release.tar.gz (with props) release/felix/atomos-distribution-1.0.0-source-release.tar.gz.asc release/felix/atomos-distribution-1.0.0-source-release.tar.gz.sha1 release/felix/atomos-distribution-1.0.0-source-release.zip (with props) release/felix/atomos-distribution-1.0.0-source-release.zip.asc release/felix/atomos-distribution-1.0.0-source-release.zip.sha1 release/felix/atomos-distribution-1.0.0.pom release/felix/atomos-distribution-1.0.0.pom.asc release/felix/atomos-distribution-1.0.0.pom.sha1 release/felix/atomos-maven-plugin-0.9.0-javadoc.jar (with props) release/felix/atomos-maven-plugin-0.9.0-javadoc.jar.asc release/felix/atomos-maven-plugin-0.9.0-javadoc.jar.sha1 release/felix/atomos-maven-plugin-0.9.0-sources.jar (with props) release/felix/atomos-maven-plugin-0.9.0-sources.jar.asc release/felix/atomos-maven-plugin-0.9.0-sources.jar.sha1 release/felix/atomos-maven-plugin-0.9.0.jar (with props) release/felix/atomos-maven-plugin-0.9.0.jar.asc release/felix/atomos-maven-plugin-0.9.0.jar.sha1 release/felix/atomos-maven-plugin-0.9.0.pom release/felix/atomos-maven-plugin-0.9.0.pom.asc release/felix/atomos-maven-plugin-0.9.0.pom.sha1 release/felix/atomos-parent-1.0.0.pom release/felix/atomos-parent-1.0.0.pom.asc release/felix/atomos-parent-1.0.0.pom.sha1 release/felix/org.apache.felix.atomos-1.0.0-javadoc.jar (with props) release/felix/org.apache.felix.atomos-1.0.0-javadoc.jar.asc release/felix/org.apache.felix.atomos-1.0.0-javadoc.jar.sha1 release/felix/org.apache.felix.atomos-1.0.0-sources.jar (with props) release/felix/org.apache.felix.atomos-1.0.0-sources.jar.asc release/felix/org.apache.felix.atomos-1.0.0-sources.jar.sha1 release/felix/org.apache.felix.atomos-1.0.0.jar (with props) release/felix/org.apache.felix.atomos-1.0.0.jar.asc release/felix/org.apache.felix.atomos-1.0.0.jar.sha1 release/felix/org.apache.felix.atomos-1.0.0.pom release/felix/org.apache.felix.atomos-1.0.0.pom.asc release/felix/org.apache.felix.atomos-1.0.0.pom.sha1 release/felix/org.apache.felix.atomos.utils-0.9.0.pom release/felix/org.apache.felix.atomos.utils-0.9.0.pom.asc release/felix/org.apache.felix.atomos.utils-0.9.0.pom.sha1 release/felix/org.apache.felix.atomos.utils.api-0.9.0-sources.jar (with props) release/felix/org.apache.felix.atomos.utils.api-0.9.0-sources.jar.asc release/felix/org.apache.felix.atomos.utils.api-0.9.0-sources.jar.sha1 release/felix/org.apache.felix.atomos.utils.api-0.9.0.jar (with props) release/felix/org.apache.felix.atomos.utils.api-0.9.0.jar.asc release/felix/org.apache.felix.atomos.utils.api-0.9.0.jar.sha1 release/felix/org.apache.felix.atomos.utils.api-0.9.0.pom release/felix/org.apache.felix.atomos.utils.api-0.9.0.pom.asc release/felix/org.apache.felix.atomos.utils.api-0.9.0.pom.sha1 release/felix/org.apache.felix.atomos.utils.core-0.9.0-sources.jar (with props) release/felix/org.apache.felix.atomos.utils.core-0.9.0-sources.jar.asc release/felix/org.apache.felix.atomos.utils.core-0.9.0-sources.jar.sha1 release/felix/org.apache.felix.atomos.utils.core-0.9.0.jar (with props) release/felix/org.apache.felix.atomos.utils.core-0.9.0.jar.asc release/felix/org.apache.felix.atomos.utils.core-0.9.0.jar.sha1 release/felix/org.apache.felix.atomos.utils.core-0.9.0.pom release/felix/org.apache.felix.atomos.utils.core-0.9.0.pom.asc release/felix/org.apache.felix.atomos.utils.core-0.9.0.pom.sha1 release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0-sources.jar (with props) release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0-sources.jar.asc release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0-sources.jar.sha1 release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0.jar (with props) release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0.jar.asc release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0.jar.sha1 release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0.pom release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0.pom.asc release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0.pom.sha1 release/felix/org.apache.felix.atomos.utils.substrate.impl-0.9.0-sources.jar (with props) release/felix/org.apache.felix.atomos.utils.substrate.impl-0.9.0-sources.jar.asc release/felix/org.apache.felix.atomos.utils.substrate.impl-0.9.0-sources.jar.sha1 release/felix/org.apache.felix.atomos.utils.substrate.impl-0.9.0.jar (with props) release/felix/org.apache.felix.atomos.utils.substrate.impl-0.9.0.jar.asc release/felix/org.apache.felix.atomos.utils.substrate.impl-0.9.0
svn commit: r46291 [2/2] - /release/felix/
Added:
release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0-sources.jar.sha1
==
---
release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0-sources.jar.sha1
(added)
+++
release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0-sources.jar.sha1
Tue Feb 23 16:50:00 2021
@@ -0,0 +1 @@
+afd68294f3c58a827ef6a83bcb73c2afae4442cb
\ No newline at end of file
Added: release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0.jar
==
Binary file - no diff available.
Propchange: release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0.jar
--
svn:mime-type = application/octet-stream
Added: release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0.jar.asc
==
--- release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0.jar.asc
(added)
+++ release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0.jar.asc Tue
Feb 23 16:50:00 2021
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCgAdFiEEV20xNjAQvWxZ1evVjTfy8GChr1AFAmAulJQACgkQjTfy8GCh
+r1D3jBAAlzCFocmUX8bgLEvnCybehkab3xkq8CKzcwmAMhxp1xQ6fdjXo1wOrPXJ
+8XIaf31Tq4vcIVTt/2QFJSHLrjNQkgaVpQjssD6w9O6JZBtcZr5IIcN8ZM/bvHTh
+WcdC7XJJ4fFv0GzNMxh0A0sZVxS9R4CpWKlzVsbebQOQoZuY4UfcwJwYU/KrNQMG
+kfmFMrAjDkLgS8eIumGK4DXA4fRj7+Wx8RyqEBVcZ6z5wFB9UgAbBX/B5MbRp1PD
+xh807dU+Upp/ehmZGtPpJcgrT1lA7W4rzwGjV8R+amzNZKEqXKf8DU8ZuzWhcMjg
+sIKozPfl3ZhzAiLxHdLMCsxkUONIgmKE/I3XgmrhhUXmxbPp7aI6lQmF7EqNVV4V
+ToEDASOSg3NKtQEu3JFb+nts8yQpvAzJu13le/nfgVKlCXLapCOHFp09SQ+OCzOm
+SBL/6KoUWGLJ4niZEBtfOQfU6WuISKNhlRrO/1qiJ0ttU1meYDcCfAoSzrVhyu5d
+YpcgUPmU0778x+Wajn9vgdP9TPGGIBf1ETUDVS/5F4nPtQ3A41MZer/f3WWjn8Mv
+wluGfLXjNHRY7RXjVgYrJmvxyuuPTFaASvlZ5dZC9n7WVASxXn1d/lDvM2U4t1k+
+y7YVjELpwHtSiJHonkEALGIbyPQThyDs1NHPKNPPyc9A+XN3fg0=
+=R4g2
+-END PGP SIGNATURE-
Added: release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0.jar.sha1
==
--- release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0.jar.sha1
(added)
+++ release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0.jar.sha1
Tue Feb 23 16:50:00 2021
@@ -0,0 +1 @@
+f6aaae8aacebab23fad00534fd8ca2676fd8e571
\ No newline at end of file
Added: release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0.pom
==
--- release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0.pom (added)
+++ release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0.pom Tue Feb
23 16:50:00 2021
@@ -0,0 +1,88 @@
+
+
+
+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
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
+4.0.0
+
+org.apache.felix.atomos.utils
+org.apache.felix.atomos.utils
+0.9.0
+
+
+org.apache.felix.atomos.utils.substrate.api
+jar
+atomos.utils.substrate.api
+
+
scm:git:https://github.com/apache/felix-atomos.git
+
scm:git:https://github.com/apache/felix-atomos.git
+https://github.com/apache/felix-atomos
+atomos-distribution-1.0.0
+
+
+
+
+org.osgi
+osgi.annotation
+compile
+
+
+biz.aQute.bnd
+biz.aQute.bnd.annotation
+${bnd.version}
+compile
+
+
+org.junit.jupiter
+junit-jupiter
+test
+
+
+org.assertj
+assertj-core
+3.15.0
+test
+
+
+org.javassist
+javassist
+3.26.0-GA
+
+
+
+
+
+biz.aQute.bnd
+bnd-maven-plugin
+
+-jpms-module-info:
+
+
+
+org.apache.maven.plugins
+maven-jar-plugin
+
+
+
${project.build.outputDirectory}/META-INF/MANIFEST.MF
+
+
+
+
+
+
Added: release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0.pom.asc
==
--- release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0.pom.asc
(added)
+++ release/felix/org.apache.felix.atomos.utils.substrate.api-0.9.0.pom.asc Tue
Feb 23 16:50:00 2021
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCgAdFiEEV20xNjAQvWxZ1evVjTfy8GChr1AFAmAulJQACgkQjTfy8GCh
+r1BCoRAAjSa0o3k+baohCe2A208/Y1edTSIxQCrfe7/1QgjxMOtJZ/uR
[felix-atomos] branch master updated: Update to Felix SCR 2.1.26 release
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-atomos.git
The following commit(s) were added to refs/heads/master by this push:
new 987492e Update to Felix SCR 2.1.26 release
987492e is described below
commit 987492ecde0493e3e048ea30974e657b11d875ad
Author: Thomas Watson
AuthorDate: Tue Feb 23 08:36:45 2021 -0600
Update to Felix SCR 2.1.26 release
---
atomos-parent/pom.xml | 2 +-
atomos.examples/atomos.examples.jlink/pom.xml | 28 +-
.../felix/atomos/utils/core/LauncherImpl.java | 26 +-
.../utils/core/scr/mock/EmptyBundeLogger.java | 438 +
.../atomos/utils/core/scr/mock/EmptySCRLogger.java | 49 ---
5 files changed, 24 insertions(+), 519 deletions(-)
diff --git a/atomos-parent/pom.xml b/atomos-parent/pom.xml
index 87b6e44..77b447d 100644
--- a/atomos-parent/pom.xml
+++ b/atomos-parent/pom.xml
@@ -216,7 +216,7 @@
org.apache.felix
org.apache.felix.scr
-2.1.16
+2.1.26
*
diff --git a/atomos.examples/atomos.examples.jlink/pom.xml
b/atomos.examples/atomos.examples.jlink/pom.xml
index 0fbba62..aefd57c 100644
--- a/atomos.examples/atomos.examples.jlink/pom.xml
+++ b/atomos.examples/atomos.examples.jlink/pom.xml
@@ -369,36 +369,18 @@
module org.apache.felix.scr {
requires java.logging;
requires java.management;
+requires java.xml;
requires transitive
org.apache.felix.gogo.runtime;
requires transitive osgi.core;
-requires transitive
-osgi.promise;
+requires transitive osgi.promise;
-exports
-org.apache.felix.scr.component;
-exports org.apache.felix.scr.impl;
-exports
org.apache.felix.scr.impl.config;
-exports
org.apache.felix.scr.impl.helper;
-exports
org.apache.felix.scr.impl.inject;
-exports
-org.apache.felix.scr.impl.inject.field;
-exports
org.apache.felix.scr.impl.inject.methods;
-exports
org.apache.felix.scr.impl.logger;
-exports
org.apache.felix.scr.impl.manager;
-exports
-org.apache.felix.scr.impl.metadata;
-exports
-org.apache.felix.scr.impl.parser;
-exports
org.apache.felix.scr.impl.runtime;
-exports org.apache.felix.scr.impl.xml;
+exports org.apache.felix.scr.component;
exports org.apache.felix.scr.info;
-exports org.kxml2.io;
exports org.osgi.service.component;
-exports
-org.osgi.service.component.runtime;
+exports
org.osgi.service.component.runtime;
exports
org.osgi.service.component.runtime.dto;
-exports org.xmlpull.v1;
+opens org.apache.felix.scr.impl;
}
diff --git
a/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/LauncherImpl.java
b/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/LauncherImpl.java
index ad2b2d7..00f7c86 100644
---
a/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/LauncherImpl.java
+++
b/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/LauncherImpl.java
@@ -33,6 +33,9 @@ import java.util.jar.JarFile;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
import org.apache.felix.atomos.utils.api.Context;
import org.apache.felix.atomos.utils.api.FileType;
import
svn commit: r1071507 - /websites/production/felix/content/
Author: tjwatson Date: Mon Feb 22 16:33:50 2021 New Revision: 1071507 Log: Publishing svnmucc operation to felix site by tjwatson Added: websites/production/felix/content/ - copied from r1071506, websites/staging/felix/trunk/content/
svn commit: r1071505 - /websites/production/felix/content/
Author: tjwatson Date: Mon Feb 22 16:32:47 2021 New Revision: 1071505 Log: Publishing svnmucc operation to felix site by tjwatson Added: websites/production/felix/content/ - copied from r1071504, websites/staging/felix/trunk/content/
svn commit: r1886804 - /felix/site/trunk/content/news.mdtext
Author: tjwatson Date: Mon Feb 22 16:32:22 2021 New Revision: 1886804 URL: http://svn.apache.org/viewvc?rev=1886804&view=rev Log: CMS commit to felix by tjwatson Modified: felix/site/trunk/content/news.mdtext Modified: felix/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/felix/site/trunk/content/news.mdtext?rev=1886804&r1=1886803&r2=1886804&view=diff == --- felix/site/trunk/content/news.mdtext (original) +++ felix/site/trunk/content/news.mdtext Mon Feb 22 16:32:22 2021 @@ -1,5 +1,6 @@ Title: News +* Apache Felix SCR 2.1.26 (February 22th, 2021) * Apache Felix CM Json 1.0.6 released (February 3rd, 2021) * Apache Felix CM Json 1.0.4 released (January 29th, 2021) * Apache Felix Dependency Manager r16 released (January 25th, 2021)
[felix-atomos] branch master updated: Remove ghp_path setting
This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-atomos.git The following commit(s) were added to refs/heads/master by this push: new 5c4d36e Remove ghp_path setting 5c4d36e is described below commit 5c4d36ea854747f8ab8dcdea50dc739c0a4becc5 Author: Thomas Watson AuthorDate: Mon Feb 22 09:47:52 2021 -0600 Remove ghp_path setting --- .asf.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index 857c3c1..9bffbe1 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -7,5 +7,4 @@ github: - jlink - substrate ghp_branch: gh-pages - ghp_path: /
svn commit: r1886798 - /felix/site/trunk/content/downloads.list
Author: tjwatson Date: Mon Feb 22 15:26:46 2021 New Revision: 1886798 URL: http://svn.apache.org/viewvc?rev=1886798&view=rev Log: SCR Release Modified: felix/site/trunk/content/downloads.list Modified: felix/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/felix/site/trunk/content/downloads.list?rev=1886798&r1=1886797&r2=1886798&view=diff == --- felix/site/trunk/content/downloads.list (original) +++ felix/site/trunk/content/downloads.list Mon Feb 22 15:26:46 2021 @@ -94,7 +94,7 @@ OSGi OBR service API|org.osgi.service.ob Preferences|org.apache.felix.prefs|1.1.0 Remote Shell|org.apache.felix.shell.remote|1.1.2|project||doc/changelog.txt Resolver|org.apache.felix.resolver|2.0.2|||doc/changelog.txt -SCR (Declarative Services)|org.apache.felix.scr|2.1.20 +SCR (Declarative Services)|org.apache.felix.scr|2.1.26 SCR Compat (Declarative Services)|org.apache.felix.scr.compat|1.0.4 SCR Annotations|org.apache.felix.scr.annotations|1.12.0 SCR DS Annotations|org.apache.felix.scr.ds-annotations|1.2.10
