You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2017/02/03 17:06:25 UTC
[1/3] brooklyn-dist git commit: Load BouncyCastle bundles early on
Repository: brooklyn-dist
Updated Branches:
refs/heads/master 490766b24 -> f6a0ac451
Load BouncyCastle bundles early on
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/3a73be1b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/3a73be1b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/3a73be1b
Branch: refs/heads/master
Commit: 3a73be1bdfd082d23e9360b1648a5c76f78556e1
Parents: 4ca0bc2
Author: Guglielmo Nigri <gu...@cloudsoftcorp.com>
Authored: Fri Feb 3 17:38:40 2017 +0100
Committer: Guglielmo Nigri <gu...@cloudsoftcorp.com>
Committed: Fri Feb 3 17:41:59 2017 +0100
----------------------------------------------------------------------
downstream-parent/pom.xml | 2 +-
karaf/features/src/main/feature/feature.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/3a73be1b/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/downstream-parent/pom.xml b/downstream-parent/pom.xml
index 56198e5..b5a97a7 100644
--- a/downstream-parent/pom.xml
+++ b/downstream-parent/pom.xml
@@ -169,7 +169,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
+ <version>3.2.0</version>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/3a73be1b/karaf/features/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index 9c12a42..30b1050 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -43,6 +43,9 @@
<feature>package</feature>
<feature>service</feature>
<feature>system</feature>
+ <!-- load BouncyCastle early, to avoid "Refreshing bundles" later -->
+ <bundle dependency="true">mvn:org.bouncycastle/bcprov-ext-jdk15on/${bouncycastle.version}</bundle>
+ <bundle dependency="true">mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}</bundle>
</feature>
<feature name="brooklyn-startup-features" version="${project.version}" description="Bundles to add to startup.properties">
[2/3] brooklyn-dist git commit: remove unneeded config
Posted by sv...@apache.org.
remove unneeded config
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/3a80b38f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/3a80b38f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/3a80b38f
Branch: refs/heads/master
Commit: 3a80b38f0512093d1b54696e3f1d887ae9b2e357
Parents: 3a73be1
Author: Guglielmo Nigri <gu...@cloudsoftcorp.com>
Authored: Fri Feb 3 18:01:28 2017 +0100
Committer: Guglielmo Nigri <gu...@cloudsoftcorp.com>
Committed: Fri Feb 3 18:01:28 2017 +0100
----------------------------------------------------------------------
.../src/main/resources/etc/system.properties | 9 ---------
1 file changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/3a80b38f/karaf/apache-brooklyn/src/main/resources/etc/system.properties
----------------------------------------------------------------------
diff --git a/karaf/apache-brooklyn/src/main/resources/etc/system.properties b/karaf/apache-brooklyn/src/main/resources/etc/system.properties
index ffddfe3..a95f167 100644
--- a/karaf/apache-brooklyn/src/main/resources/etc/system.properties
+++ b/karaf/apache-brooklyn/src/main/resources/etc/system.properties
@@ -131,12 +131,3 @@ karaf.secured.services = (&(osgi.command.scope=*)(osgi.command.function=*))
# You can specify the location of the lock file using the
# karaf.lock.dir=/path/to/the/directory/containing/the/lock
#
-
-#
-# Explicitly prevent Karaf's sshd from registering BouncyCastle
-# to suppress misleading message in the log.
-#
-# TODO: We have BouncyCastle but it's an older version than the one org.apache.sshd
-# requires (1.49 vs 1.51). Once we update our dependency version we should revisit this.
-#
-org.apache.sshd.registerBouncyCastle = false
[3/3] brooklyn-dist git commit: Closes #83
Posted by sv...@apache.org.
Closes #83
Load BouncyCastle bundles early on
Change OSGi feature to load BouncyCastle early, to avoid "Refreshing bundles" later
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/f6a0ac45
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/f6a0ac45
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/f6a0ac45
Branch: refs/heads/master
Commit: f6a0ac4514ecd042c75f86480ea36586c74c674d
Parents: 490766b 3a80b38
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri Feb 3 19:06:13 2017 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Fri Feb 3 19:06:13 2017 +0200
----------------------------------------------------------------------
downstream-parent/pom.xml | 2 +-
.../src/main/resources/etc/system.properties | 9 ---------
karaf/features/src/main/feature/feature.xml | 3 +++
3 files changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------