HHH-7162 - Use concise artifact syntax in build scripts

hibernate-c3p0/hibernate-c3p0.gradle

@@ -1,7 +1,8 @@
 apply plugin: 'java'
 
 dependencies {
-    compile( project( ':hibernate-core' ) )
+    compile project( ':hibernate-core' )
-    compile( [group: 'c3p0', name: 'c3p0', version: '0.9.1'] )
+    compile "c3p0:c3p0:0.9.1"
-    testCompile( project(':hibernate-testing') )
+
+    testCompile project( ':hibernate-testing' )
 }

hibernate-core/hibernate-core.gradle

@@ -14,12 +14,15 @@ dependencies {
     compile( libraries.jpa )
     compile( libraries.javassist )
     compile( libraries.antlr )
+
     antlr( libraries.antlr )
+
     provided( libraries.jandex )
     provided( libraries.classmate )
     provided( libraries.ant )
     provided( libraries.jacc )
     provided( libraries.validation )
+
     testCompile( project(':hibernate-testing') )
     testCompile( libraries.validation )
     testCompile( libraries.jandex )
@@ -28,6 +31,7 @@ dependencies {
         // for test runtime
         transitive = true
     }
+
     testRuntime( 'jaxen:jaxen:1.1' )
     testRuntime( libraries.javassist )
 

hibernate-ehcache/hibernate-ehcache.gradle

@@ -1,8 +1,9 @@
 apply plugin: 'java'
 
 dependencies {
-    compile( project( ':hibernate-core' ) )
+    compile project( ':hibernate-core' )
-    compile( [group: 'net.sf.ehcache', name: 'ehcache-core', version: '2.4.3', ext: 'jar'] )
+    compile "net.sf.ehcache:ehcache-core:2.4.3"
-    testCompile( project(':hibernate-testing') )
+
-    testCompile( libraries.h2 )
+    testCompile project( ':hibernate-testing' )
+    testCompile libraries.h2
 }

hibernate-infinispan/hibernate-infinispan.gradle

@@ -5,28 +5,19 @@ configurations {
 }
 
 dependencies {
-   infinispanVersion = '5.1.2.CR1'
+    infinispanVersion = '5.1.2.CR1'
-   jnpVersion = '5.0.3.GA'
+    jnpVersion = '5.0.3.GA'
 
-   compile(project(':hibernate-core'))
+    compile project( ':hibernate-core' )
-   compile([group: 'org.rhq.helpers', name: 'rhq-pluginAnnotations', version: '3.0.4'])
+    compile "org.infinispan:infinispan-core:${infinispanVersion}"
-   compile([group: 'org.infinispan', name: 'infinispan-core', version: infinispanVersion])
+    compile "org.rhq.helpers:rhq-pluginAnnotations:3.0.4"
-   testCompile([group: 'org.infinispan', name: 'infinispan-core', version: infinispanVersion]) {
+
-      artifact {
+    testCompile project( ':hibernate-testing' )
-         name = "infinispan-core"
+    testCompile "org.infinispan:infinispan-core:${infinispanVersion}:tests@jar"
-         type = 'jar'
+    testCompile "org.jboss:jboss-common-core:2.2.14.GA"
-      }
+    testCompile "org.jboss.naming:jnp-client:${jnpVersion}"
-      artifact {
+    testCompile "org.jboss.naming:jnpserver:${jnpVersion}"
-         name = "infinispan-core"
+    testCompile "org.rhq.helpers:rhq-pluginAnnotations:1.4.0.B01"
-         classifier = 'tests'
-         type = 'jar'
-      }
-   }
-   testCompile( project(':hibernate-testing') )
-   testCompile([group: 'org.jboss', name: 'jboss-common-core', version: '2.2.14.GA'])
-   testCompile([group: 'org.jboss.naming', name: 'jnp-client', version: jnpVersion])
-   testCompile([group: 'org.jboss.naming', name: 'jnpserver', version: jnpVersion])
-   testCompile([group: 'org.rhq.helpers', name: 'rhq-pluginAnnotations', version: '1.4.0.B01'])
 }
 
 test {

hibernate-proxool/hibernate-proxool.gradle

@@ -1,8 +1,9 @@
 apply plugin: 'java'
 
 dependencies {
-    compile( project( ':hibernate-core' ) )
+    compile project( ':hibernate-core' )
-    compile( [group: 'proxool', name: 'proxool', version: '0.8.3'] )
+    compile "proxool:proxool:0.8.3"
-    testCompile( project(':hibernate-testing') )
+
-    testRuntime( libraries.h2 )
+    testCompile project( ':hibernate-testing' )
+    testRuntime libraries.h2
 }

hibernate-testing/hibernate-testing.gradle

@@ -1,33 +1,10 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2011, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
- */
 apply plugin: 'java'
 
 dependencies {
-    compile( project( ':hibernate-core' ) )
+    compile project( ':hibernate-core' )
-    compile( [group: 'junit', name: 'junit', version: '4.8.2'] )
+    compile "junit:junit:4.8.2"
-    compile([group: 'com.experlog', name: 'xapool', version: '1.5.0'])
+    compile "com.experlog:xapool:1.5.0"
-    compile([group: 'org.jboss.jbossts', name: 'jbossjta', version: '4.15.1.Final']) {
+    compile ( "org.jboss.jbossts:jbossjta:4.15.1.Final" ) {
         transitive=false;
     }
 }