Merge pull request sw360#369 from bsinno/dev/useWebJarsForJSDeps_redo

feat(webjars): use webjars to obtain JS dependencies review-by:[email protected] tested-by:[email protected],[email protected]
ChristophNiehoff · Jun 14, 2017 · 207a0e4 · 207a0e4
2 parents 5828ac4 + e5799e6
commit 207a0e4
Show file tree

Hide file tree

Showing 86 changed files with 284 additions and 30,274 deletions.
diff --git a/frontend/sw360-portlet/pom.xml b/frontend/sw360-portlet/pom.xml
@@ -19,6 +19,16 @@
         <version>2.1.0-SNAPSHOT</version>
     </parent>
 
+    <properties>
+        <jquery.version>1.12.4</jquery.version>
+        <jquery.ui.version>1.12.1</jquery.ui.version>
+        <jquery.datatables.version>1.10.7</jquery.datatables.version>
+        <jquery.confirm.version>3.0.1</jquery.confirm.version>
+        <jquery.treetable.version>3.2.0</jquery.treetable.version>
+        <jquery.validation.version>1.15.1</jquery.validation.version>
+        <resumable.js.version>1.0.3</resumable.js.version>
+    </properties>
+
     <artifactId>sw360-portlet</artifactId>
     <packaging>war</packaging>
 
@@ -101,6 +111,47 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency> <!-- to support Servlet2 containers -->
+            <groupId>org.webjars</groupId>
+            <artifactId>webjars-servlet-2.x</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>jquery</artifactId>
+            <version>${jquery.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>jquery-ui</artifactId>
+            <version>${jquery.ui.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>datatables</artifactId>
+            <version>${jquery.datatables.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars.npm</groupId>
+            <artifactId>github-com-craftpip-jquery-confirm</artifactId>
+            <version>${jquery.confirm.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars.bower</groupId>
+            <artifactId>jquery-treetable</artifactId>
+            <version>${jquery.treetable.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>jquery-validation</artifactId>
+            <version>${jquery.validation.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>resumable.js</artifactId>
+            <version>${resumable.js.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.liferay.portal</groupId>
             <artifactId>portal-service</artifactId>

diff --git a/frontend/sw360-portlet/src/main/webapp/WEB-INF/liferay-portlet.xml b/frontend/sw360-portlet/src/main/webapp/WEB-INF/liferay-portlet.xml
@@ -157,10 +157,10 @@
 
         <header-portlet-css>/css/dataTable_SiemensHomepage.css</header-portlet-css>
         <header-portlet-css>/css/sw360.css</header-portlet-css>
-        <header-portlet-css>/css/external/jquery-ui.css</header-portlet-css>
-        <header-portlet-javascript>/js/external/jquery-1.11.1.min.js</header-portlet-javascript>
-        <header-portlet-javascript>/js/external/jquery-ui.min.js</header-portlet-javascript>
-        <header-portlet-javascript>/js/external/jquery.dataTables.js</header-portlet-javascript>
+        <header-portlet-css>/webjars/jquery-ui/1.12.1/jquery-ui.css</header-portlet-css>
+        <header-portlet-javascript>/webjars/jquery/1.12.4/jquery.min.js</header-portlet-javascript>
+        <header-portlet-javascript>/webjars/jquery-ui/1.12.1/jquery-ui.min.js</header-portlet-javascript>
+        <header-portlet-javascript>/webjars/datatables/1.10.7/js/jquery.dataTables.min.js</header-portlet-javascript>
 
         <header-portlet-javascript>/js/main.js</header-portlet-javascript>
     </portlet>
@@ -175,10 +175,10 @@
 
         <header-portlet-css>/css/dataTable_SiemensHomepage.css</header-portlet-css>
         <header-portlet-css>/css/sw360.css</header-portlet-css>
-        <header-portlet-css>/css/external/jquery-ui.css</header-portlet-css>
-        <header-portlet-javascript>/js/external/jquery-1.11.1.min.js</header-portlet-javascript>
-        <header-portlet-javascript>/js/external/jquery-ui.min.js</header-portlet-javascript>
-        <header-portlet-javascript>/js/external/jquery.dataTables.js</header-portlet-javascript>
+        <header-portlet-css>/webjars/jquery-ui/1.12.1/jquery-ui.css</header-portlet-css>
+        <header-portlet-javascript>/webjars/jquery/1.12.4/jquery.min.js</header-portlet-javascript>
+        <header-portlet-javascript>/webjars/jquery-ui/1.12.1/jquery-ui.min.js</header-portlet-javascript>
+        <header-portlet-javascript>/webjars/datatables/1.10.7/js/jquery.dataTables.min.js</header-portlet-javascript>
 
         <header-portlet-javascript>/js/main.js</header-portlet-javascript>
     </portlet>
@@ -193,10 +193,10 @@
 
         <header-portlet-css>/css/dataTable_SiemensHomepage.css</header-portlet-css>
         <header-portlet-css>/css/sw360.css</header-portlet-css>
-        <header-portlet-css>/css/external/jquery-ui.css</header-portlet-css>
-        <header-portlet-javascript>/js/external/jquery-1.11.1.min.js</header-portlet-javascript>
-        <header-portlet-javascript>/js/external/jquery-ui.min.js</header-portlet-javascript>
-        <header-portlet-javascript>/js/external/jquery.dataTables.js</header-portlet-javascript>
+        <header-portlet-css>/webjars/jquery-ui/1.12.1/jquery-ui.css</header-portlet-css>
+        <header-portlet-javascript>/webjars/jquery/1.12.4/jquery.min.js</header-portlet-javascript>
+        <header-portlet-javascript>/webjars/jquery-ui/1.12.1/jquery-ui.min.js</header-portlet-javascript>
+        <header-portlet-javascript>/webjars/datatables/1.10.7/js/jquery.dataTables.min.js</header-portlet-javascript>
 
         <header-portlet-javascript>/js/main.js</header-portlet-javascript>
     </portlet>
@@ -211,10 +211,10 @@
 
         <header-portlet-css>/css/dataTable_SiemensHomepage.css</header-portlet-css>
         <header-portlet-css>/css/sw360.css</header-portlet-css>
-        <header-portlet-css>/css/external/jquery-ui.css</header-portlet-css>
-        <header-portlet-javascript>/js/external/jquery-1.11.1.min.js</header-portlet-javascript>
-        <header-portlet-javascript>/js/external/jquery-ui.min.js</header-portlet-javascript>
-        <header-portlet-javascript>/js/external/jquery.dataTables.js</header-portlet-javascript>
+        <header-portlet-css>/webjars/jquery-ui/1.12.1/jquery-ui.css</header-portlet-css>
+        <header-portlet-javascript>/webjars/jquery/1.12.4/jquery.min.js</header-portlet-javascript>
+        <header-portlet-javascript>/webjars/jquery-ui/1.12.1/jquery-ui.min.js</header-portlet-javascript>
+        <header-portlet-javascript>/webjars/datatables/1.10.7/js/jquery.dataTables.min.js</header-portlet-javascript>
 
         <header-portlet-javascript>/js/main.js</header-portlet-javascript>
     </portlet>
@@ -233,7 +233,7 @@
         <instanceable>false</instanceable>
         <header-portlet-css>/css/main.css</header-portlet-css>
         <header-portlet-javascript>/js/main.js</header-portlet-javascript>
-         <header-portlet-javascript>/js/external/jquery-1.11.1.min.js</header-portlet-javascript>
+         <header-portlet-javascript>/webjars/jquery/1.12.4/jquery.min.js</header-portlet-javascript>
     </portlet>
 
     <portlet>
@@ -242,7 +242,7 @@
         <instanceable>false</instanceable>
         <header-portlet-css>/css/main.css</header-portlet-css>
         <header-portlet-javascript>/js/main.js</header-portlet-javascript>
-        <header-portlet-javascript>/js/external/jquery-1.11.1.min.js</header-portlet-javascript>
+        <header-portlet-javascript>/webjars/jquery/1.12.4/jquery.min.js</header-portlet-javascript>
     </portlet>
 
     <portlet>
@@ -251,7 +251,7 @@
         <instanceable>false</instanceable>
         <header-portlet-css>/css/main.css</header-portlet-css>
         <header-portlet-javascript>/js/main.js</header-portlet-javascript>
-        <header-portlet-javascript>/js/external/jquery-1.11.1.min.js</header-portlet-javascript>
+        <header-portlet-javascript>/webjars/jquery/1.12.4/jquery.min.js</header-portlet-javascript>
     </portlet>
 
     <portlet>
@@ -260,7 +260,7 @@
         <instanceable>false</instanceable>
         <header-portlet-css>/css/main.css</header-portlet-css>
         <header-portlet-javascript>/js/main.js</header-portlet-javascript>
-        <header-portlet-javascript>/js/external/jquery-1.11.1.min.js</header-portlet-javascript>
+        <header-portlet-javascript>/webjars/jquery/1.12.4/jquery.min.js</header-portlet-javascript>
     </portlet>
 
     <portlet>
@@ -269,7 +269,7 @@
         <instanceable>false</instanceable>
         <header-portlet-css>/css/main.css</header-portlet-css>
         <header-portlet-javascript>/js/main.js</header-portlet-javascript>
-        <header-portlet-javascript>/js/external/jquery-1.11.1.min.js</header-portlet-javascript>
+        <header-portlet-javascript>/webjars/jquery/1.12.4/jquery.min.js</header-portlet-javascript>
     </portlet>
 
     <portlet>
@@ -278,7 +278,7 @@
         <instanceable>false</instanceable>
         <header-portlet-css>/css/main.css</header-portlet-css>
         <header-portlet-javascript>/js/main.js</header-portlet-javascript>
-        <header-portlet-javascript>/js/external/jquery-1.11.1.min.js</header-portlet-javascript>
+        <header-portlet-javascript>/webjars/jquery/1.12.4/jquery.min.js</header-portlet-javascript>
     </portlet>
 
     <portlet>
@@ -287,7 +287,7 @@
         <instanceable>false</instanceable>
         <header-portlet-css>/css/main.css</header-portlet-css>
         <header-portlet-javascript>/js/main.js</header-portlet-javascript>
-        <header-portlet-javascript>/js/external/jquery-1.11.1.min.js</header-portlet-javascript>
+        <header-portlet-javascript>/webjars/jquery/1.12.4/jquery.min.js</header-portlet-javascript>
     </portlet>
 
     <portlet>
@@ -296,7 +296,7 @@
         <instanceable>false</instanceable>
         <header-portlet-css>/css/main.css</header-portlet-css>
         <header-portlet-javascript>/js/main.js</header-portlet-javascript>
-        <header-portlet-javascript>/js/external/jquery-1.11.1.min.js</header-portlet-javascript>
+        <header-portlet-javascript>/webjars/jquery/1.12.4/jquery.min.js</header-portlet-javascript>
     </portlet>
 
     <role-mapper>

diff --git a/...t/src/main/webapp/css/external/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/...t/src/main/webapp/css/external/images/ui-bg_diagonals-thick_18_b81900_40x40.png
diff --git a/...t/src/main/webapp/css/external/images/ui-bg_diagonals-thick_20_666666_40x40.png b/...t/src/main/webapp/css/external/images/ui-bg_diagonals-thick_20_666666_40x40.png
diff --git a/...w360-portlet/src/main/webapp/css/external/images/ui-bg_flat_0_aaaaaa_40x100.png b/...w360-portlet/src/main/webapp/css/external/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/...360-portlet/src/main/webapp/css/external/images/ui-bg_flat_10_000000_40x100.png b/...360-portlet/src/main/webapp/css/external/images/ui-bg_flat_10_000000_40x100.png
diff --git a/...360-portlet/src/main/webapp/css/external/images/ui-bg_flat_75_ffffff_40x100.png b/...360-portlet/src/main/webapp/css/external/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/...60-portlet/src/main/webapp/css/external/images/ui-bg_glass_100_f6f6f6_1x400.png b/...60-portlet/src/main/webapp/css/external/images/ui-bg_glass_100_f6f6f6_1x400.png
diff --git a/...60-portlet/src/main/webapp/css/external/images/ui-bg_glass_100_fdf5ce_1x400.png b/...60-portlet/src/main/webapp/css/external/images/ui-bg_glass_100_fdf5ce_1x400.png
diff --git a/...360-portlet/src/main/webapp/css/external/images/ui-bg_glass_55_fbf9ee_1x400.png b/...360-portlet/src/main/webapp/css/external/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/...360-portlet/src/main/webapp/css/external/images/ui-bg_glass_65_ffffff_1x400.png b/...360-portlet/src/main/webapp/css/external/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/...360-portlet/src/main/webapp/css/external/images/ui-bg_glass_75_dadada_1x400.png b/...360-portlet/src/main/webapp/css/external/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/...360-portlet/src/main/webapp/css/external/images/ui-bg_glass_75_e6e6e6_1x400.png b/...360-portlet/src/main/webapp/css/external/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/...360-portlet/src/main/webapp/css/external/images/ui-bg_glass_95_fef1ec_1x400.png b/...360-portlet/src/main/webapp/css/external/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/...tlet/src/main/webapp/css/external/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/...tlet/src/main/webapp/css/external/images/ui-bg_gloss-wave_35_f6a828_500x100.png
diff --git a/...t/src/main/webapp/css/external/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/...t/src/main/webapp/css/external/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
diff --git a/...et/src/main/webapp/css/external/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/...et/src/main/webapp/css/external/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/...et/src/main/webapp/css/external/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/...et/src/main/webapp/css/external/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
diff --git a/...d/sw360-portlet/src/main/webapp/css/external/images/ui-icons_222222_256x240.png b/...d/sw360-portlet/src/main/webapp/css/external/images/ui-icons_222222_256x240.png
diff --git a/...d/sw360-portlet/src/main/webapp/css/external/images/ui-icons_228ef1_256x240.png b/...d/sw360-portlet/src/main/webapp/css/external/images/ui-icons_228ef1_256x240.png
diff --git a/...d/sw360-portlet/src/main/webapp/css/external/images/ui-icons_2e83ff_256x240.png b/...d/sw360-portlet/src/main/webapp/css/external/images/ui-icons_2e83ff_256x240.png
diff --git a/...d/sw360-portlet/src/main/webapp/css/external/images/ui-icons_454545_256x240.png b/...d/sw360-portlet/src/main/webapp/css/external/images/ui-icons_454545_256x240.png
diff --git a/...d/sw360-portlet/src/main/webapp/css/external/images/ui-icons_888888_256x240.png b/...d/sw360-portlet/src/main/webapp/css/external/images/ui-icons_888888_256x240.png
diff --git a/...d/sw360-portlet/src/main/webapp/css/external/images/ui-icons_cd0a0a_256x240.png b/...d/sw360-portlet/src/main/webapp/css/external/images/ui-icons_cd0a0a_256x240.png
diff --git a/...d/sw360-portlet/src/main/webapp/css/external/images/ui-icons_ef8c08_256x240.png b/...d/sw360-portlet/src/main/webapp/css/external/images/ui-icons_ef8c08_256x240.png
diff --git a/...d/sw360-portlet/src/main/webapp/css/external/images/ui-icons_ffd27a_256x240.png b/...d/sw360-portlet/src/main/webapp/css/external/images/ui-icons_ffd27a_256x240.png
diff --git a/...d/sw360-portlet/src/main/webapp/css/external/images/ui-icons_ffffff_256x240.png b/...d/sw360-portlet/src/main/webapp/css/external/images/ui-icons_ffffff_256x240.png