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 2016/12/19 22:57:38 UTC
[1/5] karaf git commit: Upgrade to jline 3.1.2 and gogo 1.0.2
Repository: karaf
Updated Branches:
refs/heads/master cd9dcf233 -> f7246b785
Upgrade to jline 3.1.2 and gogo 1.0.2
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f7246b78
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f7246b78
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f7246b78
Branch: refs/heads/master
Commit: f7246b785dd9d65bcc079f7b64a66c609f8f0a96
Parents: 98d751d
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Dec 19 23:56:19 2016 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Mon Dec 19 23:56:59 2016 +0100
----------------------------------------------------------------------
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/f7246b78/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 543508b..b6fcec3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,8 +187,8 @@
<felix.fileinstall.version>3.5.6</felix.fileinstall.version>
<felix.framework.version>5.6.1</felix.framework.version>
<felix.framework.security.version>2.6.0</felix.framework.security.version>
- <felix.gogo.runtime.version>1.0.1-SNAPSHOT</felix.gogo.runtime.version>
- <felix.gogo.jline.version>1.0.0</felix.gogo.jline.version>
+ <felix.gogo.runtime.version>1.0.2</felix.gogo.runtime.version>
+ <felix.gogo.jline.version>1.0.2</felix.gogo.jline.version>
<felix.httplite.version>0.1.5</felix.httplite.version>
<felix.inventory.version>1.0.4</felix.inventory.version>
<felix.plugin.version>3.2.0</felix.plugin.version>
@@ -251,7 +251,7 @@
<hibernate.validator.version>5.3.4.Final</hibernate.validator.version>
<jansi.version>1.14</jansi.version>
<javassist.version>3.9.0.GA</javassist.version>
- <jline.version>3.1.1</jline.version>
+ <jline.version>3.1.2</jline.version>
<jsw.version>3.2.3</jsw.version>
<log4j.version>1.2.17</log4j.version>
<maven.version>2.0.9</maven.version>
[5/5] karaf git commit: Require maven 3.3.9
Posted by gn...@apache.org.
Require maven 3.3.9
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ab07e3c5
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ab07e3c5
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ab07e3c5
Branch: refs/heads/master
Commit: ab07e3c59c2a7ad06690dc1c541e616c1d915588
Parents: 04f038e
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Dec 19 16:53:17 2016 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Mon Dec 19 23:56:59 2016 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/ab07e3c5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index faaf857..1742002 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2019,7 +2019,7 @@
<configuration>
<rules>
<requireMavenVersion>
- <version>[3.3,4)</version>
+ <version>[3.3.9,4)</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[1.8,1.9)</version>
Re: [3/5] karaf git commit: Do not allow building with JDK 9 until it can actually succeed
Posted by Freeman Fang <fr...@gmail.com>.
Yeah, the build with java9 is broken since 9-ea+148, create KARAF-4900 to track this
－－－－－－－－－－－－－
Freeman(Yue) Fang
Red Hat, Inc.
FuseSource is now part of Red Hat
> On Dec 20, 2016, at 6:57 AM, gnodet@apache.org wrote:
>
> Do not allow building with JDK 9 until it can actually succeed
>
> Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
> Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/04f038e8
> Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/04f038e8
> Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/04f038e8
>
> Branch: refs/heads/master
> Commit: 04f038e800dd94cfed4586bf68523f2575dd9f69
> Parents: cd9dcf2
> Author: Guillaume Nodet <gn...@apache.org>
> Authored: Mon Dec 12 16:14:49 2016 +0100
> Committer: Guillaume Nodet <gn...@apache.org>
> Committed: Mon Dec 19 23:56:59 2016 +0100
>
> ----------------------------------------------------------------------
> pom.xml | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/karaf/blob/04f038e8/pom.xml
> ----------------------------------------------------------------------
> diff --git a/pom.xml b/pom.xml
> index e05a6bb..faaf857 100644
> --- a/pom.xml
> +++ b/pom.xml
> @@ -2022,7 +2022,7 @@
> <version>[3.3,4)</version>
> </requireMavenVersion>
> <requireJavaVersion>
> - <version>[1.8,9]</version>
> + <version>[1.8,1.9)</version>
> </requireJavaVersion>
> </rules>
> </configuration>
>
[3/5] karaf git commit: Do not allow building with JDK 9 until it can
actually succeed
Posted by gn...@apache.org.
Do not allow building with JDK 9 until it can actually succeed
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/04f038e8
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/04f038e8
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/04f038e8
Branch: refs/heads/master
Commit: 04f038e800dd94cfed4586bf68523f2575dd9f69
Parents: cd9dcf2
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Dec 12 16:14:49 2016 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Mon Dec 19 23:56:59 2016 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/04f038e8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e05a6bb..faaf857 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2022,7 +2022,7 @@
<version>[3.3,4)</version>
</requireMavenVersion>
<requireJavaVersion>
- <version>[1.8,9]</version>
+ <version>[1.8,1.9)</version>
</requireJavaVersion>
</rules>
</configuration>
[2/5] karaf git commit: [KARAF-4852] Fix problem with the script
debug options
Posted by gn...@apache.org.
[KARAF-4852] Fix problem with the script debug options
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/43f11c3f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/43f11c3f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/43f11c3f
Branch: refs/heads/master
Commit: 43f11c3f58fe2b732060f166af83411b8602eb46
Parents: ab07e3c
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Dec 19 16:54:22 2016 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Mon Dec 19 23:56:59 2016 +0100
----------------------------------------------------------------------
.../base/src/main/filtered-resources/resources/bin/karaf | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/43f11c3f/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
index be08741..eb8b20b 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
@@ -206,7 +206,10 @@ run() {
esac
done
- if [ ${debug} ] && [ ! ${nodebug} ]; then
+ if ${nodebug}; then
+ debug=false
+ fi
+ if ${debug}; then
if [ "x${JAVA_DEBUG_OPTS}" = "x" ]; then
JAVA_DEBUG_OPTS="${DEFAULT_JAVA_DEBUG_OPTS}"
fi
[4/5] karaf git commit: Use spaces for indentation
Posted by gn...@apache.org.
Use spaces for indentation
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/98d751d1
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/98d751d1
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/98d751d1
Branch: refs/heads/master
Commit: 98d751d180f5c4d280fa17e5fe78b95e748d182e
Parents: 43f11c3
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Dec 19 16:54:46 2016 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Mon Dec 19 23:56:59 2016 +0100
----------------------------------------------------------------------
pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/98d751d1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1742002..543508b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2327,13 +2327,13 @@
</properties>
</profile>
<profile>
- <id>java9</id>
- <properties>
+ <id>java9</id>
+ <properties>
<surefire.argLine>--add-modules java.activation,java.annotations.common,java.corba,java.transaction,java.xml.bind,java.xml.ws</surefire.argLine>
- </properties>
- <activation>
- <jdk>9</jdk>
+ </properties>
+ <activation>
+ <jdk>9</jdk>
</activation>
- </profile>
+ </profile>
</profiles>
</project>