You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/05/04 10:19:46 UTC
[1/2] brooklyn-dist git commit: Enable TLS 1.1 and 1.2
Repository: brooklyn-dist
Updated Branches:
refs/heads/master 669242da9 -> 7e840dc3d
Enable TLS 1.1 and 1.2
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/5d532f68
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/5d532f68
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/5d532f68
Branch: refs/heads/master
Commit: 5d532f683b3573eda1cda04e2ab9ca2d107563a7
Parents: 669242d
Author: Mike Zaccardo <mi...@cloudsoftcorp.com>
Authored: Wed May 3 16:55:07 2017 -0400
Committer: Mike Zaccardo <mi...@cloudsoftcorp.com>
Committed: Wed May 3 16:56:44 2017 -0400
----------------------------------------------------------------------
dist/src/main/dist/bin/brooklyn | 3 +++
karaf/apache-brooklyn/src/main/resources/bin/setenv | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/5d532f68/dist/src/main/dist/bin/brooklyn
----------------------------------------------------------------------
diff --git a/dist/src/main/dist/bin/brooklyn b/dist/src/main/dist/bin/brooklyn
index 2056e96..f7e5f97 100755
--- a/dist/src/main/dist/bin/brooklyn
+++ b/dist/src/main/dist/bin/brooklyn
@@ -49,6 +49,9 @@ JAVA_OPTS="-Dbrooklyn.location.localhost.address=127.0.0.1 ${JAVA_OPTS}"
# Increase garbage collection, see https://issues.apache.org/jira/browse/BROOKLYN-375
JAVA_OPTS="-XX:SoftRefLRUPolicyMSPerMB=1 ${JAVA_OPTS}"
+# Set the TLS protocol versions
+JAVA_OPTS="-Dhttps.protocols=TLSv1.1,TLSv1.2 ${JAVA_OPTS}"
+
# start Brooklyn
echo $$ > "$ROOT/pid_java"
if [[ -n "$JAVA_HOME" && -d "$JAVA_HOME" ]] ; then
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/5d532f68/karaf/apache-brooklyn/src/main/resources/bin/setenv
----------------------------------------------------------------------
diff --git a/karaf/apache-brooklyn/src/main/resources/bin/setenv b/karaf/apache-brooklyn/src/main/resources/bin/setenv
index f7a096d..9a109fd 100644
--- a/karaf/apache-brooklyn/src/main/resources/bin/setenv
+++ b/karaf/apache-brooklyn/src/main/resources/bin/setenv
@@ -79,4 +79,7 @@ fi
export EXTRA_JAVA_OPTS="-Dbrooklyn.location.localhost.address=127.0.0.1 ${EXTRA_JAVA_OPTS}"
# Increase garbage collection, see https://issues.apache.org/jira/browse/BROOKLYN-375
-export EXTRA_JAVA_OPTS="-XX:SoftRefLRUPolicyMSPerMB=1 ${EXTRA_JAVA_OPTS}"
\ No newline at end of file
+export EXTRA_JAVA_OPTS="-XX:SoftRefLRUPolicyMSPerMB=1 ${EXTRA_JAVA_OPTS}"
+
+# Set the TLS protocol versions
+export EXTRA_JAVA_OPTS="-Dhttps.protocols=TLSv1.1,TLSv1.2 ${EXTRA_JAVA_OPTS}"
[2/2] brooklyn-dist git commit: This closes #91
Posted by dr...@apache.org.
This closes #91
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/7e840dc3
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/7e840dc3
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/7e840dc3
Branch: refs/heads/master
Commit: 7e840dc3d1969a006c0b62ec6f3949b04bb5ce14
Parents: 669242d 5d532f6
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Thu May 4 11:19:17 2017 +0100
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Thu May 4 11:19:17 2017 +0100
----------------------------------------------------------------------
dist/src/main/dist/bin/brooklyn | 3 +++
karaf/apache-brooklyn/src/main/resources/bin/setenv | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------