Improved dependency organization.

createinfo · Dec 3, 2013 · 9bd94ea · 9bd94ea
1 parent f742b93
commit 9bd94ea
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 22 deletions.
diff --git a/.classpath b/.classpath
@@ -6,10 +6,6 @@
 	<classpathentry kind="src" path="src-modules"/>
 	<classpathentry kind="src" path="src-setup"/>
 	<classpathentry excluding="META-INF/|data/|ehcache.xml" kind="src" path="test"/>
-	<classpathentry exported="true" kind="lib" path="lib/compile/acacia-client.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/compile/geranium-client.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/compile/wrapper-client.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/compile/gwtexporter-2.4.0.jar"/>
 	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,6 +1,23 @@
 dependencies {
     compile group: 'javax.servlet', name: 'jsp-api', version: '2.0'
     compile group: 'javax.servlet', name: 'servlet-api', version: '2.4'
+    compile group: 'com.alkacon', name: 'acacia-editor-client', version: '2.0'
+    compile group: 'com.alkacon', name: 'geranium-client', version: '2.0'
+    compile group: 'com.alkacon', name: 'vie-gwt-client', version: '2.0'
+    compile group: 'com.google.gwt', name: 'gwt-dev', version: '2.6.0-rc1'
+    compile group: 'com.google.gwt', name: 'gwt-user', version: '2.6.0-rc1'
+    compile(group: 'javax.validation', name: 'validation-api', version: '1.0.0.GA'){
+        artifact {
+            name = 'validation-api'
+            type = 'jar'
+        }
+        artifact {
+            name = 'validation-api'
+            type = 'jar'
+            classifier = 'sources'
+        }
+    }
+    compile group: 'org.timepedia.exporter', name: 'gwtexporter', version: '2.4.0'
 
     componentsCompile group: 'org.apache.ant', name: 'ant', version: '1.8.4'
     componentsCompile group: 'ant-contrib', name: 'ant-contrib', version: '1.0b3'
@@ -25,24 +42,6 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.11'
     testCompile group: 'org.hamcrest', name: 'hamcrest-core', version: '1.3'
 
-    gwtCompile group: 'com.alkacon', name: 'acacia-editor-client', version: '2.0'
-    gwtCompile group: 'com.alkacon', name: 'geranium-client', version: '2.0'
-    gwtCompile group: 'com.alkacon', name: 'vie-gwt-client', version: '2.0'
-    gwtCompile group: 'com.google.gwt', name: 'gwt-dev', version: '2.6.0-rc1'
-    gwtCompile group: 'com.google.gwt', name: 'gwt-user', version: '2.6.0-rc1'
-    gwtCompile(group: 'javax.validation', name: 'validation-api', version: '1.0.0.GA'){
-        artifact {
-            name = 'validation-api'
-            type = 'jar'
-        }
-        artifact {
-            name = 'validation-api'
-            type = 'jar'
-            classifier = 'sources'
-        }
-    }
-    gwtCompile group: 'org.timepedia.exporter', name: 'gwtexporter', version: '2.4.0'
-
     distribution group: 'antlr', name: 'antlr', version: '2.7.7'
     distribution group: 'com.alkacon', name: 'alkacon-simapi', version: '1.0.0'
     distribution group: 'com.alkacon', name: 'alkacon-diff', version: '0.9.2'