Merge pull request #298 from pwm-project/build-fix

Updated build because it was pulling in duplicate versions of angular…

server/pom.xml

@@ -816,7 +816,7 @@
             <version>1.0.0</version>
         </dependency>
         <dependency>
-            <groupId>org.webjars.npm</groupId>
+            <groupId>org.webjars.bower</groupId>
             <artifactId>angular</artifactId>
             <version>1.6.9</version>
         </dependency>
@@ -831,26 +831,14 @@
             <version>1.0.14</version>
         </dependency>
         <dependency>
-            <groupId>org.webjars.npm</groupId>
+            <groupId>org.webjars.bower</groupId>
             <artifactId>angular-translate</artifactId>
             <version>2.17.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.webjars.npm</groupId>
-                    <artifactId>angular</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.webjars.bower</groupId>
             <artifactId>textAngular</artifactId>
             <version>1.5.16</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.webjars.bower</groupId>
-                    <artifactId>angular</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
     </dependencies>
 

server/src/main/webapp/WEB-INF/jsp/fragment/footer.jsp

@@ -30,7 +30,7 @@
     <pwm:script-ref url="/public/resources/webjars/angular/angular.min.js" />
     <pwm:script-ref url="/public/resources/webjars/angular-aria/angular-aria.min.js" />
     <pwm:script-ref url="/public/resources/webjars/angular-ui-router/release/angular-ui-router.min.js" />
-    <pwm:script-ref url="/public/resources/webjars/angular-translate/dist/angular-translate.min.js" />
+    <pwm:script-ref url="/public/resources/webjars/angular-translate/angular-translate.min.js" />
     <pwm:script-ref url="/public/resources/webjars/pwm-client/vendor/ng-ias.js" />
 </pwm:if>