Skip to content

Load BouncyCastle bundles early on #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 2 commits into from
Feb 3, 2017
Merged

Load BouncyCastle bundles early on #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a73be1
Load BouncyCastle bundles early on
googlielmo Feb 3, 2017
3a80b38
remove unneeded config
googlielmo Feb 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion downstream-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
9 changes: 0 additions & 9 deletions karaf/apache-brooklyn/src/main/resources/etc/system.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 3 additions & 0 deletions karaf/features/src/main/feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down