You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2016/08/16 07:31:03 UTC

syncope git commit: Upgrading Swagger UI

Repository: syncope
Updated Branches:
  refs/heads/master 0a3ec6773 -> 18ed21e7a


Upgrading Swagger UI


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/18ed21e7
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/18ed21e7
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/18ed21e7

Branch: refs/heads/master
Commit: 18ed21e7a8f0918f5f6cb8fea3ce3726c3e8107a
Parents: 0a3ec67
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Tue Aug 16 09:11:08 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Tue Aug 16 09:11:08 2016 +0200

----------------------------------------------------------------------
 .../resources/META-INF/resources/swagger/index.html | 16 +++++++++-------
 pom.xml                                             |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/18ed21e7/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html
----------------------------------------------------------------------
diff --git a/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html b/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html
index 889cd92..3a033c9 100644
--- a/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html
+++ b/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html
@@ -20,10 +20,10 @@ under the License.
 <html>
 <head>
   <meta charset="UTF-8">
-    <!-- <ApacheSyncope -->
-    <!--<title>Swagger UI</title>-->
-    <title>Swagger UI - Apache Syncope ${syncope.version}</title>
-    <!-- </ApacheSyncope -->
+  <!-- <ApacheSyncope -->
+  <!--<title>Swagger UI</title>-->
+  <title>Swagger UI - Apache Syncope ${syncope.version}</title>
+  <!-- </ApacheSyncope -->
   <link rel="icon" type="image/png" href="images/favicon-32x32.png" sizes="32x32" />
   <link rel="icon" type="image/png" href="images/favicon-16x16.png" sizes="16x16" />
   <link href='css/typography.css' media='screen' rel='stylesheet' type='text/css'/>
@@ -37,7 +37,7 @@ under the License.
   <script src='lib/jquery.slideto.min.js' type='text/javascript'></script>
   <script src='lib/jquery.wiggle.min.js' type='text/javascript'></script>
   <script src='lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
-  <script src='lib/handlebars-2.0.0.js' type='text/javascript'></script>
+  <script src='lib/handlebars-4.0.5.js' type='text/javascript'></script>
   <script src='lib/lodash.min.js' type='text/javascript'></script>
   <script src='lib/backbone-min.js' type='text/javascript'></script>
   <script src='swagger-ui.js' type='text/javascript'></script>
@@ -83,7 +83,7 @@ under the License.
               clientSecret: "your-client-secret-if-required",
               realm: "your-realms",
               appName: "your-app-name",
-              scopeSeparator: ",",
+              scopeSeparator: " ",
               additionalQueryStringParams: {}
             });
           }
@@ -91,8 +91,10 @@ under the License.
           if(window.SwaggerTranslator) {
             window.SwaggerTranslator.translate();
           }
-          
+
+          // <ApacheSyncope>
           addApiKeyAuthorization();
+          // </ApacheSyncope>
         },
         onFailure: function(data) {
           log("Unable to Load SwaggerUI");

http://git-wip-us.apache.org/repos/asf/syncope/blob/18ed21e7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9cf923d..0205c6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -393,7 +393,7 @@ under the License.
     <activiti-modeler.directory>${project.build.directory}/activiti-modeler</activiti-modeler.directory>
 
     <swagger-core.version>1.5.9</swagger-core.version>    
-    <swagger-ui.version>2.1.5</swagger-ui.version>
+    <swagger-ui.version>2.2.0</swagger-ui.version>
         
     <jquery.version>2.2.4</jquery.version>
     <jquery-ui.version>1.11.4</jquery-ui.version>