You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2015/04/27 11:20:03 UTC
[1/4] karaf git commit: [KARAF-3699] Upgrade to Felix ConfigAdmin
1.8.4
Repository: karaf
Updated Branches:
refs/heads/master c13c502dc -> f42085cbd
[KARAF-3699] Upgrade to Felix ConfigAdmin 1.8.4
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/db7609f9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/db7609f9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/db7609f9
Branch: refs/heads/master
Commit: db7609f9aae33e1f3230bb5bd13bb68bbf31c184
Parents: c67b1ea
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Mon Apr 27 10:55:29 2015 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Mon Apr 27 11:18:03 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/db7609f9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 56b06bb..2d1308b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
<equinox.region.version>1.1.0.v20120522-1841</equinox.region.version>
<equinox.coordinator.version>1.1.0.v20120522-1841</equinox.coordinator.version>
<felix.bundlerepository.version>2.0.4</felix.bundlerepository.version>
- <felix.configadmin.version>1.8.3-SNAPSHOT</felix.configadmin.version>
+ <felix.configadmin.version>1.8.4</felix.configadmin.version>
<felix.connect.version>0.1.0-SNAPSHOT</felix.connect.version>
<felix.fileinstall.version>3.5.0</felix.fileinstall.version>
<felix.framework.version>4.9.0-SNAPSHOT</felix.framework.version>
[4/4] karaf git commit: [KARAF-3700] Upgrade to Felix Framework 5.0.0
[KARAF-3701] Upgrade to Felix Resolver 1.2.0
Posted by gn...@apache.org.
[KARAF-3700] Upgrade to Felix Framework 5.0.0
[KARAF-3701] Upgrade to Felix Resolver 1.2.0
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f42085cb
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f42085cb
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f42085cb
Branch: refs/heads/master
Commit: f42085cbdba646f950fcd52aee912885ad169827
Parents: a4e4c78
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Mon Apr 27 10:56:29 2015 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Mon Apr 27 11:18:04 2015 +0200
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/f42085cb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b39e64d..96df2d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,7 +162,7 @@
<felix.configadmin.version>1.8.4</felix.configadmin.version>
<felix.connect.version>0.1.0-SNAPSHOT</felix.connect.version>
<felix.fileinstall.version>3.5.0</felix.fileinstall.version>
- <felix.framework.version>4.9.0-SNAPSHOT</felix.framework.version>
+ <felix.framework.version>5.0.0</felix.framework.version>
<felix.framework.security.version>2.4.0</felix.framework.security.version>
<felix.gogo.version>0.16.2</felix.gogo.version>
<felix.plugin.version>2.5.4</felix.plugin.version>
@@ -176,7 +176,7 @@
<felix.scr.version>1.8.2</felix.scr.version>
<felix.scr.webconsole.plugin.version>1.0.0</felix.scr.webconsole.plugin.version>
<felix.scr.annotation.version>1.6.0</felix.scr.annotation.version>
- <felix.resolver.version>1.1.0-SNAPSHOT</felix.resolver.version>
+ <felix.resolver.version>1.2.0</felix.resolver.version>
<aries.application.version>1.0.0</aries.application.version>
<aries.application.api.version>1.0.0</aries.application.api.version>
[3/4] karaf git commit: [KARAF-3682] Upgrade to Felix
maven-bundle-plugin 2.5.4
Posted by gn...@apache.org.
[KARAF-3682] Upgrade to Felix maven-bundle-plugin 2.5.4
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/a4e4c789
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a4e4c789
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a4e4c789
Branch: refs/heads/master
Commit: a4e4c789f1a038888b0b4dcf7054f6fdcc5df1a4
Parents: db7609f
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Mon Apr 27 10:55:53 2015 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Mon Apr 27 11:18:04 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/a4e4c789/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2d1308b..b39e64d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,7 +165,7 @@
<felix.framework.version>4.9.0-SNAPSHOT</felix.framework.version>
<felix.framework.security.version>2.4.0</felix.framework.security.version>
<felix.gogo.version>0.16.2</felix.gogo.version>
- <felix.plugin.version>2.5.4-SNAPSHOT</felix.plugin.version>
+ <felix.plugin.version>2.5.4</felix.plugin.version>
<felix.utils.version>1.8.0</felix.utils.version>
<felix.webconsole.version>4.2.8</felix.webconsole.version>
<felix.webconsole.api.version>3.1.2</felix.webconsole.api.version>
[2/4] karaf git commit: Add some dependencies in the
dependencyManagement section
Posted by gn...@apache.org.
Add some dependencies in the dependencyManagement section
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c67b1ea7
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c67b1ea7
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c67b1ea7
Branch: refs/heads/master
Commit: c67b1ea75eb377a957c8131d332cc197e299cbe3
Parents: c13c502
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Mon Apr 27 10:54:23 2015 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Mon Apr 27 11:18:03 2015 +0200
----------------------------------------------------------------------
jaas/blueprint/jasypt/pom.xml | 6 +-----
jaas/jasypt/pom.xml | 7 ++-----
pom.xml | 17 +++++++++++++++++
services/maven-proxy/pom.xml | 2 --
4 files changed, 20 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/c67b1ea7/jaas/blueprint/jasypt/pom.xml
----------------------------------------------------------------------
diff --git a/jaas/blueprint/jasypt/pom.xml b/jaas/blueprint/jasypt/pom.xml
index 1dadac6..b3fc836 100644
--- a/jaas/blueprint/jasypt/pom.xml
+++ b/jaas/blueprint/jasypt/pom.xml
@@ -81,7 +81,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.connect</artifactId>
- <version>0.1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
@@ -99,22 +98,19 @@
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-debug-all</artifactId>
- <version>5.0.3</version>
+ <artifactId>asm-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/karaf/blob/c67b1ea7/jaas/jasypt/pom.xml
----------------------------------------------------------------------
diff --git a/jaas/jasypt/pom.xml b/jaas/jasypt/pom.xml
index 8dfbe3b..f854acf 100644
--- a/jaas/jasypt/pom.xml
+++ b/jaas/jasypt/pom.xml
@@ -83,9 +83,8 @@
</dependency>
<dependency>
- <groupId>com.googlecode.pojosr</groupId>
- <artifactId>de.kalpatec.pojosr.framework</artifactId>
- <version>0.1.6</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.connect</artifactId>
<scope>test</scope>
</dependency>
@@ -114,14 +113,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/karaf/blob/c67b1ea7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7b0f306..56b06bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,6 +160,7 @@
<equinox.coordinator.version>1.1.0.v20120522-1841</equinox.coordinator.version>
<felix.bundlerepository.version>2.0.4</felix.bundlerepository.version>
<felix.configadmin.version>1.8.3-SNAPSHOT</felix.configadmin.version>
+ <felix.connect.version>0.1.0-SNAPSHOT</felix.connect.version>
<felix.fileinstall.version>3.5.0</felix.fileinstall.version>
<felix.framework.version>4.9.0-SNAPSHOT</felix.framework.version>
<felix.framework.security.version>2.4.0</felix.framework.security.version>
@@ -987,6 +988,12 @@
<artifactId>org.apache.felix.resolver</artifactId>
<version>${felix.resolver.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.connect</artifactId>
+ <version>${felix.connect.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.ow2.asm</groupId>
@@ -1193,6 +1200,11 @@
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
@@ -1624,6 +1636,11 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-jetty-bundle</artifactId>
+ <version>${pax.web.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-jsp</artifactId>
<version>${pax.web.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/karaf/blob/c67b1ea7/services/maven-proxy/pom.xml
----------------------------------------------------------------------
diff --git a/services/maven-proxy/pom.xml b/services/maven-proxy/pom.xml
index 3ed1902..4c171a3 100644
--- a/services/maven-proxy/pom.xml
+++ b/services/maven-proxy/pom.xml
@@ -90,7 +90,6 @@
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-jetty-bundle</artifactId>
- <version>${pax.web.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -101,7 +100,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>