You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/02/26 16:26:45 UTC
[1/2] karaf git commit: [KARAF-3549] Upgrade to commons-codec 1.10
Repository: karaf
Updated Branches:
refs/heads/master 506bc685a -> a8ec9d386
[KARAF-3549] Upgrade to commons-codec 1.10
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f03f6698
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f03f6698
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f03f6698
Branch: refs/heads/master
Commit: f03f6698124d7069eb279c02ca36cfc60512674e
Parents: 15b6262
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Feb 26 16:25:58 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Feb 26 16:25:58 2015 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/f03f6698/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 61d1d18..8a4d77a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,7 +132,7 @@
<cglib.bundle.version>3.0_1</cglib.bundle.version>
<cglib2.version>2.2.0</cglib2.version>
<commons-beanutils.version>1.9.2</commons-beanutils.version>
- <commons-codec.version>1.9</commons-codec.version>
+ <commons-codec.version>1.10</commons-codec.version>
<commons-collections.version>3.2.1</commons-collections.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
<commons-fileupload.version>1.3.1</commons-fileupload.version>
[2/2] karaf git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/karaf
Posted by jb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/a8ec9d38
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a8ec9d38
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a8ec9d38
Branch: refs/heads/master
Commit: a8ec9d3861e264fe23a1e4de7997d879740c1d1b
Parents: f03f669 506bc68
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Feb 26 16:26:32 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Feb 26 16:26:32 2015 +0100
----------------------------------------------------------------------
.../resources/etc/jre.properties | 4 +-
.../main/resources/resources/lib/boot/README | 21 ++
.../main/resources/resources/lib/system/README | 21 --
assemblies/features/framework/pom.xml | 4 +
.../internal/resolver/SimpleFilter.java | 2 +-
.../features/internal/service/Deployer.java | 11 +-
.../internal/service/FeaturesServiceImpl.java | 33 +--
.../karaf/jaas/modules/impl/KarafRealm.java | 15 +-
wrapper/pom.xml | 5 +-
.../org/apache/karaf/wrapper/internal/Main.java | 146 -----------
.../wrapper/internal/PumpStreamHandler.java | 246 -------------------
.../karaf/wrapper/internal/StreamPumper.java | 195 ---------------
.../wrapper/internal/WrapperServiceImpl.java | 20 +-
.../karaf/wrapper/internal/service/Main.java | 146 +++++++++++
.../wrapper/internal/unix/karaf-wrapper.conf | 12 +-
.../wrapper/internal/windows/karaf-wrapper.conf | 12 +-
.../internal/windows64/karaf-wrapper.conf | 12 +-
17 files changed, 235 insertions(+), 670 deletions(-)
----------------------------------------------------------------------