You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gg...@apache.org on 2016/10/31 07:58:41 UTC
[1/3] karaf git commit: [KARAF-4271][KARAF-4272] Load dependent
feature repositories with circular refs protection
Repository: karaf
Updated Branches:
refs/heads/master ecc855c6a -> 7f9ef85bd
[KARAF-4271][KARAF-4272] Load dependent feature repositories with circular refs protection
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/7f9ef85b
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/7f9ef85b
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/7f9ef85b
Branch: refs/heads/master
Commit: 7f9ef85bd9067e95e593a4b552d80505daadd740
Parents: 40c9f59
Author: Grzegorz Grzybek <gr...@gmail.com>
Authored: Mon Oct 24 13:48:01 2016 +0200
Committer: Grzegorz Grzybek <gr...@gmail.com>
Committed: Mon Oct 31 08:44:39 2016 +0100
----------------------------------------------------------------------
.../karaf/features/internal/service/FeaturesServiceImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/7f9ef85b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
index 18b97d8..090112f 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
@@ -691,7 +691,9 @@ public class FeaturesServiceImpl implements FeaturesService, Deployer.DeployCall
synchronized (lock) {
repositoryCache.put(uri, repo);
}
- for (URI u : repo.getRepositories()) {
+ }
+ for (URI u : repo.getRepositories()) {
+ if (!toLoad.contains(u.toString())) {
toLoad.add(u.toString());
}
}
[3/3] karaf git commit: [KARAF-4762] Upgrade to PaxUrl 2.5.1
Posted by gg...@apache.org.
[KARAF-4762] Upgrade to PaxUrl 2.5.1
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/aaef5961
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/aaef5961
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/aaef5961
Branch: refs/heads/master
Commit: aaef5961455fc331aff4311bcf400cb367249bdb
Parents: ecc855c
Author: Guillaume Nodet <gn...@apache.org>
Authored: Thu Oct 20 17:55:50 2016 +0200
Committer: Grzegorz Grzybek <gr...@gmail.com>
Committed: Mon Oct 31 08:44:39 2016 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/aaef5961/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3efd737..80af95d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -265,7 +265,7 @@
<pax.exam.version>4.9.2</pax.exam.version>
<pax.logging.version>1.9.1</pax.logging.version>
<pax.base.version>1.5.0</pax.base.version>
- <pax.url.version>2.5.0</pax.url.version>
+ <pax.url.version>2.5.1</pax.url.version>
<pax.web.version>4.4.0</pax.web.version>
<pax.tinybundle.version>2.1.1</pax.tinybundle.version>
<pax.jdbc.version>0.9.0</pax.jdbc.version>
[2/3] karaf git commit: [KARAF-4762] Fix problem with
pax-url-aether-support being referenced in features
Posted by gg...@apache.org.
[KARAF-4762] Fix problem with pax-url-aether-support being referenced in features
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/40c9f59a
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/40c9f59a
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/40c9f59a
Branch: refs/heads/master
Commit: 40c9f59a07da60131810ef0b7140f3ea6473874b
Parents: aaef596
Author: Guillaume Nodet <gn...@apache.org>
Authored: Thu Oct 20 23:11:29 2016 +0200
Committer: Grzegorz Grzybek <gr...@gmail.com>
Committed: Mon Oct 31 08:44:39 2016 +0100
----------------------------------------------------------------------
pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/40c9f59a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 80af95d..48cb87f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1346,6 +1346,10 @@
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-aether-support</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>