Merge branch 'master' into wise-org-pela

wise-webapp/pom.xml

@@ -13,12 +13,20 @@
     </parent>
 
     <repositories>
-        <repository>
-            <layout>legacy</layout>
-            <id>local-dependecies</id>
-            <name>local-dependecies</name>
-            <url>file://${basedir}/../libraries</url>
+         <repository>
+          <id>maven2-repository.dev.java.net</id>
+          <name>Java.net Repository for Maven</name>
+          <url>http://download.java.net/maven/2/</url>
+          <layout>default</layout>
         </repository>
+         <repository>
+          <id>maven2-repository.jahia.org</id>
+          <name>Jahia Repository for Maven</name>
+          <url>http://maven.jahia.org/maven2/</url>
+          <layout>default</layout>
+        </repository>
+
+
     </repositories>
 
     <dependencies>
@@ -89,12 +97,12 @@
             <version>1.0.1B</version>
             <scope>compile</scope>
         </dependency>
-      <dependency>
+      <!-- <dependency>
             <groupId>com.jhlabs</groupId>
             <artifactId>imaging</artifactId>
             <version>01012005</version>
             <scope>compile</scope>
-        </dependency>
+        </dependency> -->
         <dependency>
              <groupId>com.octo.captcha</groupId>
              <artifactId>jcaptcha</artifactId>