brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [1/3] brooklyn-dist git commit: Load BouncyCastle bundles early on
Date Fri, 03 Feb 2017 17:06:25 GMT
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 <guglielmo.nigri@cloudsoftcorp.com>
Authored: Fri Feb 3 17:38:40 2017 +0100
Committer: Guglielmo Nigri <guglielmo.nigri@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">


Mime
View raw message