Author: echatellier Date: 2014-05-26 18:05:15 +0200 (Mon, 26 May 2014) New Revision: 99 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/99 Log: Fix dependencies Modified: trunk/faxtomail-ui-web/pom.xml trunk/pom.xml Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-05-26 15:31:06 UTC (rev 98) +++ trunk/faxtomail-ui-web/pom.xml 2014-05-26 16:05:15 UTC (rev 99) @@ -209,8 +209,8 @@ </dependency> <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> </dependency> <dependency> @@ -220,11 +220,6 @@ <dependency> <groupId>org.webjars</groupId> - <artifactId>jstree</artifactId> - </dependency> - - <dependency> - <groupId>org.webjars</groupId> <artifactId>bootstrap</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-26 15:31:06 UTC (rev 98) +++ trunk/pom.xml 2014-05-26 16:05:15 UTC (rev 99) @@ -530,13 +530,6 @@ <dependency> <groupId>org.webjars</groupId> - <artifactId>jstree</artifactId> - <version>3.0.0</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.webjars</groupId> <artifactId>bootstrap</artifactId> <version>3.1.1-1</version> <scope>runtime</scope> @@ -561,6 +554,12 @@ <artifactId>nuiton-js-angular-ui-tree</artifactId> <version>2.0.6-1</version> <scope>runtime</scope> + <exclusions> + <exclusion> + <artifactId>nuiton-js-angularjs</artifactId> + <groupId>org.nuiton.js</groupId> + </exclusion> + </exclusions> </dependency> </dependencies>