diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,2.8.11,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,2.9.9,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,2.8.11,Apache Software License 2.0.txt
rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,2.9.9,Apache Software License 2.0.txt
diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.8.11,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.9.9,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.8.11,Apache Software License 2.0.txt
rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.9.9,Apache Software License 2.0.txt
diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.8.11.1,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.9.9,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.8.11.1,Apache Software License 2.0.txt
rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.9.9,Apache Software License 2.0.txt
diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.11,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.9.9,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.11,Apache Software License 2.0.txt
rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.9.9,Apache Software License 2.0.txt
diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.11,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.9.9,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.11,Apache Software License 2.0.txt
rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.9.9,Apache Software License 2.0.txt
diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.11,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.9.9,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.11,Apache Software License 2.0.txt
rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.9.9,Apache Software License 2.0.txt
diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml
index 01eed50a5f..08a7b93720 100644
--- a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml
+++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/licenses.xml
@@ -4,88 +4,88 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.56</version>
+      <version>1.60</version>
       <licenses>
         <license>
           <name>MIT License</name>
-          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv56/LICENSE.html</url>
+          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.56</version>
+      <version>1.60</version>
       <licenses>
         <license>
           <name>MIT License</name>
-          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv56/LICENSE.html</url>
+          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.8.11</version>
+      <version>2.9.9</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.8.11/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.9.9/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.8.11</version>
+      <version>2.9.9</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.8.11/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.9.9/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.8.11.1</version>
+      <version>2.9.9</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.8.11.1/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.9.9/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-base</artifactId>
-      <version>2.8.11</version>
+      <version>2.9.9</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.11/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.9/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-json-provider</artifactId>
-      <version>2.8.11</version>
+      <version>2.9.9</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.11/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.9/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.module</groupId>
       <artifactId>jackson-module-jaxb-annotations</artifactId>
-      <version>2.8.11</version>
+      <version>2.9.9</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.11/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.9/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.56,MIT License.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.60,MIT License.txt
similarity index 94%
rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.56,MIT License.txt
rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.60,MIT License.txt
index 17ad8659b0..acdef84f96 100644
--- a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.56,MIT License.txt	
+++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.60,MIT License.txt	
@@ -1,7 +1,7 @@
 <html>
 <body bgcolor=#ffffff>
 
-Copyright (c) 2000-2016 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 <p>
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
 and associated documentation files (the "Software"), to deal in the Software without restriction, 
diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.56,MIT License.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.60,MIT License.txt
similarity index 94%
rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.56,MIT License.txt
rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.60,MIT License.txt
index 17ad8659b0..acdef84f96 100644
--- a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.56,MIT License.txt	
+++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.60,MIT License.txt	
@@ -1,7 +1,7 @@
 <html>
 <body bgcolor=#ffffff>
 
-Copyright (c) 2000-2016 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 <p>
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
 and associated documentation files (the "Software"), to deal in the Software without restriction, 
diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.8.11.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.9.9.redhat-00001,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.8.11.redhat-1,Apache Software License 2.0.txt
rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.9.9.redhat-00001,Apache Software License 2.0.txt
diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.8.11.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.9.9.redhat-00001,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.8.11.redhat-1,Apache Software License 2.0.txt
rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.9.9.redhat-00001,Apache Software License 2.0.txt
diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.8.11.1.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.9.9.redhat-00001,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.8.11.1.redhat-1,Apache Software License 2.0.txt
rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.9.9.redhat-00001,Apache Software License 2.0.txt
diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.11.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.9.9.redhat-00001,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.11.redhat-1,Apache Software License 2.0.txt
rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.9.9.redhat-00001,Apache Software License 2.0.txt
diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.11.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.9.9.redhat-00001,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.11.redhat-1,Apache Software License 2.0.txt
rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.9.9.redhat-00001,Apache Software License 2.0.txt
diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.11.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.9.9.redhat-00001,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.11.redhat-1,Apache Software License 2.0.txt
rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.9.9.redhat-00001,Apache Software License 2.0.txt
diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/licenses.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/licenses.xml
index 2fe27dc054..40c606ee07 100644
--- a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/licenses.xml
+++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/licenses.xml
@@ -4,88 +4,88 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.56.0.redhat-2</version>
+      <version>1.60.0.redhat-00001</version>
       <licenses>
         <license>
           <name>MIT License</name>
-          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv52/LICENSE.html</url>
+          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.56.0.redhat-2</version>
+      <version>1.60.0.redhat-00001</version>
       <licenses>
         <license>
           <name>MIT License</name>
-          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv52/LICENSE.html</url>
+          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.8.11.redhat-1</version>
+      <version>2.9.9.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.8.11/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.9.9/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.8.11.redhat-1</version>
+      <version>2.9.9.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.8.11/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.9.9/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.8.11.1.redhat-1</version>
+      <version>2.9.9.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.8.11.1/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.9.9/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-base</artifactId>
-      <version>2.8.11.redhat-1</version>
+      <version>2.9.9.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.11/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.9/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-json-provider</artifactId>
-      <version>2.8.11.redhat-1</version>
+      <version>2.9.9.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.11/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.9/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.module</groupId>
       <artifactId>jackson-module-jaxb-annotations</artifactId>
-      <version>2.8.11.redhat-1</version>
+      <version>2.9.9.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.11/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.9/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcpkix-jdk15on,1.56.0.redhat-2,MIT License.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcpkix-jdk15on,1.60.0.redhat-00001,MIT License.txt
similarity index 94%
rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcpkix-jdk15on,1.56.0.redhat-2,MIT License.txt
rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcpkix-jdk15on,1.60.0.redhat-00001,MIT License.txt
index d103bbe6d4..acdef84f96 100644
--- a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcpkix-jdk15on,1.56.0.redhat-2,MIT License.txt	
+++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcpkix-jdk15on,1.60.0.redhat-00001,MIT License.txt	
@@ -1,7 +1,7 @@
 <html>
 <body bgcolor=#ffffff>
 
-Copyright (c) 2000-2015 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 <p>
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
 and associated documentation files (the "Software"), to deal in the Software without restriction, 
diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.56.0.redhat-2,MIT License.txt b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.60.0.redhat-00001,MIT License.txt
similarity index 94%
rename from distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.56.0.redhat-2,MIT License.txt
rename to distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.60.0.redhat-00001,MIT License.txt
index d103bbe6d4..acdef84f96 100644
--- a/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.56.0.redhat-2,MIT License.txt	
+++ b/distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.60.0.redhat-00001,MIT License.txt	
@@ -1,7 +1,7 @@
 <html>
 <body bgcolor=#ffffff>
 
-Copyright (c) 2000-2015 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 <p>
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
 and associated documentation files (the "Software"), to deal in the Software without restriction, 
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,2.8.11,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,2.9.9,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,2.8.11,Apache Software License 2.0.txt
rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-annotations,2.9.9,Apache Software License 2.0.txt
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.8.11,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.9.9,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.8.11,Apache Software License 2.0.txt
rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-core,2.9.9,Apache Software License 2.0.txt
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.8.11.1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.9.9,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.8.11.1,Apache Software License 2.0.txt
rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.core,jackson-databind,2.9.9,Apache Software License 2.0.txt
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.11,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.9.9,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.11,Apache Software License 2.0.txt
rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.9.9,Apache Software License 2.0.txt
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.11,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.9.9,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.11,Apache Software License 2.0.txt
rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.9.9,Apache Software License 2.0.txt
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.11,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.9.9,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.11,Apache Software License 2.0.txt
rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.9.9,Apache Software License 2.0.txt
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml
index 4c86ab7018..e7094059e0 100644
--- a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml
+++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/licenses.xml
@@ -4,88 +4,88 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.56</version>
+      <version>1.60</version>
       <licenses>
         <license>
           <name>MIT License</name>
-          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv56/LICENSE.html</url>
+          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.56</version>
+      <version>1.60</version>
       <licenses>
         <license>
           <name>MIT License</name>
-          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv56/LICENSE.html</url>
+          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.8.11</version>
+      <version>2.9.9</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.8.11/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.9.9/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.8.11</version>
+      <version>2.9.9</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.8.11/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.9.9/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.8.11.1</version>
+      <version>2.9.9</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.8.11.1/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.9.9/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-base</artifactId>
-      <version>2.8.11</version>
+      <version>2.9.9</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.11/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.9/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-json-provider</artifactId>
-      <version>2.8.11</version>
+      <version>2.9.9</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.11/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.9/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.module</groupId>
       <artifactId>jackson-module-jaxb-annotations</artifactId>
-      <version>2.8.11</version>
+      <version>2.9.9</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.11/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.9/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
@@ -96,7 +96,7 @@
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://svn.apache.org/viewvc/commons/proper/codec/tags/1.9/LICENSE.txt?view=co</url>
+          <url>https://raw.githubusercontent.com/apache/commons-codec/1.9/LICENSE.txt</url>
         </license>
       </licenses>
     </dependency>
@@ -107,7 +107,7 @@
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://svn.apache.org/viewvc/commons/proper/logging/tags/LOGGING_1_2/LICENSE.txt?view=co</url>
+          <url>https://raw.githubusercontent.com/apache/commons-logging/LOGGING_1_2/LICENSE.txt</url>
         </license>
       </licenses>
     </dependency>
@@ -136,7 +136,7 @@
     <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging</artifactId>
-      <version>3.3.1.Final</version>
+      <version>3.4.0.Final</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.56,MIT License.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.56,MIT License.txt
deleted file mode 100644
index 17ad8659b0..0000000000
--- a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.56,MIT License.txt	
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<body bgcolor=#ffffff>
-
-Copyright (c) 2000-2016 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
-<p>
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
-and associated documentation files (the "Software"), to deal in the Software without restriction, 
-including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-<p>
-The above copyright notice and this permission notice shall be included in all copies or substantial
-portions of the Software.
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-</body>
-</html>
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.60,MIT License.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.60,MIT License.txt
new file mode 100644
index 0000000000..acdef84f96
--- /dev/null
+++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcpkix-jdk15on,1.60,MIT License.txt	
@@ -0,0 +1,22 @@
+<html>
+<body bgcolor=#ffffff>
+
+Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+<p>
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
+and associated documentation files (the "Software"), to deal in the Software without restriction, 
+including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+<p>
+The above copyright notice and this permission notice shall be included in all copies or substantial
+portions of the Software.
+<p>
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+</body>
+</html>
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.56,MIT License.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.56,MIT License.txt
deleted file mode 100644
index 17ad8659b0..0000000000
--- a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.56,MIT License.txt	
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<body bgcolor=#ffffff>
-
-Copyright (c) 2000-2016 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
-<p>
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
-and associated documentation files (the "Software"), to deal in the Software without restriction, 
-including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-<p>
-The above copyright notice and this permission notice shall be included in all copies or substantial
-portions of the Software.
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-</body>
-</html>
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.60,MIT License.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.60,MIT License.txt
new file mode 100644
index 0000000000..acdef84f96
--- /dev/null
+++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.bouncycastle,bcprov-jdk15on,1.60,MIT License.txt	
@@ -0,0 +1,22 @@
+<html>
+<body bgcolor=#ffffff>
+
+Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+<p>
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
+and associated documentation files (the "Software"), to deal in the Software without restriction, 
+including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+<p>
+The above copyright notice and this permission notice shall be included in all copies or substantial
+portions of the Software.
+<p>
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+</body>
+</html>
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.jboss.logging,jboss-logging,3.3.1.Final,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.jboss.logging,jboss-logging,3.4.0.Final,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.jboss.logging,jboss-logging,3.3.1.Final,Apache Software License 2.0.txt
rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/keycloak/org.jboss.logging,jboss-logging,3.4.0.Final,Apache Software License 2.0.txt
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.8.11.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.9.9.redhat-00001,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.8.11.redhat-1,Apache Software License 2.0.txt
rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-annotations,2.9.9.redhat-00001,Apache Software License 2.0.txt
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.8.11.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.9.9.redhat-00001,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.8.11.redhat-1,Apache Software License 2.0.txt
rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-core,2.9.9.redhat-00001,Apache Software License 2.0.txt
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.8.11.1.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.9.9.redhat-00001,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.8.11.1.redhat-1,Apache Software License 2.0.txt
rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.core,jackson-databind,2.9.9.redhat-00001,Apache Software License 2.0.txt
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.11.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.9.9.redhat-00001,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.11.redhat-1,Apache Software License 2.0.txt
rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.9.9.redhat-00001,Apache Software License 2.0.txt
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.11.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.9.9.redhat-00001,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.11.redhat-1,Apache Software License 2.0.txt
rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.9.9.redhat-00001,Apache Software License 2.0.txt
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.11.redhat-1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.9.9.redhat-00001,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.8.11.redhat-1,Apache Software License 2.0.txt
rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/com.fasterxml.jackson.module,jackson-module-jaxb-annotations,2.9.9.redhat-00001,Apache Software License 2.0.txt
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml
index d1f3fb7016..81a908c58d 100644
--- a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml
+++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml
@@ -4,88 +4,88 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.56.0.redhat-2</version>
+      <version>1.60.0.redhat-00001</version>
       <licenses>
         <license>
           <name>MIT License</name>
-          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv56/LICENSE.html</url>
+          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.56.0.redhat-2</version>
+      <version>1.60.0.redhat-00001</version>
       <licenses>
         <license>
           <name>MIT License</name>
-          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv56/LICENSE.html</url>
+          <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.8.11.redhat-1</version>
+      <version>2.9.9.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.8.11/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.9.9/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.8.11.redhat-1</version>
+      <version>2.9.9.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.8.11/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.9.9/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.8.11.1.redhat-1</version>
+      <version>2.9.9.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.8.11.1/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.9.9/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-base</artifactId>
-      <version>2.8.11.redhat-1</version>
+      <version>2.9.9.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.11/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.9/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-json-provider</artifactId>
-      <version>2.8.11.redhat-1</version>
+      <version>2.9.9.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.11/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.9/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.module</groupId>
       <artifactId>jackson-module-jaxb-annotations</artifactId>
-      <version>2.8.11.redhat-1</version>
+      <version>2.9.9.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.8.11/json/src/main/resources/META-INF/LICENSE</url>
+          <url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.9/json/src/main/resources/META-INF/LICENSE</url>
         </license>
       </licenses>
     </dependency>
@@ -96,7 +96,7 @@
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://svn.apache.org/viewvc/commons/proper/codec/tags/1.9/LICENSE.txt?view=co</url>
+          <url>https://raw.githubusercontent.com/apache/commons-codec/1.9/LICENSE.txt</url>
         </license>
       </licenses>
     </dependency>
@@ -107,7 +107,7 @@
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://svn.apache.org/viewvc/commons/proper/logging/tags/LOGGING_1_2/LICENSE.txt?view=co</url>
+          <url>https://raw.githubusercontent.com/apache/commons-logging/LOGGING_1_2/LICENSE.txt</url>
         </license>
       </licenses>
     </dependency>
@@ -136,7 +136,7 @@
     <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging</artifactId>
-      <version>3.3.1.Final-redhat-1</version>
+      <version>3.4.0.Final-redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.bouncycastle,bcpkix-jdk15on,1.56.0.redhat-2,MIT License.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.bouncycastle,bcpkix-jdk15on,1.56.0.redhat-2,MIT License.txt
deleted file mode 100644
index 17ad8659b0..0000000000
--- a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.bouncycastle,bcpkix-jdk15on,1.56.0.redhat-2,MIT License.txt	
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<body bgcolor=#ffffff>
-
-Copyright (c) 2000-2016 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
-<p>
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
-and associated documentation files (the "Software"), to deal in the Software without restriction, 
-including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-<p>
-The above copyright notice and this permission notice shall be included in all copies or substantial
-portions of the Software.
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-</body>
-</html>
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.bouncycastle,bcpkix-jdk15on,1.60.0.redhat-00001,MIT License.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.bouncycastle,bcpkix-jdk15on,1.60.0.redhat-00001,MIT License.txt
new file mode 100644
index 0000000000..acdef84f96
--- /dev/null
+++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.bouncycastle,bcpkix-jdk15on,1.60.0.redhat-00001,MIT License.txt	
@@ -0,0 +1,22 @@
+<html>
+<body bgcolor=#ffffff>
+
+Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+<p>
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
+and associated documentation files (the "Software"), to deal in the Software without restriction, 
+including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+<p>
+The above copyright notice and this permission notice shall be included in all copies or substantial
+portions of the Software.
+<p>
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+</body>
+</html>
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.56.0.redhat-2,MIT License.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.56.0.redhat-2,MIT License.txt
deleted file mode 100644
index 17ad8659b0..0000000000
--- a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.56.0.redhat-2,MIT License.txt	
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<body bgcolor=#ffffff>
-
-Copyright (c) 2000-2016 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
-<p>
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
-and associated documentation files (the "Software"), to deal in the Software without restriction, 
-including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-<p>
-The above copyright notice and this permission notice shall be included in all copies or substantial
-portions of the Software.
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-</body>
-</html>
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.60.0.redhat-00001,MIT License.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.60.0.redhat-00001,MIT License.txt
new file mode 100644
index 0000000000..acdef84f96
--- /dev/null
+++ b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.bouncycastle,bcprov-jdk15on,1.60.0.redhat-00001,MIT License.txt	
@@ -0,0 +1,22 @@
+<html>
+<body bgcolor=#ffffff>
+
+Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+<p>
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
+and associated documentation files (the "Software"), to deal in the Software without restriction, 
+including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+<p>
+The above copyright notice and this permission notice shall be included in all copies or substantial
+portions of the Software.
+<p>
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+</body>
+</html>
diff --git a/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.jboss.logging,jboss-logging,3.3.1.Final-redhat-1,Apache Software License 2.0.txt b/distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.jboss.logging,jboss-logging,3.4.0.Final-redhat-00001,Apache Software License 2.0.txt
similarity index 100%
rename from distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.jboss.logging,jboss-logging,3.3.1.Final-redhat-1,Apache Software License 2.0.txt
rename to distribution/adapters/fuse-adapter-zip/src/main/resources/licenses/rh-sso/org.jboss.logging,jboss-logging,3.4.0.Final-redhat-00001,Apache Software License 2.0.txt
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.apache.ant,ant,1.8.4,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.apache.ant,ant,1.8.4,Apache Software License 2.0.txt
index b21d867b2d..cdf6ff8b22 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.apache.ant,ant,1.8.4,Apache Software License 2.0.txt	
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.apache.ant,ant,1.8.4,Apache Software License 2.0.txt	
@@ -202,7 +202,7 @@
  *   limitations under the License.
  */
 
-W3C� SOFTWARE NOTICE AND LICENSE
+W3C® SOFTWARE NOTICE AND LICENSE
 http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
 
 This work (and included software, documentation such as READMEs, or other
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.apache.ant,ant-launcher,1.8.4,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.apache.ant,ant-launcher,1.8.4,Apache Software License 2.0.txt
index b21d867b2d..cdf6ff8b22 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.apache.ant,ant-launcher,1.8.4,Apache Software License 2.0.txt	
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.apache.ant,ant-launcher,1.8.4,Apache Software License 2.0.txt	
@@ -202,7 +202,7 @@
  *   limitations under the License.
  */
 
-W3C� SOFTWARE NOTICE AND LICENSE
+W3C® SOFTWARE NOTICE AND LICENSE
 http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
 
 This work (and included software, documentation such as READMEs, or other
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.eclipse.sisu,org.eclipse.sisu.inject,0.3.2,Eclipse Public License 1.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.eclipse.sisu,org.eclipse.sisu.inject,0.3.2,Eclipse Public License 1.0.txt
index d02fa0f945..d58b5977e0 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.eclipse.sisu,org.eclipse.sisu.inject,0.3.2,Eclipse Public License 1.0.txt	
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.eclipse.sisu,org.eclipse.sisu.inject,0.3.2,Eclipse Public License 1.0.txt	
@@ -14,31 +14,42 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="keywords" content="eclipse.org, Eclipse Foundation, Eclipse, Git, Source code, Source" />
-    <link href="//fonts.googleapis.com/css?family=Open+Sans:400,700,300,600,100" rel="stylesheet" type="text/css">
-    <link rel="shortcut icon" href="/eclipse.org-common/themes/solstice/public/images/favicon.ico"/>
-    <link rel="stylesheet" href="/eclipse.org-common/themes/solstice/public/stylesheets/barebone-footer.min.css">
+    <link href="//fonts.googleapis.com/css?family=Libre+Franklin:400,700,300,600,100" rel="stylesheet" type="text/css"/>
+    <link rel="shortcut icon" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/images/favicon.ico"/>
+    <link rel="stylesheet" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/quicksilver.min.css?v1.4"/>
     <link rel="stylesheet" type="text/css" href="/cgit.css" media="screen" />
 
 </head>
 <body>
-<div class="barebone-layout">
-<a class="sr-only" href="#content">Skip to main content</a>
-<header role="banner" class="thin-header padding-top-10" id="header-wrapper">
- <link rel="stylesheet" type="text/css" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
- <script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
-
+<!-- Google Tag Manager (noscript) -->
+<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-5WLCZXC"
+  height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+<!-- End Google Tag Manager (noscript) -->    <a class="sr-only" href="#content">Skip to main content</a>
+<header class="header-wrapper" id="header-wrapper">
+  <div class="clearfix toolbar-container-wrapper">
+    <div class="container-fluid">
+      <div class="text-right toolbar-row row hidden-print">
+        <div class="col-md-24 row-toolbar-col">
+          <ul class="list-inline">
+            <li><a href="https://accounts.eclipse.org/user/edit" class="" data-tab-destination="tab-profile"><i class="fa fa-edit fa-fw"></i> Edit my account</a></li>
+            <li><a class="toolbar-link toolbar-manage-cookies dropdown-toggle"><i class="fa fa-wrench"></i> Manage Cookies</a></li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
   <div class="container-fluid">
     <div class="row" id="header-row">
-      <div class="col-sm-6 col-md-6 col-lg-5" id="header-left">
-        <div class="wrapper-logo-default"><a href="https://www.eclipse.org/"><img class="logo-eclipse-default img-responsive hidden-xs" alt="logo" src="/eclipse.org-common/themes/solstice/public/images/logo/eclipse-426x100.png"/></a></div>
+      <div class="col-sm-8 col-md-6 col-lg-4" id="header-left">
+        <div class="wrapper-logo-default"><a href="https://www.eclipse.org/"><img class="logo-eclipse-default hidden-xs" alt="Eclipse.org logo" width="160" src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/images/logo/eclipse-foundation-white-orange.svg"/></a></div>
       </div>
-      <div class="col-sm-18 col-md-18 col-lg-19" id="main-menu-wrapper">
-        <div class="navbar yamm navbar-right" id="main-menu">
-          <div id="navbar-collapse-1" class="navbar-collapse collapse">
+      <div class="col-sm-19 col-md-20 margin-top-10" id="main-menu-wrapper">
+        <div class="float-right hidden-xs" id="btn-call-for-action"><a href="https://www.eclipse.org/donate/" class="btn btn-huge btn-info"><i class="fa fa-star"></i> Donate</a></div>
+        <div class="navbar yamm float-sm-right" id="main-menu">
+          <div class="navbar-collapse collapse" id="navbar-main-menu">
             <ul class="nav navbar-nav">
-              <li class="visible-thin"><a href="https://www.eclipse.org/downloads/" target="_self">Download</a></li>
-              <li><a href="https://www.eclipse.org/users/" target="_self">Getting Started</a></li>
               <li><a href="https://www.eclipse.org/membership/" target="_self">Members</a></li>
+              <li><a href="https://www.eclipse.org/org/workinggroups/" target="_self">Working Groups</a></li>
               <li><a href="https://www.eclipse.org/projects/" target="_self">Projects</a></li>
               <li class="dropdown visible-xs">
                 <a href="#" data-toggle="dropdown" class="dropdown-toggle">Community <b class="caret"></b></a>
@@ -48,6 +59,7 @@
                   <li><a href="http://www.planeteclipse.org/">Planet Eclipse</a></li>
                   <li><a href="https://www.eclipse.org/community/eclipse_newsletter/">Newsletter</a></li>
                   <li><a href="https://www.youtube.com/user/EclipseFdn">Videos</a></li>
+                  <li><a href="https://blogs.eclipse.org">Blogs</a></li>
                 </ul>
               </li>
               <li class="dropdown visible-xs">
@@ -58,24 +70,24 @@
                   <li><a href="https://www.eclipse.org/mail/">Mailing Lists</a></li>
                   <li><a href="https://wiki.eclipse.org/">Wiki</a></li>
                   <li><a href="https://wiki.eclipse.org/IRC">IRC</a></li>
-                  <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
+                  <li><a href="https://www.eclipse.org/org/research/">Research</a></li>
                 </ul>
               </li>
               <li class="dropdown visible-xs">
-                <a href="#" data-toggle="dropdown" class="dropdown-toggle">Working Groups <b class="caret"></b></a>
+                <a href="#" data-toggle="dropdown" class="dropdown-toggle">Eclipse IDE <b class="caret"></b></a>
                 <ul class="dropdown-menu">
-                  <li><a href="http://wiki.eclipse.org/Auto_IWG">Automotive</a></li>
-                  <li><a href="http://iot.eclipse.org">Internet of Things</a></li>
-                  <li><a href="http://locationtech.org">LocationTech</a></li>
-                  <li><a href="http://lts.eclipse.org">Long-Term Support</a></li>
-                  <li><a href="http://polarsys.org">PolarSys</a></li>
-                  <li><a href="http://science.eclipse.org">Science</a></li>
-                  <li><a href="http://www.openmdm.org">OpenMDM</a></li>
+                  <li><a href="https://www.eclipse.org/downloads">Download</a></li>
+                  <li><a href="https://www.eclipse.org/eclipseide">Learn More</a></li>
+                  <li><a href="https://help.eclipse.org">Documentation</a></li>
+                  <li><a href="https://www.eclipse.org/getting_started">Getting Started / Support</a></li>
+                  <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
+                  <li><a href="https://www.eclipse.org/ide/">IDE and Tools</a></li>
+                  <li><a href="https://www.eclipse.org/forums/index.php/f/89/">Newcomer Forum</a></li>
                 </ul>
               </li>
               <!-- More -->
               <li class="dropdown eclipse-more hidden-xs">
-                <a data-toggle="dropdown" class="dropdown-toggle">More<b class="caret"></b></a>
+                <a data-toggle="dropdown" class="dropdown-toggle" role="button">More<b class="caret"></b></a>
                 <ul class="dropdown-menu">
                   <li>
                     <!-- Content container to add padding -->
@@ -90,6 +102,7 @@
                           <li><a href="http://www.planeteclipse.org/">Planet Eclipse</a></li>
                           <li><a href="https://www.eclipse.org/community/eclipse_newsletter/">Newsletter</a></li>
                           <li><a href="https://www.youtube.com/user/EclipseFdn">Videos</a></li>
+                          <li><a href="https://blogs.eclipse.org">Blogs</a></li>
                         </ul>
                         <ul class="col-sm-8 list-unstyled">
                           <li>
@@ -100,58 +113,94 @@
                           <li><a href="https://www.eclipse.org/mail/">Mailing Lists</a></li>
                           <li><a href="https://wiki.eclipse.org/">Wiki</a></li>
                           <li><a href="https://wiki.eclipse.org/IRC">IRC</a></li>
-                          <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
+                          <li><a href="https://www.eclipse.org/org/research/">Research</a></li>
                         </ul>
                         <ul class="col-sm-8 list-unstyled">
                           <li>
-                            <p><strong>Working Groups</strong></p>
+                            <p><strong>Eclipse IDE</strong></p>
                           </li>
-                          <li><a href="http://wiki.eclipse.org/Auto_IWG">Automotive</a></li>
-                          <li><a href="http://iot.eclipse.org">Internet of Things</a></li>
-                          <li><a href="http://locationtech.org">LocationTech</a></li>
-                          <li><a href="http://lts.eclipse.org">Long-Term Support</a></li>
-                          <li><a href="http://polarsys.org">PolarSys</a></li>
-                          <li><a href="http://science.eclipse.org">Science</a></li>
-                          <li><a href="http://www.openmdm.org">OpenMDM</a></li>
+                          <li><a href="https://www.eclipse.org/downloads">Download</a></li>
+                          <li><a href="https://www.eclipse.org/eclipseide">Learn More</a></li>
+                          <li><a href="https://help.eclipse.org">Documentation</a></li>
+                          <li><a href="https://www.eclipse.org/getting_started">Getting Started / Support</a></li>
+                          <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
+                          <li><a href="https://www.eclipse.org/ide/">IDE and Tools</a></li>
+                          <li><a href="https://www.eclipse.org/forums/index.php/f/89/">Newcomer Forum</a></li>
                         </ul>
                       </div>
                     </div>
                   </li>
                 </ul>
               </li>
+              <li class="dropdown eclipse-more main-menu-search">
+                <a data-toggle="dropdown" class="dropdown-toggle" role="button"><i class="fa fa-search"></i> <b class="caret"></b></a>
+                <ul class="dropdown-menu">
+                  <li>
+                    <!-- Content container to add padding -->
+                    <div class="yamm-content">
+                      <div class="row">
+                        <div class="col-sm-24">
+                          <p>Search</p>
+                          <div class="row">
+                            <div class="col-md-24">
+                              <div id="custom-search-form" class="reset-box-sizing">
+                                <script>
+                                  (function() {
+                                    var cx = '011805775785170369411:p3ec0igo0qq';
+                                    var gcse = document.createElement('script');
+                                    gcse.type = 'text/javascript';
+                                    gcse.async = true;
+                                    gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
+                                    '//cse.google.com/cse.js?cx=' + cx;
+                                    var s = document.getElementsByTagName('script')[0];
+                                    s.parentNode.insertBefore(gcse, s);
+                                  })();
+                                </script>
+                                <gcse:searchbox-only gname="main" resultsUrl="https://www.eclipse.org/home/search.php"></gcse:searchbox-only>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </li>
+                </ul>
+              </li>
             </ul>
           </div>
           <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
+            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-main-menu">
             <span class="sr-only">Toggle navigation</span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             </button>
-            <div class="wrapper-logo-mobile"><a class="navbar-brand visible-xs" href="https://www.eclipse.org/"><img class="logo-eclipse-default-mobile img-responsive" alt="logo" src="/eclipse.org-common/themes/solstice/public/images/logo/eclipse-800x188.png"/></a></div>
+            <div class="wrapper-logo-mobile"><a class="navbar-brand visible-xs" href="https://www.eclipse.org/"><img class="logo-eclipse-default-mobile img-responsive" alt="Eclipse.org logo" width="160" src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/images/logo/eclipse-foundation-white-orange.svg"/></a></div>
           </div>
         </div>
       </div>
     </div>
   </div>
 </header>
-<section class="hidden-print default-breadcrumbs" id="breadcrumb">
+<section class="default-breadcrumbs hidden-print breadcrumbs-default-margin" id="breadcrumb">
   <div class="container-fluid">
     <h3 class="sr-only">Breadcrumbs</h3>
-    <div class="col-xs-24">
-      <ol class="breadcrumb">
-        <li><a href="https://www.eclipse.org/">Home</a></li>
-        <li><a href="https://www.eclipse.org/contribute/">Contribute</a></li>
-        <li><a href="/c/">Source code</a></li>
-      </ol>
+    <div class="row">
+      <div class="col-sm-24">
+        <ol class="breadcrumb">
+          <li><a href="https://www.eclipse.org/">Home</a></li>
+          <li><a href="https://www.eclipse.org/contribute/">Contribute</a></li>
+          <li><a href="/c/">Source code</a></li>
+        </ol>
+      </div>
     </div>
   </div>
 </section>
-<main role="main">
-<div class="container-fluid background-image-none" id="novaContent">
-<br /><br />
-<div id='cgit'><table id='header'>
+<!-- /#breadcrumb -->
+<main>
+<div class="container-fluid legacy-page" id="novaContent">
+<div class="col-md-24"><div id='cgit'><table id='header'>
 <tr>
 <td class='logo' rowspan='2'><a href='/c/'><img src='/git.png' alt='cgit logo'/></a></td>
 <td class='main'><a href='/c/'>index</a> : <a title='org.eclipse.sisu.inject.git' href='/c/sisu/org.eclipse.sisu.inject.git/'>org.eclipse.sisu.inject.git</a></td><td class='form'><form method='get'>
@@ -317,67 +366,97 @@ This Agreement is governed by the laws of the State of New York and the intellec
 </code></pre></td></tr></table>
 </div> <!-- class=content -->
 </div>
-</main> <!-- /#main-content-container-row -->
+</div>
+</main>
 <p id="back-to-top">
   <a class="visible-xs" href="#top">Back to the top</a>
 </p>
-<footer role="contentinfo" id="solstice-footer">
+<footer id="solstice-footer">
   <div class="container">
     <div class="row">
-      <section class="col-sm-offset-1 col-xs-11 col-sm-7 col-md-6 col-md-offset-0 hidden-print" id="footer-eclipse-foundation">
-            <h2 class="section-title">Eclipse Foundation</h2>
-    <ul class="nav">
-    <li><a href="https://www.eclipse.org/org/">About us</a></li>
-    <li><a href="https://www.eclipse.org/org/foundation/contact.php">Contact Us</a></li>
-    <li><a href="https://www.eclipse.org/donate">Donate</a></li>
-      <li><a href="https://www.eclipse.org/org/documents/">Governance</a></li>
-      <li><a href="https://www.eclipse.org/artwork/">Logo and Artwork</a></li>
-      <li><a href="https://www.eclipse.org/org/foundation/directors.php">Board of Directors</a></li>
-    </ul>      </section>
-      <section class="col-sm-offset-1 col-xs-11 col-sm-7 col-md-6 col-md-offset-0 hidden-print" id="footer-legal">
-            <h2 class="section-title">Legal</h2>
-    <ul class="nav">
-      <li><a href="https://www.eclipse.org/legal/privacy.php">Privacy Policy</a></li>
-      <li><a href="https://www.eclipse.org/legal/termsofuse.php">Terms of Use</a></li>
-      <li><a href="https://www.eclipse.org/legal/copyright.php">Copyright Agent</a></li>
-      <li><a href="https://www.eclipse.org/org/documents/epl-2.0">Eclipse Public License </a></li>
-      <li><a href="https://www.eclipse.org/legal/">Legal Resources </a></li>
-    </ul>      </section>
-      <section class="col-sm-offset-1 col-xs-11 col-sm-7 col-md-6 col-md-offset-0 hidden-print" id="footer-useful-links">
-            <h2 class="section-title">Useful Links</h2>
-    <ul class="nav">
-      <li><a href="https://bugs.eclipse.org/bugs/">Report a Bug</a></li>
-      <li><a href="//help.eclipse.org/">Documentation</a></li>
-      <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
-      <li><a href="https://www.eclipse.org/mail/">Mailing Lists</a></li>
-      <li><a href="https://www.eclipse.org/forums/">Forums</a></li>
-      <li><a href="//marketplace.eclipse.org">Marketplace</a></li>
-    </ul>      </section>
-      <section class="col-sm-offset-1 col-xs-11 col-sm-7 col-md-6 col-md-offset-0 hidden-print" id="footer-other">
-            <h2 class="section-title">Other</h2>
-    <ul class="nav">
-      <li><a href="https://www.eclipse.org/ide/">IDE and Tools</a></li>
-      <li><a href="https://www.eclipse.org/projects">Community of Projects</a></li>
-      <li><a href="https://www.eclipse.org/org/workinggroups/">Working Groups</a></li>
-      <li><a href="https://wiki.eclipse.org/Ssh_fingerprints">Server fingerprints</a></li>
-    </ul>
-
-    <ul class="list-inline social-media">
-      <li><a href="https://twitter.com/EclipseFdn"><i class="fa fa-twitter-square"></i></a></li>
-      <li><a href="https://plus.google.com/+Eclipse"><i class="fa fa-google-plus-square"></i></a></li>
-      <li><a href="https://www.facebook.com/eclipse.org"><i class="fa fa-facebook-square"></i> </a></li>
-      <li><a href="https://www.youtube.com/user/EclipseFdn"><i class="fa fa-youtube-square"></i></a></li>
-    </ul>      </section>
-            <div id="copyright" class="col-sm-offset-1 col-sm-14 col-md-24 col-md-offset-0">
-        <span class="hidden-print"><div class="wrapper-logo-eclipse-white"><a href="https://www.eclipse.org"><img class="logo-eclipse-white img-responsive" alt="logo" src="/eclipse.org-common/themes/solstice/public/images/logo/eclipse-logo-bw-332x78.png"/></a></div></span>
-        <p id="copyright-text">Copyright &copy; 2017 The Eclipse Foundation. All Rights Reserved.</p>
-      </div>      <a href="#" class="scrollup">Back to the top</a>
+      <section class="col-sm-6 hidden-print" id="footer-eclipse-foundation">
+        <h2 class="section-title">Eclipse Foundation</h2>
+        <ul class="nav">
+          <li><a href="https://www.eclipse.org/org/">About Us</a></li>
+          <li><a href="https://www.eclipse.org/org/foundation/contact.php">Contact Us</a></li>
+          <li><a href="https://www.eclipse.org/donate">Donate</a></li>
+          <li><a href="https://www.eclipse.org/org/documents/">Governance</a></li>
+          <li><a href="https://www.eclipse.org/artwork/">Logo and Artwork</a></li>
+          <li><a href="https://www.eclipse.org/org/foundation/directors.php">Board of Directors</a></li>
+        </ul>
+      </section>
+      <section class="col-sm-6 hidden-print" id="footer-legal">
+        <h2 class="section-title">Legal</h2>
+        <ul class="nav">
+          <li><a href="https://www.eclipse.org/legal/privacy.php">Privacy Policy</a></li>
+          <li><a href="https://www.eclipse.org/legal/termsofuse.php">Terms of Use</a></li>
+          <li><a href="https://www.eclipse.org/legal/copyright.php">Copyright Agent</a></li>
+          <li><a href="https://www.eclipse.org/legal/epl-2.0/">Eclipse Public License</a></li>
+          <li><a href="https://www.eclipse.org/legal/">Legal Resources</a></li>
+        </ul>
+      </section>
+      <section class="col-sm-6 hidden-print" id="footer-useful-links">
+        <h2 class="section-title">Useful Links</h2>
+        <ul class="nav">
+          <li><a href="https://bugs.eclipse.org/bugs/">Report a Bug</a></li>
+          <li><a href="//help.eclipse.org/">Documentation</a></li>
+          <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
+          <li><a href="https://www.eclipse.org/mail/">Mailing Lists</a></li>
+          <li><a href="https://www.eclipse.org/forums/">Forums</a></li>
+          <li><a href="//marketplace.eclipse.org">Marketplace</a></li>
+        </ul>
+      </section>
+      <section class="col-sm-6 hidden-print" id="footer-other">
+        <h2 class="section-title">Other</h2>
+        <ul class="nav">
+          <li><a href="https://www.eclipse.org/ide/">IDE and Tools</a></li>
+          <li><a href="https://www.eclipse.org/projects">Community of Projects</a></li>
+          <li><a href="https://www.eclipse.org/org/workinggroups/">Working Groups</a></li>
+          <li><a href="https://www.eclipse.org/org/research/">Research@Eclipse</a></li>
+          <li><a href="https://www.eclipse.org/security/">Report a Vulnerability</a></li>
+          <li><a href="https://status.eclipse.org">Service Status</a></li>
+        </ul>
+      </section>
+      <div class="col-sm-24 margin-top-20">
+        <div class="row">
+          <div id="copyright" class="col-md-16">
+            <p id="copyright-text">Copyright &copy; Eclipse Foundation, Inc. All Rights Reserved.</p>
+          </div>
+          <div class="col-md-8 social-media">
+            <ul class="list-inline">
+              <li>
+                <a class="social-media-link fa-stack fa-lg" href="https://twitter.com/EclipseFdn">
+                <i class="fa fa-circle-thin fa-stack-2x"></i>
+                <i class="fa fa-twitter fa-stack-1x"></i>
+                </a>
+              </li>
+              <li>
+                <a class="social-media-link fa-stack fa-lg" href="https://www.facebook.com/eclipse.org">
+                <i class="fa fa-circle-thin fa-stack-2x"></i>
+                <i class="fa fa-facebook fa-stack-1x"></i>
+                </a>
+              </li>
+              <li>
+                <a class="social-media-link fa-stack fa-lg" href="https://www.youtube.com/user/EclipseFdn">
+                <i class="fa fa-circle-thin fa-stack-2x"></i>
+                <i class="fa fa-youtube fa-stack-1x"></i>
+                </a>
+              </li>
+              <li>
+                <a class="social-media-link fa-stack fa-lg" href="https://www.linkedin.com/company/eclipse-foundation">
+                <i class="fa fa-circle-thin fa-stack-2x"></i>
+                <i class="fa fa-linkedin fa-stack-1x"></i>
+                </a>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+      <a href="#" class="scrollup">Back to the top</a>
     </div>
   </div>
 </footer>
 <!-- Placed at the end of the document so the pages load faster -->
-<script src="/eclipse.org-common/themes/solstice/public/javascript/main.min.js"></script>
-</div>
-</div> <!-- id=cgit -->
+<script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/main.min.js?var=1.3"></script></div> <!-- id=cgit -->
 </body>
 </html>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.eclipse.sisu,org.eclipse.sisu.plexus,0.3.2,Eclipse Public License 1.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.eclipse.sisu,org.eclipse.sisu.plexus,0.3.2,Eclipse Public License 1.0.txt
index d02fa0f945..d58b5977e0 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.eclipse.sisu,org.eclipse.sisu.plexus,0.3.2,Eclipse Public License 1.0.txt	
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.eclipse.sisu,org.eclipse.sisu.plexus,0.3.2,Eclipse Public License 1.0.txt	
@@ -14,31 +14,42 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="keywords" content="eclipse.org, Eclipse Foundation, Eclipse, Git, Source code, Source" />
-    <link href="//fonts.googleapis.com/css?family=Open+Sans:400,700,300,600,100" rel="stylesheet" type="text/css">
-    <link rel="shortcut icon" href="/eclipse.org-common/themes/solstice/public/images/favicon.ico"/>
-    <link rel="stylesheet" href="/eclipse.org-common/themes/solstice/public/stylesheets/barebone-footer.min.css">
+    <link href="//fonts.googleapis.com/css?family=Libre+Franklin:400,700,300,600,100" rel="stylesheet" type="text/css"/>
+    <link rel="shortcut icon" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/images/favicon.ico"/>
+    <link rel="stylesheet" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/quicksilver.min.css?v1.4"/>
     <link rel="stylesheet" type="text/css" href="/cgit.css" media="screen" />
 
 </head>
 <body>
-<div class="barebone-layout">
-<a class="sr-only" href="#content">Skip to main content</a>
-<header role="banner" class="thin-header padding-top-10" id="header-wrapper">
- <link rel="stylesheet" type="text/css" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
- <script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
-
+<!-- Google Tag Manager (noscript) -->
+<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-5WLCZXC"
+  height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+<!-- End Google Tag Manager (noscript) -->    <a class="sr-only" href="#content">Skip to main content</a>
+<header class="header-wrapper" id="header-wrapper">
+  <div class="clearfix toolbar-container-wrapper">
+    <div class="container-fluid">
+      <div class="text-right toolbar-row row hidden-print">
+        <div class="col-md-24 row-toolbar-col">
+          <ul class="list-inline">
+            <li><a href="https://accounts.eclipse.org/user/edit" class="" data-tab-destination="tab-profile"><i class="fa fa-edit fa-fw"></i> Edit my account</a></li>
+            <li><a class="toolbar-link toolbar-manage-cookies dropdown-toggle"><i class="fa fa-wrench"></i> Manage Cookies</a></li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
   <div class="container-fluid">
     <div class="row" id="header-row">
-      <div class="col-sm-6 col-md-6 col-lg-5" id="header-left">
-        <div class="wrapper-logo-default"><a href="https://www.eclipse.org/"><img class="logo-eclipse-default img-responsive hidden-xs" alt="logo" src="/eclipse.org-common/themes/solstice/public/images/logo/eclipse-426x100.png"/></a></div>
+      <div class="col-sm-8 col-md-6 col-lg-4" id="header-left">
+        <div class="wrapper-logo-default"><a href="https://www.eclipse.org/"><img class="logo-eclipse-default hidden-xs" alt="Eclipse.org logo" width="160" src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/images/logo/eclipse-foundation-white-orange.svg"/></a></div>
       </div>
-      <div class="col-sm-18 col-md-18 col-lg-19" id="main-menu-wrapper">
-        <div class="navbar yamm navbar-right" id="main-menu">
-          <div id="navbar-collapse-1" class="navbar-collapse collapse">
+      <div class="col-sm-19 col-md-20 margin-top-10" id="main-menu-wrapper">
+        <div class="float-right hidden-xs" id="btn-call-for-action"><a href="https://www.eclipse.org/donate/" class="btn btn-huge btn-info"><i class="fa fa-star"></i> Donate</a></div>
+        <div class="navbar yamm float-sm-right" id="main-menu">
+          <div class="navbar-collapse collapse" id="navbar-main-menu">
             <ul class="nav navbar-nav">
-              <li class="visible-thin"><a href="https://www.eclipse.org/downloads/" target="_self">Download</a></li>
-              <li><a href="https://www.eclipse.org/users/" target="_self">Getting Started</a></li>
               <li><a href="https://www.eclipse.org/membership/" target="_self">Members</a></li>
+              <li><a href="https://www.eclipse.org/org/workinggroups/" target="_self">Working Groups</a></li>
               <li><a href="https://www.eclipse.org/projects/" target="_self">Projects</a></li>
               <li class="dropdown visible-xs">
                 <a href="#" data-toggle="dropdown" class="dropdown-toggle">Community <b class="caret"></b></a>
@@ -48,6 +59,7 @@
                   <li><a href="http://www.planeteclipse.org/">Planet Eclipse</a></li>
                   <li><a href="https://www.eclipse.org/community/eclipse_newsletter/">Newsletter</a></li>
                   <li><a href="https://www.youtube.com/user/EclipseFdn">Videos</a></li>
+                  <li><a href="https://blogs.eclipse.org">Blogs</a></li>
                 </ul>
               </li>
               <li class="dropdown visible-xs">
@@ -58,24 +70,24 @@
                   <li><a href="https://www.eclipse.org/mail/">Mailing Lists</a></li>
                   <li><a href="https://wiki.eclipse.org/">Wiki</a></li>
                   <li><a href="https://wiki.eclipse.org/IRC">IRC</a></li>
-                  <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
+                  <li><a href="https://www.eclipse.org/org/research/">Research</a></li>
                 </ul>
               </li>
               <li class="dropdown visible-xs">
-                <a href="#" data-toggle="dropdown" class="dropdown-toggle">Working Groups <b class="caret"></b></a>
+                <a href="#" data-toggle="dropdown" class="dropdown-toggle">Eclipse IDE <b class="caret"></b></a>
                 <ul class="dropdown-menu">
-                  <li><a href="http://wiki.eclipse.org/Auto_IWG">Automotive</a></li>
-                  <li><a href="http://iot.eclipse.org">Internet of Things</a></li>
-                  <li><a href="http://locationtech.org">LocationTech</a></li>
-                  <li><a href="http://lts.eclipse.org">Long-Term Support</a></li>
-                  <li><a href="http://polarsys.org">PolarSys</a></li>
-                  <li><a href="http://science.eclipse.org">Science</a></li>
-                  <li><a href="http://www.openmdm.org">OpenMDM</a></li>
+                  <li><a href="https://www.eclipse.org/downloads">Download</a></li>
+                  <li><a href="https://www.eclipse.org/eclipseide">Learn More</a></li>
+                  <li><a href="https://help.eclipse.org">Documentation</a></li>
+                  <li><a href="https://www.eclipse.org/getting_started">Getting Started / Support</a></li>
+                  <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
+                  <li><a href="https://www.eclipse.org/ide/">IDE and Tools</a></li>
+                  <li><a href="https://www.eclipse.org/forums/index.php/f/89/">Newcomer Forum</a></li>
                 </ul>
               </li>
               <!-- More -->
               <li class="dropdown eclipse-more hidden-xs">
-                <a data-toggle="dropdown" class="dropdown-toggle">More<b class="caret"></b></a>
+                <a data-toggle="dropdown" class="dropdown-toggle" role="button">More<b class="caret"></b></a>
                 <ul class="dropdown-menu">
                   <li>
                     <!-- Content container to add padding -->
@@ -90,6 +102,7 @@
                           <li><a href="http://www.planeteclipse.org/">Planet Eclipse</a></li>
                           <li><a href="https://www.eclipse.org/community/eclipse_newsletter/">Newsletter</a></li>
                           <li><a href="https://www.youtube.com/user/EclipseFdn">Videos</a></li>
+                          <li><a href="https://blogs.eclipse.org">Blogs</a></li>
                         </ul>
                         <ul class="col-sm-8 list-unstyled">
                           <li>
@@ -100,58 +113,94 @@
                           <li><a href="https://www.eclipse.org/mail/">Mailing Lists</a></li>
                           <li><a href="https://wiki.eclipse.org/">Wiki</a></li>
                           <li><a href="https://wiki.eclipse.org/IRC">IRC</a></li>
-                          <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
+                          <li><a href="https://www.eclipse.org/org/research/">Research</a></li>
                         </ul>
                         <ul class="col-sm-8 list-unstyled">
                           <li>
-                            <p><strong>Working Groups</strong></p>
+                            <p><strong>Eclipse IDE</strong></p>
                           </li>
-                          <li><a href="http://wiki.eclipse.org/Auto_IWG">Automotive</a></li>
-                          <li><a href="http://iot.eclipse.org">Internet of Things</a></li>
-                          <li><a href="http://locationtech.org">LocationTech</a></li>
-                          <li><a href="http://lts.eclipse.org">Long-Term Support</a></li>
-                          <li><a href="http://polarsys.org">PolarSys</a></li>
-                          <li><a href="http://science.eclipse.org">Science</a></li>
-                          <li><a href="http://www.openmdm.org">OpenMDM</a></li>
+                          <li><a href="https://www.eclipse.org/downloads">Download</a></li>
+                          <li><a href="https://www.eclipse.org/eclipseide">Learn More</a></li>
+                          <li><a href="https://help.eclipse.org">Documentation</a></li>
+                          <li><a href="https://www.eclipse.org/getting_started">Getting Started / Support</a></li>
+                          <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
+                          <li><a href="https://www.eclipse.org/ide/">IDE and Tools</a></li>
+                          <li><a href="https://www.eclipse.org/forums/index.php/f/89/">Newcomer Forum</a></li>
                         </ul>
                       </div>
                     </div>
                   </li>
                 </ul>
               </li>
+              <li class="dropdown eclipse-more main-menu-search">
+                <a data-toggle="dropdown" class="dropdown-toggle" role="button"><i class="fa fa-search"></i> <b class="caret"></b></a>
+                <ul class="dropdown-menu">
+                  <li>
+                    <!-- Content container to add padding -->
+                    <div class="yamm-content">
+                      <div class="row">
+                        <div class="col-sm-24">
+                          <p>Search</p>
+                          <div class="row">
+                            <div class="col-md-24">
+                              <div id="custom-search-form" class="reset-box-sizing">
+                                <script>
+                                  (function() {
+                                    var cx = '011805775785170369411:p3ec0igo0qq';
+                                    var gcse = document.createElement('script');
+                                    gcse.type = 'text/javascript';
+                                    gcse.async = true;
+                                    gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
+                                    '//cse.google.com/cse.js?cx=' + cx;
+                                    var s = document.getElementsByTagName('script')[0];
+                                    s.parentNode.insertBefore(gcse, s);
+                                  })();
+                                </script>
+                                <gcse:searchbox-only gname="main" resultsUrl="https://www.eclipse.org/home/search.php"></gcse:searchbox-only>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </li>
+                </ul>
+              </li>
             </ul>
           </div>
           <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
+            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-main-menu">
             <span class="sr-only">Toggle navigation</span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             </button>
-            <div class="wrapper-logo-mobile"><a class="navbar-brand visible-xs" href="https://www.eclipse.org/"><img class="logo-eclipse-default-mobile img-responsive" alt="logo" src="/eclipse.org-common/themes/solstice/public/images/logo/eclipse-800x188.png"/></a></div>
+            <div class="wrapper-logo-mobile"><a class="navbar-brand visible-xs" href="https://www.eclipse.org/"><img class="logo-eclipse-default-mobile img-responsive" alt="Eclipse.org logo" width="160" src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/images/logo/eclipse-foundation-white-orange.svg"/></a></div>
           </div>
         </div>
       </div>
     </div>
   </div>
 </header>
-<section class="hidden-print default-breadcrumbs" id="breadcrumb">
+<section class="default-breadcrumbs hidden-print breadcrumbs-default-margin" id="breadcrumb">
   <div class="container-fluid">
     <h3 class="sr-only">Breadcrumbs</h3>
-    <div class="col-xs-24">
-      <ol class="breadcrumb">
-        <li><a href="https://www.eclipse.org/">Home</a></li>
-        <li><a href="https://www.eclipse.org/contribute/">Contribute</a></li>
-        <li><a href="/c/">Source code</a></li>
-      </ol>
+    <div class="row">
+      <div class="col-sm-24">
+        <ol class="breadcrumb">
+          <li><a href="https://www.eclipse.org/">Home</a></li>
+          <li><a href="https://www.eclipse.org/contribute/">Contribute</a></li>
+          <li><a href="/c/">Source code</a></li>
+        </ol>
+      </div>
     </div>
   </div>
 </section>
-<main role="main">
-<div class="container-fluid background-image-none" id="novaContent">
-<br /><br />
-<div id='cgit'><table id='header'>
+<!-- /#breadcrumb -->
+<main>
+<div class="container-fluid legacy-page" id="novaContent">
+<div class="col-md-24"><div id='cgit'><table id='header'>
 <tr>
 <td class='logo' rowspan='2'><a href='/c/'><img src='/git.png' alt='cgit logo'/></a></td>
 <td class='main'><a href='/c/'>index</a> : <a title='org.eclipse.sisu.inject.git' href='/c/sisu/org.eclipse.sisu.inject.git/'>org.eclipse.sisu.inject.git</a></td><td class='form'><form method='get'>
@@ -317,67 +366,97 @@ This Agreement is governed by the laws of the State of New York and the intellec
 </code></pre></td></tr></table>
 </div> <!-- class=content -->
 </div>
-</main> <!-- /#main-content-container-row -->
+</div>
+</main>
 <p id="back-to-top">
   <a class="visible-xs" href="#top">Back to the top</a>
 </p>
-<footer role="contentinfo" id="solstice-footer">
+<footer id="solstice-footer">
   <div class="container">
     <div class="row">
-      <section class="col-sm-offset-1 col-xs-11 col-sm-7 col-md-6 col-md-offset-0 hidden-print" id="footer-eclipse-foundation">
-            <h2 class="section-title">Eclipse Foundation</h2>
-    <ul class="nav">
-    <li><a href="https://www.eclipse.org/org/">About us</a></li>
-    <li><a href="https://www.eclipse.org/org/foundation/contact.php">Contact Us</a></li>
-    <li><a href="https://www.eclipse.org/donate">Donate</a></li>
-      <li><a href="https://www.eclipse.org/org/documents/">Governance</a></li>
-      <li><a href="https://www.eclipse.org/artwork/">Logo and Artwork</a></li>
-      <li><a href="https://www.eclipse.org/org/foundation/directors.php">Board of Directors</a></li>
-    </ul>      </section>
-      <section class="col-sm-offset-1 col-xs-11 col-sm-7 col-md-6 col-md-offset-0 hidden-print" id="footer-legal">
-            <h2 class="section-title">Legal</h2>
-    <ul class="nav">
-      <li><a href="https://www.eclipse.org/legal/privacy.php">Privacy Policy</a></li>
-      <li><a href="https://www.eclipse.org/legal/termsofuse.php">Terms of Use</a></li>
-      <li><a href="https://www.eclipse.org/legal/copyright.php">Copyright Agent</a></li>
-      <li><a href="https://www.eclipse.org/org/documents/epl-2.0">Eclipse Public License </a></li>
-      <li><a href="https://www.eclipse.org/legal/">Legal Resources </a></li>
-    </ul>      </section>
-      <section class="col-sm-offset-1 col-xs-11 col-sm-7 col-md-6 col-md-offset-0 hidden-print" id="footer-useful-links">
-            <h2 class="section-title">Useful Links</h2>
-    <ul class="nav">
-      <li><a href="https://bugs.eclipse.org/bugs/">Report a Bug</a></li>
-      <li><a href="//help.eclipse.org/">Documentation</a></li>
-      <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
-      <li><a href="https://www.eclipse.org/mail/">Mailing Lists</a></li>
-      <li><a href="https://www.eclipse.org/forums/">Forums</a></li>
-      <li><a href="//marketplace.eclipse.org">Marketplace</a></li>
-    </ul>      </section>
-      <section class="col-sm-offset-1 col-xs-11 col-sm-7 col-md-6 col-md-offset-0 hidden-print" id="footer-other">
-            <h2 class="section-title">Other</h2>
-    <ul class="nav">
-      <li><a href="https://www.eclipse.org/ide/">IDE and Tools</a></li>
-      <li><a href="https://www.eclipse.org/projects">Community of Projects</a></li>
-      <li><a href="https://www.eclipse.org/org/workinggroups/">Working Groups</a></li>
-      <li><a href="https://wiki.eclipse.org/Ssh_fingerprints">Server fingerprints</a></li>
-    </ul>
-
-    <ul class="list-inline social-media">
-      <li><a href="https://twitter.com/EclipseFdn"><i class="fa fa-twitter-square"></i></a></li>
-      <li><a href="https://plus.google.com/+Eclipse"><i class="fa fa-google-plus-square"></i></a></li>
-      <li><a href="https://www.facebook.com/eclipse.org"><i class="fa fa-facebook-square"></i> </a></li>
-      <li><a href="https://www.youtube.com/user/EclipseFdn"><i class="fa fa-youtube-square"></i></a></li>
-    </ul>      </section>
-            <div id="copyright" class="col-sm-offset-1 col-sm-14 col-md-24 col-md-offset-0">
-        <span class="hidden-print"><div class="wrapper-logo-eclipse-white"><a href="https://www.eclipse.org"><img class="logo-eclipse-white img-responsive" alt="logo" src="/eclipse.org-common/themes/solstice/public/images/logo/eclipse-logo-bw-332x78.png"/></a></div></span>
-        <p id="copyright-text">Copyright &copy; 2017 The Eclipse Foundation. All Rights Reserved.</p>
-      </div>      <a href="#" class="scrollup">Back to the top</a>
+      <section class="col-sm-6 hidden-print" id="footer-eclipse-foundation">
+        <h2 class="section-title">Eclipse Foundation</h2>
+        <ul class="nav">
+          <li><a href="https://www.eclipse.org/org/">About Us</a></li>
+          <li><a href="https://www.eclipse.org/org/foundation/contact.php">Contact Us</a></li>
+          <li><a href="https://www.eclipse.org/donate">Donate</a></li>
+          <li><a href="https://www.eclipse.org/org/documents/">Governance</a></li>
+          <li><a href="https://www.eclipse.org/artwork/">Logo and Artwork</a></li>
+          <li><a href="https://www.eclipse.org/org/foundation/directors.php">Board of Directors</a></li>
+        </ul>
+      </section>
+      <section class="col-sm-6 hidden-print" id="footer-legal">
+        <h2 class="section-title">Legal</h2>
+        <ul class="nav">
+          <li><a href="https://www.eclipse.org/legal/privacy.php">Privacy Policy</a></li>
+          <li><a href="https://www.eclipse.org/legal/termsofuse.php">Terms of Use</a></li>
+          <li><a href="https://www.eclipse.org/legal/copyright.php">Copyright Agent</a></li>
+          <li><a href="https://www.eclipse.org/legal/epl-2.0/">Eclipse Public License</a></li>
+          <li><a href="https://www.eclipse.org/legal/">Legal Resources</a></li>
+        </ul>
+      </section>
+      <section class="col-sm-6 hidden-print" id="footer-useful-links">
+        <h2 class="section-title">Useful Links</h2>
+        <ul class="nav">
+          <li><a href="https://bugs.eclipse.org/bugs/">Report a Bug</a></li>
+          <li><a href="//help.eclipse.org/">Documentation</a></li>
+          <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
+          <li><a href="https://www.eclipse.org/mail/">Mailing Lists</a></li>
+          <li><a href="https://www.eclipse.org/forums/">Forums</a></li>
+          <li><a href="//marketplace.eclipse.org">Marketplace</a></li>
+        </ul>
+      </section>
+      <section class="col-sm-6 hidden-print" id="footer-other">
+        <h2 class="section-title">Other</h2>
+        <ul class="nav">
+          <li><a href="https://www.eclipse.org/ide/">IDE and Tools</a></li>
+          <li><a href="https://www.eclipse.org/projects">Community of Projects</a></li>
+          <li><a href="https://www.eclipse.org/org/workinggroups/">Working Groups</a></li>
+          <li><a href="https://www.eclipse.org/org/research/">Research@Eclipse</a></li>
+          <li><a href="https://www.eclipse.org/security/">Report a Vulnerability</a></li>
+          <li><a href="https://status.eclipse.org">Service Status</a></li>
+        </ul>
+      </section>
+      <div class="col-sm-24 margin-top-20">
+        <div class="row">
+          <div id="copyright" class="col-md-16">
+            <p id="copyright-text">Copyright &copy; Eclipse Foundation, Inc. All Rights Reserved.</p>
+          </div>
+          <div class="col-md-8 social-media">
+            <ul class="list-inline">
+              <li>
+                <a class="social-media-link fa-stack fa-lg" href="https://twitter.com/EclipseFdn">
+                <i class="fa fa-circle-thin fa-stack-2x"></i>
+                <i class="fa fa-twitter fa-stack-1x"></i>
+                </a>
+              </li>
+              <li>
+                <a class="social-media-link fa-stack fa-lg" href="https://www.facebook.com/eclipse.org">
+                <i class="fa fa-circle-thin fa-stack-2x"></i>
+                <i class="fa fa-facebook fa-stack-1x"></i>
+                </a>
+              </li>
+              <li>
+                <a class="social-media-link fa-stack fa-lg" href="https://www.youtube.com/user/EclipseFdn">
+                <i class="fa fa-circle-thin fa-stack-2x"></i>
+                <i class="fa fa-youtube fa-stack-1x"></i>
+                </a>
+              </li>
+              <li>
+                <a class="social-media-link fa-stack fa-lg" href="https://www.linkedin.com/company/eclipse-foundation">
+                <i class="fa fa-circle-thin fa-stack-2x"></i>
+                <i class="fa fa-linkedin fa-stack-1x"></i>
+                </a>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+      <a href="#" class="scrollup">Back to the top</a>
     </div>
   </div>
 </footer>
 <!-- Placed at the end of the document so the pages load faster -->
-<script src="/eclipse.org-common/themes/solstice/public/javascript/main.min.js"></script>
-</div>
-</div> <!-- id=cgit -->
+<script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/main.min.js?var=1.3"></script></div> <!-- id=cgit -->
 </body>
 </html>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.apache.ant,ant,1.8.4,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.apache.ant,ant,1.8.4,Apache Software License 2.0.txt
index b21d867b2d..cdf6ff8b22 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.apache.ant,ant,1.8.4,Apache Software License 2.0.txt	
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.apache.ant,ant,1.8.4,Apache Software License 2.0.txt	
@@ -202,7 +202,7 @@
  *   limitations under the License.
  */
 
-W3C� SOFTWARE NOTICE AND LICENSE
+W3C® SOFTWARE NOTICE AND LICENSE
 http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
 
 This work (and included software, documentation such as READMEs, or other
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.apache.ant,ant-launcher,1.8.4,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.apache.ant,ant-launcher,1.8.4,Apache Software License 2.0.txt
index b21d867b2d..cdf6ff8b22 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.apache.ant,ant-launcher,1.8.4,Apache Software License 2.0.txt	
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.apache.ant,ant-launcher,1.8.4,Apache Software License 2.0.txt	
@@ -202,7 +202,7 @@
  *   limitations under the License.
  */
 
-W3C� SOFTWARE NOTICE AND LICENSE
+W3C® SOFTWARE NOTICE AND LICENSE
 http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
 
 This work (and included software, documentation such as READMEs, or other
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.eclipse.sisu,org.eclipse.sisu.inject,0.3.2,Eclipse Public License 1.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.eclipse.sisu,org.eclipse.sisu.inject,0.3.2,Eclipse Public License 1.0.txt
index d02fa0f945..d58b5977e0 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.eclipse.sisu,org.eclipse.sisu.inject,0.3.2,Eclipse Public License 1.0.txt	
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.eclipse.sisu,org.eclipse.sisu.inject,0.3.2,Eclipse Public License 1.0.txt	
@@ -14,31 +14,42 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="keywords" content="eclipse.org, Eclipse Foundation, Eclipse, Git, Source code, Source" />
-    <link href="//fonts.googleapis.com/css?family=Open+Sans:400,700,300,600,100" rel="stylesheet" type="text/css">
-    <link rel="shortcut icon" href="/eclipse.org-common/themes/solstice/public/images/favicon.ico"/>
-    <link rel="stylesheet" href="/eclipse.org-common/themes/solstice/public/stylesheets/barebone-footer.min.css">
+    <link href="//fonts.googleapis.com/css?family=Libre+Franklin:400,700,300,600,100" rel="stylesheet" type="text/css"/>
+    <link rel="shortcut icon" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/images/favicon.ico"/>
+    <link rel="stylesheet" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/quicksilver.min.css?v1.4"/>
     <link rel="stylesheet" type="text/css" href="/cgit.css" media="screen" />
 
 </head>
 <body>
-<div class="barebone-layout">
-<a class="sr-only" href="#content">Skip to main content</a>
-<header role="banner" class="thin-header padding-top-10" id="header-wrapper">
- <link rel="stylesheet" type="text/css" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
- <script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
-
+<!-- Google Tag Manager (noscript) -->
+<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-5WLCZXC"
+  height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+<!-- End Google Tag Manager (noscript) -->    <a class="sr-only" href="#content">Skip to main content</a>
+<header class="header-wrapper" id="header-wrapper">
+  <div class="clearfix toolbar-container-wrapper">
+    <div class="container-fluid">
+      <div class="text-right toolbar-row row hidden-print">
+        <div class="col-md-24 row-toolbar-col">
+          <ul class="list-inline">
+            <li><a href="https://accounts.eclipse.org/user/edit" class="" data-tab-destination="tab-profile"><i class="fa fa-edit fa-fw"></i> Edit my account</a></li>
+            <li><a class="toolbar-link toolbar-manage-cookies dropdown-toggle"><i class="fa fa-wrench"></i> Manage Cookies</a></li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
   <div class="container-fluid">
     <div class="row" id="header-row">
-      <div class="col-sm-6 col-md-6 col-lg-5" id="header-left">
-        <div class="wrapper-logo-default"><a href="https://www.eclipse.org/"><img class="logo-eclipse-default img-responsive hidden-xs" alt="logo" src="/eclipse.org-common/themes/solstice/public/images/logo/eclipse-426x100.png"/></a></div>
+      <div class="col-sm-8 col-md-6 col-lg-4" id="header-left">
+        <div class="wrapper-logo-default"><a href="https://www.eclipse.org/"><img class="logo-eclipse-default hidden-xs" alt="Eclipse.org logo" width="160" src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/images/logo/eclipse-foundation-white-orange.svg"/></a></div>
       </div>
-      <div class="col-sm-18 col-md-18 col-lg-19" id="main-menu-wrapper">
-        <div class="navbar yamm navbar-right" id="main-menu">
-          <div id="navbar-collapse-1" class="navbar-collapse collapse">
+      <div class="col-sm-19 col-md-20 margin-top-10" id="main-menu-wrapper">
+        <div class="float-right hidden-xs" id="btn-call-for-action"><a href="https://www.eclipse.org/donate/" class="btn btn-huge btn-info"><i class="fa fa-star"></i> Donate</a></div>
+        <div class="navbar yamm float-sm-right" id="main-menu">
+          <div class="navbar-collapse collapse" id="navbar-main-menu">
             <ul class="nav navbar-nav">
-              <li class="visible-thin"><a href="https://www.eclipse.org/downloads/" target="_self">Download</a></li>
-              <li><a href="https://www.eclipse.org/users/" target="_self">Getting Started</a></li>
               <li><a href="https://www.eclipse.org/membership/" target="_self">Members</a></li>
+              <li><a href="https://www.eclipse.org/org/workinggroups/" target="_self">Working Groups</a></li>
               <li><a href="https://www.eclipse.org/projects/" target="_self">Projects</a></li>
               <li class="dropdown visible-xs">
                 <a href="#" data-toggle="dropdown" class="dropdown-toggle">Community <b class="caret"></b></a>
@@ -48,6 +59,7 @@
                   <li><a href="http://www.planeteclipse.org/">Planet Eclipse</a></li>
                   <li><a href="https://www.eclipse.org/community/eclipse_newsletter/">Newsletter</a></li>
                   <li><a href="https://www.youtube.com/user/EclipseFdn">Videos</a></li>
+                  <li><a href="https://blogs.eclipse.org">Blogs</a></li>
                 </ul>
               </li>
               <li class="dropdown visible-xs">
@@ -58,24 +70,24 @@
                   <li><a href="https://www.eclipse.org/mail/">Mailing Lists</a></li>
                   <li><a href="https://wiki.eclipse.org/">Wiki</a></li>
                   <li><a href="https://wiki.eclipse.org/IRC">IRC</a></li>
-                  <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
+                  <li><a href="https://www.eclipse.org/org/research/">Research</a></li>
                 </ul>
               </li>
               <li class="dropdown visible-xs">
-                <a href="#" data-toggle="dropdown" class="dropdown-toggle">Working Groups <b class="caret"></b></a>
+                <a href="#" data-toggle="dropdown" class="dropdown-toggle">Eclipse IDE <b class="caret"></b></a>
                 <ul class="dropdown-menu">
-                  <li><a href="http://wiki.eclipse.org/Auto_IWG">Automotive</a></li>
-                  <li><a href="http://iot.eclipse.org">Internet of Things</a></li>
-                  <li><a href="http://locationtech.org">LocationTech</a></li>
-                  <li><a href="http://lts.eclipse.org">Long-Term Support</a></li>
-                  <li><a href="http://polarsys.org">PolarSys</a></li>
-                  <li><a href="http://science.eclipse.org">Science</a></li>
-                  <li><a href="http://www.openmdm.org">OpenMDM</a></li>
+                  <li><a href="https://www.eclipse.org/downloads">Download</a></li>
+                  <li><a href="https://www.eclipse.org/eclipseide">Learn More</a></li>
+                  <li><a href="https://help.eclipse.org">Documentation</a></li>
+                  <li><a href="https://www.eclipse.org/getting_started">Getting Started / Support</a></li>
+                  <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
+                  <li><a href="https://www.eclipse.org/ide/">IDE and Tools</a></li>
+                  <li><a href="https://www.eclipse.org/forums/index.php/f/89/">Newcomer Forum</a></li>
                 </ul>
               </li>
               <!-- More -->
               <li class="dropdown eclipse-more hidden-xs">
-                <a data-toggle="dropdown" class="dropdown-toggle">More<b class="caret"></b></a>
+                <a data-toggle="dropdown" class="dropdown-toggle" role="button">More<b class="caret"></b></a>
                 <ul class="dropdown-menu">
                   <li>
                     <!-- Content container to add padding -->
@@ -90,6 +102,7 @@
                           <li><a href="http://www.planeteclipse.org/">Planet Eclipse</a></li>
                           <li><a href="https://www.eclipse.org/community/eclipse_newsletter/">Newsletter</a></li>
                           <li><a href="https://www.youtube.com/user/EclipseFdn">Videos</a></li>
+                          <li><a href="https://blogs.eclipse.org">Blogs</a></li>
                         </ul>
                         <ul class="col-sm-8 list-unstyled">
                           <li>
@@ -100,58 +113,94 @@
                           <li><a href="https://www.eclipse.org/mail/">Mailing Lists</a></li>
                           <li><a href="https://wiki.eclipse.org/">Wiki</a></li>
                           <li><a href="https://wiki.eclipse.org/IRC">IRC</a></li>
-                          <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
+                          <li><a href="https://www.eclipse.org/org/research/">Research</a></li>
                         </ul>
                         <ul class="col-sm-8 list-unstyled">
                           <li>
-                            <p><strong>Working Groups</strong></p>
+                            <p><strong>Eclipse IDE</strong></p>
                           </li>
-                          <li><a href="http://wiki.eclipse.org/Auto_IWG">Automotive</a></li>
-                          <li><a href="http://iot.eclipse.org">Internet of Things</a></li>
-                          <li><a href="http://locationtech.org">LocationTech</a></li>
-                          <li><a href="http://lts.eclipse.org">Long-Term Support</a></li>
-                          <li><a href="http://polarsys.org">PolarSys</a></li>
-                          <li><a href="http://science.eclipse.org">Science</a></li>
-                          <li><a href="http://www.openmdm.org">OpenMDM</a></li>
+                          <li><a href="https://www.eclipse.org/downloads">Download</a></li>
+                          <li><a href="https://www.eclipse.org/eclipseide">Learn More</a></li>
+                          <li><a href="https://help.eclipse.org">Documentation</a></li>
+                          <li><a href="https://www.eclipse.org/getting_started">Getting Started / Support</a></li>
+                          <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
+                          <li><a href="https://www.eclipse.org/ide/">IDE and Tools</a></li>
+                          <li><a href="https://www.eclipse.org/forums/index.php/f/89/">Newcomer Forum</a></li>
                         </ul>
                       </div>
                     </div>
                   </li>
                 </ul>
               </li>
+              <li class="dropdown eclipse-more main-menu-search">
+                <a data-toggle="dropdown" class="dropdown-toggle" role="button"><i class="fa fa-search"></i> <b class="caret"></b></a>
+                <ul class="dropdown-menu">
+                  <li>
+                    <!-- Content container to add padding -->
+                    <div class="yamm-content">
+                      <div class="row">
+                        <div class="col-sm-24">
+                          <p>Search</p>
+                          <div class="row">
+                            <div class="col-md-24">
+                              <div id="custom-search-form" class="reset-box-sizing">
+                                <script>
+                                  (function() {
+                                    var cx = '011805775785170369411:p3ec0igo0qq';
+                                    var gcse = document.createElement('script');
+                                    gcse.type = 'text/javascript';
+                                    gcse.async = true;
+                                    gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
+                                    '//cse.google.com/cse.js?cx=' + cx;
+                                    var s = document.getElementsByTagName('script')[0];
+                                    s.parentNode.insertBefore(gcse, s);
+                                  })();
+                                </script>
+                                <gcse:searchbox-only gname="main" resultsUrl="https://www.eclipse.org/home/search.php"></gcse:searchbox-only>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </li>
+                </ul>
+              </li>
             </ul>
           </div>
           <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
+            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-main-menu">
             <span class="sr-only">Toggle navigation</span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             </button>
-            <div class="wrapper-logo-mobile"><a class="navbar-brand visible-xs" href="https://www.eclipse.org/"><img class="logo-eclipse-default-mobile img-responsive" alt="logo" src="/eclipse.org-common/themes/solstice/public/images/logo/eclipse-800x188.png"/></a></div>
+            <div class="wrapper-logo-mobile"><a class="navbar-brand visible-xs" href="https://www.eclipse.org/"><img class="logo-eclipse-default-mobile img-responsive" alt="Eclipse.org logo" width="160" src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/images/logo/eclipse-foundation-white-orange.svg"/></a></div>
           </div>
         </div>
       </div>
     </div>
   </div>
 </header>
-<section class="hidden-print default-breadcrumbs" id="breadcrumb">
+<section class="default-breadcrumbs hidden-print breadcrumbs-default-margin" id="breadcrumb">
   <div class="container-fluid">
     <h3 class="sr-only">Breadcrumbs</h3>
-    <div class="col-xs-24">
-      <ol class="breadcrumb">
-        <li><a href="https://www.eclipse.org/">Home</a></li>
-        <li><a href="https://www.eclipse.org/contribute/">Contribute</a></li>
-        <li><a href="/c/">Source code</a></li>
-      </ol>
+    <div class="row">
+      <div class="col-sm-24">
+        <ol class="breadcrumb">
+          <li><a href="https://www.eclipse.org/">Home</a></li>
+          <li><a href="https://www.eclipse.org/contribute/">Contribute</a></li>
+          <li><a href="/c/">Source code</a></li>
+        </ol>
+      </div>
     </div>
   </div>
 </section>
-<main role="main">
-<div class="container-fluid background-image-none" id="novaContent">
-<br /><br />
-<div id='cgit'><table id='header'>
+<!-- /#breadcrumb -->
+<main>
+<div class="container-fluid legacy-page" id="novaContent">
+<div class="col-md-24"><div id='cgit'><table id='header'>
 <tr>
 <td class='logo' rowspan='2'><a href='/c/'><img src='/git.png' alt='cgit logo'/></a></td>
 <td class='main'><a href='/c/'>index</a> : <a title='org.eclipse.sisu.inject.git' href='/c/sisu/org.eclipse.sisu.inject.git/'>org.eclipse.sisu.inject.git</a></td><td class='form'><form method='get'>
@@ -317,67 +366,97 @@ This Agreement is governed by the laws of the State of New York and the intellec
 </code></pre></td></tr></table>
 </div> <!-- class=content -->
 </div>
-</main> <!-- /#main-content-container-row -->
+</div>
+</main>
 <p id="back-to-top">
   <a class="visible-xs" href="#top">Back to the top</a>
 </p>
-<footer role="contentinfo" id="solstice-footer">
+<footer id="solstice-footer">
   <div class="container">
     <div class="row">
-      <section class="col-sm-offset-1 col-xs-11 col-sm-7 col-md-6 col-md-offset-0 hidden-print" id="footer-eclipse-foundation">
-            <h2 class="section-title">Eclipse Foundation</h2>
-    <ul class="nav">
-    <li><a href="https://www.eclipse.org/org/">About us</a></li>
-    <li><a href="https://www.eclipse.org/org/foundation/contact.php">Contact Us</a></li>
-    <li><a href="https://www.eclipse.org/donate">Donate</a></li>
-      <li><a href="https://www.eclipse.org/org/documents/">Governance</a></li>
-      <li><a href="https://www.eclipse.org/artwork/">Logo and Artwork</a></li>
-      <li><a href="https://www.eclipse.org/org/foundation/directors.php">Board of Directors</a></li>
-    </ul>      </section>
-      <section class="col-sm-offset-1 col-xs-11 col-sm-7 col-md-6 col-md-offset-0 hidden-print" id="footer-legal">
-            <h2 class="section-title">Legal</h2>
-    <ul class="nav">
-      <li><a href="https://www.eclipse.org/legal/privacy.php">Privacy Policy</a></li>
-      <li><a href="https://www.eclipse.org/legal/termsofuse.php">Terms of Use</a></li>
-      <li><a href="https://www.eclipse.org/legal/copyright.php">Copyright Agent</a></li>
-      <li><a href="https://www.eclipse.org/org/documents/epl-2.0">Eclipse Public License </a></li>
-      <li><a href="https://www.eclipse.org/legal/">Legal Resources </a></li>
-    </ul>      </section>
-      <section class="col-sm-offset-1 col-xs-11 col-sm-7 col-md-6 col-md-offset-0 hidden-print" id="footer-useful-links">
-            <h2 class="section-title">Useful Links</h2>
-    <ul class="nav">
-      <li><a href="https://bugs.eclipse.org/bugs/">Report a Bug</a></li>
-      <li><a href="//help.eclipse.org/">Documentation</a></li>
-      <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
-      <li><a href="https://www.eclipse.org/mail/">Mailing Lists</a></li>
-      <li><a href="https://www.eclipse.org/forums/">Forums</a></li>
-      <li><a href="//marketplace.eclipse.org">Marketplace</a></li>
-    </ul>      </section>
-      <section class="col-sm-offset-1 col-xs-11 col-sm-7 col-md-6 col-md-offset-0 hidden-print" id="footer-other">
-            <h2 class="section-title">Other</h2>
-    <ul class="nav">
-      <li><a href="https://www.eclipse.org/ide/">IDE and Tools</a></li>
-      <li><a href="https://www.eclipse.org/projects">Community of Projects</a></li>
-      <li><a href="https://www.eclipse.org/org/workinggroups/">Working Groups</a></li>
-      <li><a href="https://wiki.eclipse.org/Ssh_fingerprints">Server fingerprints</a></li>
-    </ul>
-
-    <ul class="list-inline social-media">
-      <li><a href="https://twitter.com/EclipseFdn"><i class="fa fa-twitter-square"></i></a></li>
-      <li><a href="https://plus.google.com/+Eclipse"><i class="fa fa-google-plus-square"></i></a></li>
-      <li><a href="https://www.facebook.com/eclipse.org"><i class="fa fa-facebook-square"></i> </a></li>
-      <li><a href="https://www.youtube.com/user/EclipseFdn"><i class="fa fa-youtube-square"></i></a></li>
-    </ul>      </section>
-            <div id="copyright" class="col-sm-offset-1 col-sm-14 col-md-24 col-md-offset-0">
-        <span class="hidden-print"><div class="wrapper-logo-eclipse-white"><a href="https://www.eclipse.org"><img class="logo-eclipse-white img-responsive" alt="logo" src="/eclipse.org-common/themes/solstice/public/images/logo/eclipse-logo-bw-332x78.png"/></a></div></span>
-        <p id="copyright-text">Copyright &copy; 2017 The Eclipse Foundation. All Rights Reserved.</p>
-      </div>      <a href="#" class="scrollup">Back to the top</a>
+      <section class="col-sm-6 hidden-print" id="footer-eclipse-foundation">
+        <h2 class="section-title">Eclipse Foundation</h2>
+        <ul class="nav">
+          <li><a href="https://www.eclipse.org/org/">About Us</a></li>
+          <li><a href="https://www.eclipse.org/org/foundation/contact.php">Contact Us</a></li>
+          <li><a href="https://www.eclipse.org/donate">Donate</a></li>
+          <li><a href="https://www.eclipse.org/org/documents/">Governance</a></li>
+          <li><a href="https://www.eclipse.org/artwork/">Logo and Artwork</a></li>
+          <li><a href="https://www.eclipse.org/org/foundation/directors.php">Board of Directors</a></li>
+        </ul>
+      </section>
+      <section class="col-sm-6 hidden-print" id="footer-legal">
+        <h2 class="section-title">Legal</h2>
+        <ul class="nav">
+          <li><a href="https://www.eclipse.org/legal/privacy.php">Privacy Policy</a></li>
+          <li><a href="https://www.eclipse.org/legal/termsofuse.php">Terms of Use</a></li>
+          <li><a href="https://www.eclipse.org/legal/copyright.php">Copyright Agent</a></li>
+          <li><a href="https://www.eclipse.org/legal/epl-2.0/">Eclipse Public License</a></li>
+          <li><a href="https://www.eclipse.org/legal/">Legal Resources</a></li>
+        </ul>
+      </section>
+      <section class="col-sm-6 hidden-print" id="footer-useful-links">
+        <h2 class="section-title">Useful Links</h2>
+        <ul class="nav">
+          <li><a href="https://bugs.eclipse.org/bugs/">Report a Bug</a></li>
+          <li><a href="//help.eclipse.org/">Documentation</a></li>
+          <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
+          <li><a href="https://www.eclipse.org/mail/">Mailing Lists</a></li>
+          <li><a href="https://www.eclipse.org/forums/">Forums</a></li>
+          <li><a href="//marketplace.eclipse.org">Marketplace</a></li>
+        </ul>
+      </section>
+      <section class="col-sm-6 hidden-print" id="footer-other">
+        <h2 class="section-title">Other</h2>
+        <ul class="nav">
+          <li><a href="https://www.eclipse.org/ide/">IDE and Tools</a></li>
+          <li><a href="https://www.eclipse.org/projects">Community of Projects</a></li>
+          <li><a href="https://www.eclipse.org/org/workinggroups/">Working Groups</a></li>
+          <li><a href="https://www.eclipse.org/org/research/">Research@Eclipse</a></li>
+          <li><a href="https://www.eclipse.org/security/">Report a Vulnerability</a></li>
+          <li><a href="https://status.eclipse.org">Service Status</a></li>
+        </ul>
+      </section>
+      <div class="col-sm-24 margin-top-20">
+        <div class="row">
+          <div id="copyright" class="col-md-16">
+            <p id="copyright-text">Copyright &copy; Eclipse Foundation, Inc. All Rights Reserved.</p>
+          </div>
+          <div class="col-md-8 social-media">
+            <ul class="list-inline">
+              <li>
+                <a class="social-media-link fa-stack fa-lg" href="https://twitter.com/EclipseFdn">
+                <i class="fa fa-circle-thin fa-stack-2x"></i>
+                <i class="fa fa-twitter fa-stack-1x"></i>
+                </a>
+              </li>
+              <li>
+                <a class="social-media-link fa-stack fa-lg" href="https://www.facebook.com/eclipse.org">
+                <i class="fa fa-circle-thin fa-stack-2x"></i>
+                <i class="fa fa-facebook fa-stack-1x"></i>
+                </a>
+              </li>
+              <li>
+                <a class="social-media-link fa-stack fa-lg" href="https://www.youtube.com/user/EclipseFdn">
+                <i class="fa fa-circle-thin fa-stack-2x"></i>
+                <i class="fa fa-youtube fa-stack-1x"></i>
+                </a>
+              </li>
+              <li>
+                <a class="social-media-link fa-stack fa-lg" href="https://www.linkedin.com/company/eclipse-foundation">
+                <i class="fa fa-circle-thin fa-stack-2x"></i>
+                <i class="fa fa-linkedin fa-stack-1x"></i>
+                </a>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+      <a href="#" class="scrollup">Back to the top</a>
     </div>
   </div>
 </footer>
 <!-- Placed at the end of the document so the pages load faster -->
-<script src="/eclipse.org-common/themes/solstice/public/javascript/main.min.js"></script>
-</div>
-</div> <!-- id=cgit -->
+<script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/main.min.js?var=1.3"></script></div> <!-- id=cgit -->
 </body>
 </html>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.eclipse.sisu,org.eclipse.sisu.plexus,0.3.2,Eclipse Public License 1.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.eclipse.sisu,org.eclipse.sisu.plexus,0.3.2,Eclipse Public License 1.0.txt
index d02fa0f945..d58b5977e0 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.eclipse.sisu,org.eclipse.sisu.plexus,0.3.2,Eclipse Public License 1.0.txt	
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.eclipse.sisu,org.eclipse.sisu.plexus,0.3.2,Eclipse Public License 1.0.txt	
@@ -14,31 +14,42 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="keywords" content="eclipse.org, Eclipse Foundation, Eclipse, Git, Source code, Source" />
-    <link href="//fonts.googleapis.com/css?family=Open+Sans:400,700,300,600,100" rel="stylesheet" type="text/css">
-    <link rel="shortcut icon" href="/eclipse.org-common/themes/solstice/public/images/favicon.ico"/>
-    <link rel="stylesheet" href="/eclipse.org-common/themes/solstice/public/stylesheets/barebone-footer.min.css">
+    <link href="//fonts.googleapis.com/css?family=Libre+Franklin:400,700,300,600,100" rel="stylesheet" type="text/css"/>
+    <link rel="shortcut icon" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/images/favicon.ico"/>
+    <link rel="stylesheet" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/quicksilver.min.css?v1.4"/>
     <link rel="stylesheet" type="text/css" href="/cgit.css" media="screen" />
 
 </head>
 <body>
-<div class="barebone-layout">
-<a class="sr-only" href="#content">Skip to main content</a>
-<header role="banner" class="thin-header padding-top-10" id="header-wrapper">
- <link rel="stylesheet" type="text/css" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
- <script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
-
+<!-- Google Tag Manager (noscript) -->
+<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-5WLCZXC"
+  height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+<!-- End Google Tag Manager (noscript) -->    <a class="sr-only" href="#content">Skip to main content</a>
+<header class="header-wrapper" id="header-wrapper">
+  <div class="clearfix toolbar-container-wrapper">
+    <div class="container-fluid">
+      <div class="text-right toolbar-row row hidden-print">
+        <div class="col-md-24 row-toolbar-col">
+          <ul class="list-inline">
+            <li><a href="https://accounts.eclipse.org/user/edit" class="" data-tab-destination="tab-profile"><i class="fa fa-edit fa-fw"></i> Edit my account</a></li>
+            <li><a class="toolbar-link toolbar-manage-cookies dropdown-toggle"><i class="fa fa-wrench"></i> Manage Cookies</a></li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
   <div class="container-fluid">
     <div class="row" id="header-row">
-      <div class="col-sm-6 col-md-6 col-lg-5" id="header-left">
-        <div class="wrapper-logo-default"><a href="https://www.eclipse.org/"><img class="logo-eclipse-default img-responsive hidden-xs" alt="logo" src="/eclipse.org-common/themes/solstice/public/images/logo/eclipse-426x100.png"/></a></div>
+      <div class="col-sm-8 col-md-6 col-lg-4" id="header-left">
+        <div class="wrapper-logo-default"><a href="https://www.eclipse.org/"><img class="logo-eclipse-default hidden-xs" alt="Eclipse.org logo" width="160" src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/images/logo/eclipse-foundation-white-orange.svg"/></a></div>
       </div>
-      <div class="col-sm-18 col-md-18 col-lg-19" id="main-menu-wrapper">
-        <div class="navbar yamm navbar-right" id="main-menu">
-          <div id="navbar-collapse-1" class="navbar-collapse collapse">
+      <div class="col-sm-19 col-md-20 margin-top-10" id="main-menu-wrapper">
+        <div class="float-right hidden-xs" id="btn-call-for-action"><a href="https://www.eclipse.org/donate/" class="btn btn-huge btn-info"><i class="fa fa-star"></i> Donate</a></div>
+        <div class="navbar yamm float-sm-right" id="main-menu">
+          <div class="navbar-collapse collapse" id="navbar-main-menu">
             <ul class="nav navbar-nav">
-              <li class="visible-thin"><a href="https://www.eclipse.org/downloads/" target="_self">Download</a></li>
-              <li><a href="https://www.eclipse.org/users/" target="_self">Getting Started</a></li>
               <li><a href="https://www.eclipse.org/membership/" target="_self">Members</a></li>
+              <li><a href="https://www.eclipse.org/org/workinggroups/" target="_self">Working Groups</a></li>
               <li><a href="https://www.eclipse.org/projects/" target="_self">Projects</a></li>
               <li class="dropdown visible-xs">
                 <a href="#" data-toggle="dropdown" class="dropdown-toggle">Community <b class="caret"></b></a>
@@ -48,6 +59,7 @@
                   <li><a href="http://www.planeteclipse.org/">Planet Eclipse</a></li>
                   <li><a href="https://www.eclipse.org/community/eclipse_newsletter/">Newsletter</a></li>
                   <li><a href="https://www.youtube.com/user/EclipseFdn">Videos</a></li>
+                  <li><a href="https://blogs.eclipse.org">Blogs</a></li>
                 </ul>
               </li>
               <li class="dropdown visible-xs">
@@ -58,24 +70,24 @@
                   <li><a href="https://www.eclipse.org/mail/">Mailing Lists</a></li>
                   <li><a href="https://wiki.eclipse.org/">Wiki</a></li>
                   <li><a href="https://wiki.eclipse.org/IRC">IRC</a></li>
-                  <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
+                  <li><a href="https://www.eclipse.org/org/research/">Research</a></li>
                 </ul>
               </li>
               <li class="dropdown visible-xs">
-                <a href="#" data-toggle="dropdown" class="dropdown-toggle">Working Groups <b class="caret"></b></a>
+                <a href="#" data-toggle="dropdown" class="dropdown-toggle">Eclipse IDE <b class="caret"></b></a>
                 <ul class="dropdown-menu">
-                  <li><a href="http://wiki.eclipse.org/Auto_IWG">Automotive</a></li>
-                  <li><a href="http://iot.eclipse.org">Internet of Things</a></li>
-                  <li><a href="http://locationtech.org">LocationTech</a></li>
-                  <li><a href="http://lts.eclipse.org">Long-Term Support</a></li>
-                  <li><a href="http://polarsys.org">PolarSys</a></li>
-                  <li><a href="http://science.eclipse.org">Science</a></li>
-                  <li><a href="http://www.openmdm.org">OpenMDM</a></li>
+                  <li><a href="https://www.eclipse.org/downloads">Download</a></li>
+                  <li><a href="https://www.eclipse.org/eclipseide">Learn More</a></li>
+                  <li><a href="https://help.eclipse.org">Documentation</a></li>
+                  <li><a href="https://www.eclipse.org/getting_started">Getting Started / Support</a></li>
+                  <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
+                  <li><a href="https://www.eclipse.org/ide/">IDE and Tools</a></li>
+                  <li><a href="https://www.eclipse.org/forums/index.php/f/89/">Newcomer Forum</a></li>
                 </ul>
               </li>
               <!-- More -->
               <li class="dropdown eclipse-more hidden-xs">
-                <a data-toggle="dropdown" class="dropdown-toggle">More<b class="caret"></b></a>
+                <a data-toggle="dropdown" class="dropdown-toggle" role="button">More<b class="caret"></b></a>
                 <ul class="dropdown-menu">
                   <li>
                     <!-- Content container to add padding -->
@@ -90,6 +102,7 @@
                           <li><a href="http://www.planeteclipse.org/">Planet Eclipse</a></li>
                           <li><a href="https://www.eclipse.org/community/eclipse_newsletter/">Newsletter</a></li>
                           <li><a href="https://www.youtube.com/user/EclipseFdn">Videos</a></li>
+                          <li><a href="https://blogs.eclipse.org">Blogs</a></li>
                         </ul>
                         <ul class="col-sm-8 list-unstyled">
                           <li>
@@ -100,58 +113,94 @@
                           <li><a href="https://www.eclipse.org/mail/">Mailing Lists</a></li>
                           <li><a href="https://wiki.eclipse.org/">Wiki</a></li>
                           <li><a href="https://wiki.eclipse.org/IRC">IRC</a></li>
-                          <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
+                          <li><a href="https://www.eclipse.org/org/research/">Research</a></li>
                         </ul>
                         <ul class="col-sm-8 list-unstyled">
                           <li>
-                            <p><strong>Working Groups</strong></p>
+                            <p><strong>Eclipse IDE</strong></p>
                           </li>
-                          <li><a href="http://wiki.eclipse.org/Auto_IWG">Automotive</a></li>
-                          <li><a href="http://iot.eclipse.org">Internet of Things</a></li>
-                          <li><a href="http://locationtech.org">LocationTech</a></li>
-                          <li><a href="http://lts.eclipse.org">Long-Term Support</a></li>
-                          <li><a href="http://polarsys.org">PolarSys</a></li>
-                          <li><a href="http://science.eclipse.org">Science</a></li>
-                          <li><a href="http://www.openmdm.org">OpenMDM</a></li>
+                          <li><a href="https://www.eclipse.org/downloads">Download</a></li>
+                          <li><a href="https://www.eclipse.org/eclipseide">Learn More</a></li>
+                          <li><a href="https://help.eclipse.org">Documentation</a></li>
+                          <li><a href="https://www.eclipse.org/getting_started">Getting Started / Support</a></li>
+                          <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
+                          <li><a href="https://www.eclipse.org/ide/">IDE and Tools</a></li>
+                          <li><a href="https://www.eclipse.org/forums/index.php/f/89/">Newcomer Forum</a></li>
                         </ul>
                       </div>
                     </div>
                   </li>
                 </ul>
               </li>
+              <li class="dropdown eclipse-more main-menu-search">
+                <a data-toggle="dropdown" class="dropdown-toggle" role="button"><i class="fa fa-search"></i> <b class="caret"></b></a>
+                <ul class="dropdown-menu">
+                  <li>
+                    <!-- Content container to add padding -->
+                    <div class="yamm-content">
+                      <div class="row">
+                        <div class="col-sm-24">
+                          <p>Search</p>
+                          <div class="row">
+                            <div class="col-md-24">
+                              <div id="custom-search-form" class="reset-box-sizing">
+                                <script>
+                                  (function() {
+                                    var cx = '011805775785170369411:p3ec0igo0qq';
+                                    var gcse = document.createElement('script');
+                                    gcse.type = 'text/javascript';
+                                    gcse.async = true;
+                                    gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
+                                    '//cse.google.com/cse.js?cx=' + cx;
+                                    var s = document.getElementsByTagName('script')[0];
+                                    s.parentNode.insertBefore(gcse, s);
+                                  })();
+                                </script>
+                                <gcse:searchbox-only gname="main" resultsUrl="https://www.eclipse.org/home/search.php"></gcse:searchbox-only>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </li>
+                </ul>
+              </li>
             </ul>
           </div>
           <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
+            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-main-menu">
             <span class="sr-only">Toggle navigation</span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             </button>
-            <div class="wrapper-logo-mobile"><a class="navbar-brand visible-xs" href="https://www.eclipse.org/"><img class="logo-eclipse-default-mobile img-responsive" alt="logo" src="/eclipse.org-common/themes/solstice/public/images/logo/eclipse-800x188.png"/></a></div>
+            <div class="wrapper-logo-mobile"><a class="navbar-brand visible-xs" href="https://www.eclipse.org/"><img class="logo-eclipse-default-mobile img-responsive" alt="Eclipse.org logo" width="160" src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/images/logo/eclipse-foundation-white-orange.svg"/></a></div>
           </div>
         </div>
       </div>
     </div>
   </div>
 </header>
-<section class="hidden-print default-breadcrumbs" id="breadcrumb">
+<section class="default-breadcrumbs hidden-print breadcrumbs-default-margin" id="breadcrumb">
   <div class="container-fluid">
     <h3 class="sr-only">Breadcrumbs</h3>
-    <div class="col-xs-24">
-      <ol class="breadcrumb">
-        <li><a href="https://www.eclipse.org/">Home</a></li>
-        <li><a href="https://www.eclipse.org/contribute/">Contribute</a></li>
-        <li><a href="/c/">Source code</a></li>
-      </ol>
+    <div class="row">
+      <div class="col-sm-24">
+        <ol class="breadcrumb">
+          <li><a href="https://www.eclipse.org/">Home</a></li>
+          <li><a href="https://www.eclipse.org/contribute/">Contribute</a></li>
+          <li><a href="/c/">Source code</a></li>
+        </ol>
+      </div>
     </div>
   </div>
 </section>
-<main role="main">
-<div class="container-fluid background-image-none" id="novaContent">
-<br /><br />
-<div id='cgit'><table id='header'>
+<!-- /#breadcrumb -->
+<main>
+<div class="container-fluid legacy-page" id="novaContent">
+<div class="col-md-24"><div id='cgit'><table id='header'>
 <tr>
 <td class='logo' rowspan='2'><a href='/c/'><img src='/git.png' alt='cgit logo'/></a></td>
 <td class='main'><a href='/c/'>index</a> : <a title='org.eclipse.sisu.inject.git' href='/c/sisu/org.eclipse.sisu.inject.git/'>org.eclipse.sisu.inject.git</a></td><td class='form'><form method='get'>
@@ -317,67 +366,97 @@ This Agreement is governed by the laws of the State of New York and the intellec
 </code></pre></td></tr></table>
 </div> <!-- class=content -->
 </div>
-</main> <!-- /#main-content-container-row -->
+</div>
+</main>
 <p id="back-to-top">
   <a class="visible-xs" href="#top">Back to the top</a>
 </p>
-<footer role="contentinfo" id="solstice-footer">
+<footer id="solstice-footer">
   <div class="container">
     <div class="row">
-      <section class="col-sm-offset-1 col-xs-11 col-sm-7 col-md-6 col-md-offset-0 hidden-print" id="footer-eclipse-foundation">
-            <h2 class="section-title">Eclipse Foundation</h2>
-    <ul class="nav">
-    <li><a href="https://www.eclipse.org/org/">About us</a></li>
-    <li><a href="https://www.eclipse.org/org/foundation/contact.php">Contact Us</a></li>
-    <li><a href="https://www.eclipse.org/donate">Donate</a></li>
-      <li><a href="https://www.eclipse.org/org/documents/">Governance</a></li>
-      <li><a href="https://www.eclipse.org/artwork/">Logo and Artwork</a></li>
-      <li><a href="https://www.eclipse.org/org/foundation/directors.php">Board of Directors</a></li>
-    </ul>      </section>
-      <section class="col-sm-offset-1 col-xs-11 col-sm-7 col-md-6 col-md-offset-0 hidden-print" id="footer-legal">
-            <h2 class="section-title">Legal</h2>
-    <ul class="nav">
-      <li><a href="https://www.eclipse.org/legal/privacy.php">Privacy Policy</a></li>
-      <li><a href="https://www.eclipse.org/legal/termsofuse.php">Terms of Use</a></li>
-      <li><a href="https://www.eclipse.org/legal/copyright.php">Copyright Agent</a></li>
-      <li><a href="https://www.eclipse.org/org/documents/epl-2.0">Eclipse Public License </a></li>
-      <li><a href="https://www.eclipse.org/legal/">Legal Resources </a></li>
-    </ul>      </section>
-      <section class="col-sm-offset-1 col-xs-11 col-sm-7 col-md-6 col-md-offset-0 hidden-print" id="footer-useful-links">
-            <h2 class="section-title">Useful Links</h2>
-    <ul class="nav">
-      <li><a href="https://bugs.eclipse.org/bugs/">Report a Bug</a></li>
-      <li><a href="//help.eclipse.org/">Documentation</a></li>
-      <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
-      <li><a href="https://www.eclipse.org/mail/">Mailing Lists</a></li>
-      <li><a href="https://www.eclipse.org/forums/">Forums</a></li>
-      <li><a href="//marketplace.eclipse.org">Marketplace</a></li>
-    </ul>      </section>
-      <section class="col-sm-offset-1 col-xs-11 col-sm-7 col-md-6 col-md-offset-0 hidden-print" id="footer-other">
-            <h2 class="section-title">Other</h2>
-    <ul class="nav">
-      <li><a href="https://www.eclipse.org/ide/">IDE and Tools</a></li>
-      <li><a href="https://www.eclipse.org/projects">Community of Projects</a></li>
-      <li><a href="https://www.eclipse.org/org/workinggroups/">Working Groups</a></li>
-      <li><a href="https://wiki.eclipse.org/Ssh_fingerprints">Server fingerprints</a></li>
-    </ul>
-
-    <ul class="list-inline social-media">
-      <li><a href="https://twitter.com/EclipseFdn"><i class="fa fa-twitter-square"></i></a></li>
-      <li><a href="https://plus.google.com/+Eclipse"><i class="fa fa-google-plus-square"></i></a></li>
-      <li><a href="https://www.facebook.com/eclipse.org"><i class="fa fa-facebook-square"></i> </a></li>
-      <li><a href="https://www.youtube.com/user/EclipseFdn"><i class="fa fa-youtube-square"></i></a></li>
-    </ul>      </section>
-            <div id="copyright" class="col-sm-offset-1 col-sm-14 col-md-24 col-md-offset-0">
-        <span class="hidden-print"><div class="wrapper-logo-eclipse-white"><a href="https://www.eclipse.org"><img class="logo-eclipse-white img-responsive" alt="logo" src="/eclipse.org-common/themes/solstice/public/images/logo/eclipse-logo-bw-332x78.png"/></a></div></span>
-        <p id="copyright-text">Copyright &copy; 2017 The Eclipse Foundation. All Rights Reserved.</p>
-      </div>      <a href="#" class="scrollup">Back to the top</a>
+      <section class="col-sm-6 hidden-print" id="footer-eclipse-foundation">
+        <h2 class="section-title">Eclipse Foundation</h2>
+        <ul class="nav">
+          <li><a href="https://www.eclipse.org/org/">About Us</a></li>
+          <li><a href="https://www.eclipse.org/org/foundation/contact.php">Contact Us</a></li>
+          <li><a href="https://www.eclipse.org/donate">Donate</a></li>
+          <li><a href="https://www.eclipse.org/org/documents/">Governance</a></li>
+          <li><a href="https://www.eclipse.org/artwork/">Logo and Artwork</a></li>
+          <li><a href="https://www.eclipse.org/org/foundation/directors.php">Board of Directors</a></li>
+        </ul>
+      </section>
+      <section class="col-sm-6 hidden-print" id="footer-legal">
+        <h2 class="section-title">Legal</h2>
+        <ul class="nav">
+          <li><a href="https://www.eclipse.org/legal/privacy.php">Privacy Policy</a></li>
+          <li><a href="https://www.eclipse.org/legal/termsofuse.php">Terms of Use</a></li>
+          <li><a href="https://www.eclipse.org/legal/copyright.php">Copyright Agent</a></li>
+          <li><a href="https://www.eclipse.org/legal/epl-2.0/">Eclipse Public License</a></li>
+          <li><a href="https://www.eclipse.org/legal/">Legal Resources</a></li>
+        </ul>
+      </section>
+      <section class="col-sm-6 hidden-print" id="footer-useful-links">
+        <h2 class="section-title">Useful Links</h2>
+        <ul class="nav">
+          <li><a href="https://bugs.eclipse.org/bugs/">Report a Bug</a></li>
+          <li><a href="//help.eclipse.org/">Documentation</a></li>
+          <li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
+          <li><a href="https://www.eclipse.org/mail/">Mailing Lists</a></li>
+          <li><a href="https://www.eclipse.org/forums/">Forums</a></li>
+          <li><a href="//marketplace.eclipse.org">Marketplace</a></li>
+        </ul>
+      </section>
+      <section class="col-sm-6 hidden-print" id="footer-other">
+        <h2 class="section-title">Other</h2>
+        <ul class="nav">
+          <li><a href="https://www.eclipse.org/ide/">IDE and Tools</a></li>
+          <li><a href="https://www.eclipse.org/projects">Community of Projects</a></li>
+          <li><a href="https://www.eclipse.org/org/workinggroups/">Working Groups</a></li>
+          <li><a href="https://www.eclipse.org/org/research/">Research@Eclipse</a></li>
+          <li><a href="https://www.eclipse.org/security/">Report a Vulnerability</a></li>
+          <li><a href="https://status.eclipse.org">Service Status</a></li>
+        </ul>
+      </section>
+      <div class="col-sm-24 margin-top-20">
+        <div class="row">
+          <div id="copyright" class="col-md-16">
+            <p id="copyright-text">Copyright &copy; Eclipse Foundation, Inc. All Rights Reserved.</p>
+          </div>
+          <div class="col-md-8 social-media">
+            <ul class="list-inline">
+              <li>
+                <a class="social-media-link fa-stack fa-lg" href="https://twitter.com/EclipseFdn">
+                <i class="fa fa-circle-thin fa-stack-2x"></i>
+                <i class="fa fa-twitter fa-stack-1x"></i>
+                </a>
+              </li>
+              <li>
+                <a class="social-media-link fa-stack fa-lg" href="https://www.facebook.com/eclipse.org">
+                <i class="fa fa-circle-thin fa-stack-2x"></i>
+                <i class="fa fa-facebook fa-stack-1x"></i>
+                </a>
+              </li>
+              <li>
+                <a class="social-media-link fa-stack fa-lg" href="https://www.youtube.com/user/EclipseFdn">
+                <i class="fa fa-circle-thin fa-stack-2x"></i>
+                <i class="fa fa-youtube fa-stack-1x"></i>
+                </a>
+              </li>
+              <li>
+                <a class="social-media-link fa-stack fa-lg" href="https://www.linkedin.com/company/eclipse-foundation">
+                <i class="fa fa-circle-thin fa-stack-2x"></i>
+                <i class="fa fa-linkedin fa-stack-1x"></i>
+                </a>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+      <a href="#" class="scrollup">Back to the top</a>
     </div>
   </div>
 </footer>
 <!-- Placed at the end of the document so the pages load faster -->
-<script src="/eclipse.org-common/themes/solstice/public/javascript/main.min.js"></script>
-</div>
-</div> <!-- id=cgit -->
+<script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/main.min.js?var=1.3"></script></div> <!-- id=cgit -->
 </body>
 </html>
diff --git a/pom.xml b/pom.xml
index 0fd2ab2620..0d553a3e7d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
 
         <wildfly.version>17.0.1.Final</wildfly.version>
         <wildfly.build-tools.version>1.2.10.Final</wildfly.build-tools.version>
-        <eap.version>7.3.0.CD16-redhat-00001</eap.version>
+        <eap.version>7.3.0.CD17-redhat-00002</eap.version>
         <eap.build-tools.version>1.2.10.Final</eap.build-tools.version>
         <wildfly.core.version>9.0.2.Final</wildfly.core.version>