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 2014/01/22 15:03:21 UTC
[1/2] git commit: [KARAF-2713] Upgrade to maven-jxr-plugin 2.4
Updated Branches:
refs/heads/karaf-2.3.x 2e870e0e7 -> d370bb341
[KARAF-2713] Upgrade to maven-jxr-plugin 2.4
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f0a4007c
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f0a4007c
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f0a4007c
Branch: refs/heads/karaf-2.3.x
Commit: f0a4007c85ee751c174c5a8dfd94f21f57600aa5
Parents: 748d442
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Jan 22 14:59:09 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Jan 22 14:59:09 2014 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/f0a4007c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 33e14f1..bd01741 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1559,7 +1559,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
[2/2] git commit: Merge branch 'karaf-2.3.x' of
https://git-wip-us.apache.org/repos/asf/karaf into karaf-2.3.x
Posted by jb...@apache.org.
Merge branch 'karaf-2.3.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-2.3.x
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d370bb34
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d370bb34
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d370bb34
Branch: refs/heads/karaf-2.3.x
Commit: d370bb341ecae4c47d3589692def726f13ba0da8
Parents: f0a4007 2e870e0
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Jan 22 15:02:54 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Jan 22 15:02:54 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/karaf/shell/commands/InfoAction.java | 9 ++++++++-
.../apache/karaf/shell/console/jline/ConsoleFactory.java | 10 ++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------