Sophie

Sophie

distrib > Mageia > 3 > x86_64 > media > core-release-src > by-pkgid > 834d1310d192d67a01b385ca50735f4f > files > 3

hibernate4-4.1.7-6.mga3.src.rpm

diff -Nru hibernate-release-4.1.7.Final/build.gradle hibernate-release-4.1.7.Final-gil/build.gradle
--- hibernate-release-4.1.7.Final/build.gradle	2012-09-06 07:11:40.000000000 +0200
+++ hibernate-release-4.1.7.Final-gil/build.gradle	2012-10-16 05:40:40.015319957 +0200
@@ -3,23 +3,23 @@
 apply from: "./libraries.gradle"
 allprojects {
     repositories {
-    	mavenCentral()
-    	mavenLocal()
-        mavenRepo name: 'jboss-nexus', url: "http://repository.jboss.org/nexus/content/groups/public/"
-        mavenRepo name: "jboss-snapshots", url: "http://snapshots.jboss.org/maven2/"
+        ivy {
+            artifactPattern "/usr/share/java/[module]-[revision].[ext]"
+            artifactPattern "/usr/share/java/[module].[ext]"
+        }
     }
 }
 
 buildscript {
     repositories {
-	    mavenCentral()
-	    mavenLocal()
-        mavenRepo name: 'jboss-nexus', url: "http://repository.jboss.org/nexus/content/groups/public/"
-        mavenRepo name: "jboss-snapshots", url: "http://snapshots.jboss.org/maven2/"
-    }
-    dependencies {
-        classpath 'org.hibernate.build.gradle:gradle-upload-auth-plugin:1.1.1'
+        ivy {
+            artifactPattern "/usr/share/java/[module]-[revision].[ext]"
+            artifactPattern "/usr/share/java/[module].[ext]"
+        }
     }
+    //dependencies {
+    //    classpath 'org.hibernate.build.gradle:gradle-upload-auth-plugin:1.1.1'
+    //}
 }
 
 idea {
@@ -57,8 +57,8 @@
     buildDir = "target"
     if ( ! subProject.name.startsWith( 'release' )  && ! subProject.name.startsWith( 'documentation' ) ) {
         apply plugin: 'java'
-        apply plugin: 'maven' // for install task as well as deploy dependencies
-        apply plugin: 'uploadAuth'
+        //apply plugin: 'maven' // for install task as well as deploy dependencies
+        //apply plugin: 'uploadAuth'
 
         configurations {
             provided {
@@ -104,7 +104,23 @@
             jaxb( libraries.jaxb ){exclude group: "javax.xml.stream"}
             jaxb( libraries.jaxb2_basics )
             jaxb( libraries.jaxb2_ant )
-            deployerJars "org.apache.maven.wagon:wagon-http:1.0"
+            jaxb( libraries.jaxb2_basics_tools )
+            jaxb( libraries.jaxb2_annotate )
+            jaxb( libraries.jaxb2_runtime )
+            jaxb( libraries.codemodel )
+            jaxb( libraries.istack_buildtools )
+            jaxb( libraries.istack_runtime )
+            jaxb( libraries.istack_test )
+            jaxb( libraries.istack_tools )
+            jaxb( libraries.xsom )
+            jaxb( libraries.rngom )
+            jaxb( libraries.txw2 )
+            jaxb( libraries.txwc2 )
+            jaxb( libraries.annox )
+            jaxb( libraries.commons_beanutils )
+            jaxb( libraries.commons_lang )
+            jaxb( libraries.commons_logging )
+            deployerJars "org.apache.maven.wagon:maven-wagon/http:1.0"
         }
 		if(ext.toolsJar.exists()){
 		    dependencies{
@@ -180,8 +196,8 @@
             }
         } )
 
-        assemble.doLast( { install } )
-        uploadArchives.dependsOn install
+        //assemble.doLast( { install } )
+        //uploadArchives.dependsOn install
 
         targetCompatibility = "1.6"
         sourceCompatibility = "1.6"
@@ -257,18 +273,18 @@
 
         subProject.ext.basePomConfig = pomConfig
 
-        configure(install.repositories.mavenInstaller) {
-            pom.project pomConfig
-        }
+        //configure(install.repositories.mavenInstaller) {
+        //    pom.project pomConfig
+        //}
 
         uploadArchives {
-            repositories.mavenDeployer {
-                name = 'jbossDeployer'
-                configuration = configurations.deployerJars
-                pom.project pomConfig
-                repository(id: "jboss-releases-repository", url: "https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/")
-                snapshotRepository(id: "jboss-snapshots-repository", url: "https://repository.jboss.org/nexus/content/repositories/snapshots")
-            }
+            //repositories.mavenDeployer {
+            //  name = 'jbossDeployer'
+            //  configuration = configurations.deployerJars
+            //  pom.project pomConfig
+            //  repository(id: "jboss-releases-repository", url: "https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/")
+            //  snapshotRepository(id: "jboss-snapshots-repository", url: "https://repository.jboss.org/nexus/content/repositories/snapshots")
+            //}
         }
 
         task sourcesJar(type: Jar, dependsOn: compileJava) {
diff -Nru hibernate-release-4.1.7.Final/buildSrc/build.gradle hibernate-release-4.1.7.Final-gil/buildSrc/build.gradle
--- hibernate-release-4.1.7.Final/buildSrc/build.gradle	2012-09-05 05:49:11.000000000 +0200
+++ hibernate-release-4.1.7.Final-gil/buildSrc/build.gradle	2012-10-16 05:40:40.115313921 +0200
@@ -28,9 +28,10 @@
 buildDir = "target"
 
 repositories {
-    mavenCentral()
-    mavenLocal()
-    mavenRepo name: "jboss", url: "http://repository.jboss.org/nexus/content/groups/public/"
+        ivy {
+            artifactPattern "/usr/share/java/[module]-[revision].[ext]"
+            artifactPattern "/usr/share/java/[module].[ext]"
+        }
 }
 targetCompatibility = "1.6"
 sourceCompatibility = "1.6"
@@ -52,7 +53,7 @@
 		languageLevel = '1.6'
 	}
 	module {
-		downloadSources = true
-		downloadJavadoc = true
+		downloadSources = false
+		downloadJavadoc = false
 	}
 }
diff -Nru hibernate-release-4.1.7.Final/hibernate-c3p0/hibernate-c3p0.gradle hibernate-release-4.1.7.Final-gil/hibernate-c3p0/hibernate-c3p0.gradle
--- hibernate-release-4.1.7.Final/hibernate-c3p0/hibernate-c3p0.gradle	2012-09-05 05:49:11.000000000 +0200
+++ hibernate-release-4.1.7.Final-gil/hibernate-c3p0/hibernate-c3p0.gradle	2012-10-16 05:40:40.116313863 +0200
@@ -8,4 +8,6 @@
         transitive = true
     }
     testCompile project( ':hibernate-testing' )
+    testRuntime( [group: 'com.mchange', name: 'mchange-commons', version: '0.2'] )
+    testRuntime( [group: 'log4j', name: 'log4j', version: '1.2.16'] )
 }
\ Manca newline alla fine del file
diff -Nru hibernate-release-4.1.7.Final/hibernate-core/hibernate-core.gradle hibernate-release-4.1.7.Final-gil/hibernate-core/hibernate-core.gradle
--- hibernate-release-4.1.7.Final/hibernate-core/hibernate-core.gradle	2012-09-05 05:49:11.000000000 +0200
+++ hibernate-release-4.1.7.Final-gil/hibernate-core/hibernate-core.gradle	2012-10-16 05:40:40.148311932 +0200
@@ -3,6 +3,27 @@
 apply plugin: org.hibernate.build.gradle.testing.matrix.MatrixTestingPlugin
 
 dependencies {
+    jaxb( libraries.jaxb_api )
+    jaxb( libraries.jaxb_impl )
+    jaxb( libraries.jaxb )
+    jaxb( libraries.jaxb2_basics )
+    jaxb( libraries.jaxb2_basics_tools )
+    jaxb( libraries.jaxb2_ant )
+    jaxb( libraries.jaxb2_annotate )
+    jaxb( libraries.jaxb2_runtime )
+    jaxb( libraries.codemodel )
+    jaxb( libraries.istack_buildtools )
+    jaxb( libraries.istack_runtime )
+    jaxb( libraries.istack_test )
+    jaxb( libraries.istack_tools )
+    jaxb( libraries.xsom )
+    jaxb( libraries.rngom )
+    jaxb( libraries.txw2 )
+    jaxb( libraries.txwc2 )
+    jaxb( libraries.annox )
+    jaxb( libraries.commons_beanutils )
+    jaxb( libraries.commons_lang )
+    jaxb( libraries.commons_logging )
     compile( libraries.jta )
     compile( libraries.dom4j )
     compile( libraries.commons_annotations )
diff -Nru hibernate-release-4.1.7.Final/hibernate-infinispan/hibernate-infinispan.gradle hibernate-release-4.1.7.Final-gil/hibernate-infinispan/hibernate-infinispan.gradle
--- hibernate-release-4.1.7.Final/hibernate-infinispan/hibernate-infinispan.gradle	2012-09-05 05:49:11.000000000 +0200
+++ hibernate-release-4.1.7.Final-gil/hibernate-infinispan/hibernate-infinispan.gradle	2012-10-16 05:47:16.348404427 +0200
@@ -8,7 +8,7 @@
     compile( libraries.rhq )
 
     testCompile project( ':hibernate-testing' )
-    testCompile( libraries.infinispan_test )
+    //testCompile( libraries.infinispan_test )
     testCompile( libraries.jboss_common_core )
     testCompile( libraries.jnp_client )
     testCompile( libraries.jnp_server )
diff -Nru hibernate-release-4.1.7.Final/hibernate-proxool/hibernate-proxool.gradle hibernate-release-4.1.7.Final-gil/hibernate-proxool/hibernate-proxool.gradle
--- hibernate-release-4.1.7.Final/hibernate-proxool/hibernate-proxool.gradle	2012-08-21 08:17:09.000000000 +0200
+++ hibernate-release-4.1.7.Final-gil/hibernate-proxool/hibernate-proxool.gradle	2012-10-16 05:40:41.239246100 +0200
@@ -3,4 +3,5 @@
     compile project( ':hibernate-core' )
     compile( libraries.proxool )
     testCompile project( ':hibernate-testing' )
+    testRuntime( [group: 'log4j', name: 'log4j', version: '1.2.16'] )
 }
diff -Nru hibernate-release-4.1.7.Final/libraries.gradle hibernate-release-4.1.7.Final-gil/libraries.gradle
--- hibernate-release-4.1.7.Final/libraries.gradle	2012-09-05 05:49:18.000000000 +0200
+++ hibernate-release-4.1.7.Final-gil/libraries.gradle	2012-10-16 05:46:45.365273932 +0200
@@ -18,7 +18,7 @@
 
         // Annotations
         commons_annotations:
-                        'org.hibernate.common:hibernate-commons-annotations:4.0.1.Final@jar',
+                        'org.hibernate.common:hibernate/hibernate-commons-annotations:4.0.1.Final@jar',
         jandex:         'org.jboss:jandex:1.0.3.Final',
         classmate:      'com.fasterxml:classmate:0.5.4',
 
@@ -30,49 +30,69 @@
 
         // javax
         jpa:            'org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.1.Final',
-        jta:            'org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.0.Final',
-        validation:     'javax.validation:validation-api:1.0.0.GA',
-        jacc:           'org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:1.0.0.Final',
+        jta:            'org.jboss.spec.javax.transaction:jboss-transaction-1.1-api:1.0.0.Final',
+        validation:     'javax.validation:bean-validation-api:1.0.0.GA',
+        jacc:           'org.jboss.spec.javax.security.jacc:jboss-jacc-1.4-api:1.0.0.Final',
 
         // logging
         logging:        'org.jboss.logging:jboss-logging:3.1.0.GA',
         logging_processor:  'org.jboss.logging:jboss-logging-processor:1.0.0.Final',
 
         // jaxb task
-        jaxb:           'com.sun.xml.bind:jaxb-xjc:2.1.6',
+        jaxb:           'com.sun.xml.bind:glassfish-jaxb/jaxb-xjc:2.1.6',
         jaxb2_basics:   'org.jvnet.jaxb2_commons:jaxb2-basics:0.6.0',
         jaxb2_ant:      'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.6.0',
+        jaxb_api:       'javax.xml.bind:jaxb-api:2.1.6',
+        jaxb_impl:      'com.sun.xml.bind:glassfish-jaxb/jaxb-impl:2.1.6',
+        jaxb2_annotate: 'org.jvnet.jaxb2_commons:jaxb2-common-basics/jaxb2-basics-annotate:0.6.0',
+        jaxb2_runtime:  'org.jvnet.jaxb2_commons:jaxb2-common-basics/jaxb2-basics-runtime:0.6.0',
+        jaxb2_basics:   'org.jvnet.jaxb2_commons:jaxb2-common-basics/jaxb2-basics:0.6.0',
+        jaxb2_ant:      'org.jvnet.jaxb2_commons:jaxb2-common-basics/jaxb2-basics-ant:0.6.0',
+        jaxb2_basics_tools:      'org.jvnet.jaxb2_commons:jaxb2-common-basics/jaxb2-basics-tools:0.6.0',
+        codemodel:         'com.sun.codemodel:codemodel:2.6',
+        istack_buildtools: 'com.sun.istack:istack-commons-buildtools:2.6.1',
+        istack_runtime:    'com.sun.istack:istack-commons-runtime:2.6.1',
+        istack_test:       'com.sun.istack:istack-commons-test:2.6.1',
+        istack_tools:      'com.sun.istack:istack-commons-tools:2.6.1',
+        xsom:              'com.sun.xsom:xsom:20110809',
+        rngom:             'org.kohsuke.rngom:rngom:201103-SNAPSHOT',
+        txw2:              'com.sun.xml.txw2:txw2:20110809',
+        txwc2:             'com.sun.xml.txwc2:txwc2:20110809',
+        annox:             'org.jvnet.annox:annox:0.5.0',
+        commons_beanutils: 'commons-beanutils:commons-beanutils:1.8.3',
+        commons_lang:      'commons-lang:commons-lang:2.6',
+        commons_logging:   'commons-logging:commons-logging:1.1.1',
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~ testing
 
         // logging for testing
-        slf4j_api:      "org.slf4j:slf4j-api:${slf4jVersion}",
-        slf4j_log4j12:  "org.slf4j:slf4j-log4j12:${slf4jVersion}",
-        jcl_slf4j:      "org.slf4j:jcl-over-slf4j:${slf4jVersion}",
-        jcl_api:        'commons-logging:commons-logging-api:99.0-does-not-exist',
-        jcl:            'commons-logging:commons-logging:99.0-does-not-exist',
+        slf4j_api:      "org.slf4j:slf4j/api:${slf4jVersion}",
+        slf4j_log4j12:  "org.slf4j:slf4j/log4j12:${slf4jVersion}",
+        jcl_slf4j:      "org.slf4j:slf4j/jcl-over-slf4j:${slf4jVersion}",
+        jcl_api:        'commons-logging:maven/empty-dep:99.0-does-not-exist',
+        jcl:            'commons-logging:maven/empty-dep:99.0-does-not-exist',
 
 
         junit:           "junit:junit:${junitVersion}",
-        byteman:         "org.jboss.byteman:byteman:${bytemanVersion}",
-        byteman_install: "org.jboss.byteman:byteman-install:${bytemanVersion}",
-        byteman_bmunit:  "org.jboss.byteman:byteman-bmunit:${bytemanVersion}",
+        byteman:         "org.jboss.byteman:byteman/byteman:${bytemanVersion}",
+        byteman_install: "org.jboss.byteman:byteman/byteman-install:${bytemanVersion}",
+        byteman_bmunit:  "org.jboss.byteman:byteman/byteman-bmunit:${bytemanVersion}",
         jpa_modelgen:    'org.hibernate:hibernate-jpamodelgen:1.1.1.Final',
-        shrinkwrap_api:  'org.jboss.shrinkwrap:shrinkwrap-api:1.0.0-beta-6',
-        shrinkwrap:      'org.jboss.shrinkwrap:shrinkwrap-impl-base:1.0.0-beta-6',
+        shrinkwrap_api:  'org.jboss.shrinkwrap:shrinkwrap/api:1.0.0-beta-6',
+        shrinkwrap:      'org.jboss.shrinkwrap:shrinkwrap/impl-base:1.0.0-beta-6',
         validator:       'org.hibernate:hibernate-validator:4.2.0.Final',
         h2:              "com.h2database:h2:${h2Version}",
-        jboss_jta:       "org.jboss.jbossts:jbossjta:4.16.4.Final",
+        jboss_jta:       "org.jboss.jbossts:jboss-jts/jbossjta:4.16.4.Final",
         xapool:          "com.experlog:xapool:1.5.0",
-        mockito:         'org.mockito:mockito-core:1.9.0',
+        mockito:         'org.mockito:mockito:1.9.0',
         
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~  infinsipan
-        infinispan:      "org.infinispan:infinispan-core:${infinispanVersion}",
+        infinispan:      "org.infinispan:infinispan/infinispan-core:${infinispanVersion}",
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~  infinispan test
-        infinispan_test: "org.infinispan:infinispan-core:${infinispanVersion}:tests@jar",
-        rhq:             "org.rhq.helpers:rhq-pluginAnnotations:3.0.4",
+        //infinispan_test: "org.infinispan:infinispan-core:${infinispanVersion}:tests@jar",
+        rhq:             "org.rhq.helpers:rhq-plugin-annotations:3.0.4",
         jboss_common_core: "org.jboss:jboss-common-core:2.2.16.GA@jar",
-        jnp_client:      "org.jboss.naming:jnp-client:${jnpVersion}",
-        jnp_server:      "org.jboss.naming:jnpserver:${jnpVersion}",
+        jnp_client:      "org.jboss.naming:jboss-naming-client:${jnpVersion}",
+        jnp_server:      "org.jboss.naming:jboss-naming-server:${jnpVersion}",
 
 		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~ c3p0
 		c3p0:            "c3p0:c3p0:0.9.1",
diff -Nru hibernate-release-4.1.7.Final/release/release.gradle hibernate-release-4.1.7.Final-gil/release/release.gradle
--- hibernate-release-4.1.7.Final/release/release.gradle	2012-09-05 05:49:11.000000000 +0200
+++ hibernate-release-4.1.7.Final-gil/release/release.gradle	2012-10-16 05:40:42.125192638 +0200
@@ -108,7 +108,7 @@
 // release bundles ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 ext.releaseBuildDir = mkdir( buildDir )
-task prepareReleaseBundles( dependsOn: [parent.project( 'documentation' ).tasks.buildDocs,aggregateJavadocs] )
+task prepareReleaseBundles( dependsOn: aggregateJavadocs )
 
 
 ext.releaseCopySpec = copySpec {
@@ -160,9 +160,9 @@
             }
         }
 
-        into('documentation') {
-            from new File( parent.project( 'documentation' ).buildDir, 'docbook/publish' )
-        }
+        //into('documentation') {
+        //    from new File( parent.project( 'documentation' ).buildDir, 'docbook/publish' )
+        //}
 
         into('documentation/javadocs') {
             from javadocBuildDir
diff -Nru hibernate-release-4.1.7.Final/settings.gradle hibernate-release-4.1.7.Final-gil/settings.gradle
--- hibernate-release-4.1.7.Final/settings.gradle	2012-09-05 05:49:11.000000000 +0200
+++ hibernate-release-4.1.7.Final-gil/settings.gradle	2012-10-16 05:40:42.126192577 +0200
@@ -8,7 +8,7 @@
 
 include 'hibernate-ehcache'
 include 'hibernate-infinispan'
-include 'documentation'
+//include 'documentation'
 include 'release'