Merge pull request #6 from rico-project/bugfix/todo-client-angular-fix

Fix samples and use the newest version of the Rico AngularJS
rico-projects · Dec 12, 2018 · 40579c9 · 40579c9
2 parents aa8328d + 2847673
commit 40579c9
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 11 deletions.
diff --git a/rest-security/client-javascript/pom.xml b/rest-security/client-javascript/pom.xml
@@ -57,6 +57,13 @@
                     </httpConnector>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>

diff --git a/rest-security/client-polymer/pom.xml b/rest-security/client-polymer/pom.xml
@@ -61,6 +61,13 @@
                     </httpConnector>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>

diff --git a/todo-list/client-angular/bower.json b/todo-list/client-angular/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "todo-client-angular",
   "dependencies": {
-    "rico-angularjs": "https://github.com/rico-project/rico-angularjs.git#master",
+    "rico-angularjs": "1.0.0-CR.3",
     "bootstrap": "^3.3.7"
   }
 }
diff --git a/todo-list/client-angular/pom.xml b/todo-list/client-angular/pom.xml
@@ -56,6 +56,13 @@
                     </httpConnector>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>

diff --git a/todo-list/client-polymer/bower.json b/todo-list/client-polymer/bower.json
@@ -11,15 +11,5 @@
     "paper-item": "PolymerElements/paper-item#^2.0.0",
     "paper-styles": "PolymerElements/paper-styles#^2.0.0",
     "polymer": "^2.1.1"
-  },
-  "resolutions": {
-    "iron-icon": "^2.0.1",
-    "iron-icons": "^2.0.1",
-    "paper-icon-button": "^2.0.1",
-    "paper-input": "^2.0.2",
-    "paper-item": "^2.0.0",
-    "paper-styles": "^2.0.0",
-    "polymer": "^2.1.1",
-    "webcomponentsjs": "^v1.0.2"
   }
 }
diff --git a/todo-list/client-polymer/pom.xml b/todo-list/client-polymer/pom.xml
@@ -56,6 +56,13 @@
                     </httpConnector>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>