From 44cca7a375ab61a95c5e41bbe6bade9b6ae10339 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Wed, 13 Apr 2011 22:33:54 -0500 Subject: [PATCH] HHH-6106 - Fix up IntelliJ project generation --- build.gradle | 23 ++++++++++++++---- gradle/wrapper/gradle-wrapper.jar | Bin 12597 -> 12617 bytes gradle/wrapper/gradle-wrapper.properties | 4 +-- hibernate-ehcache/hibernate-ehcache.gradle | 2 +- .../hibernate-entitymanager.gradle | 6 ++++- 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 40f1eb3968..79c91e7ff2 100644 --- a/build.gradle +++ b/build.gradle @@ -28,9 +28,13 @@ ideaProject { def vcsConfig = node.component.find { it.'@name' == 'VcsDirectoryMappings' } vcsConfig.mapping[0].'@vcs' = 'Git' } + beforeConfigured { module -> + module.modulePaths.removeAll { it.filePath.endsWith('hibernate-core.iml') } + } } ideaModule { + moduleName = 'hibernate-core-root' } // build a map of the dependency artifacts to use. Allows centralized definition of the version of artifacts to @@ -138,7 +142,7 @@ subprojects { subProject -> deployerJars "org.apache.maven.wagon:wagon-http:1.0-beta-6" } - aptDumpDir = file( buildDirName + "/temp/apt" ) + aptDumpDir = file( buildDirName + "/tmp/apt" ) sourceSets.main { compileClasspath += configurations.provided @@ -211,9 +215,17 @@ subprojects { subProject -> whenConfigured { module -> module.dependencies*.exported = true } -// testSourceDirs.add( file( generatedSrcDirName ) ) -// testSourceDirs.add( file( generatedTestSrcDirName ) ) + excludeDirs = [ + file(".gradle"), + file("$buildDir/classes"), + file("$buildDir/dependency-cache"), + file("$buildDir/libs"), + file("$buildDir/reports"), + file("$buildDir/test-results"), + file("$buildDir/tmp") + ] as Set } + eclipseClasspath { plusConfigurations.add( configurations.provided ) } @@ -280,10 +292,11 @@ dependsOnChildren() // This is a task that generates the gradlew scripts, allowing users to run gradle without having gradle installed // on their system. -// This task should be run by "build master" and the resulting ouput committed to source control. Its outputs include: +// This task should be run by "build master" and the resulting output committed to source control. Its outputs include: // 1) /gradlew which is the *NIX shell script for executing builds // 2) /gradlew.bat which is the windows bat script for for executing builds // 3) /wrapper which is a directory named by the "jarPath" config which contains other needed files. task wrapper(type: Wrapper) { - gradleVersion = '0.9.2' + // HHH-6106 - this is needed for IntellJ generation until 1.0-milestone-3 is released. + gradleVersion = '1.0-milestone-3-20110411214339+0200' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 9d7bbe005f0b81b7d5248d2a6c245ab2618d3679..03234b176ce211920dcddd7948b56a57b65a6a53 100644 GIT binary patch delta 3347 zcmY+{_ct2~{|9i_sx8#0y{xEJTp z(1Y%_eB)TUJ4K5YWB#?gWQ@b2$AJflO`^rrGbf|O*8uT?mDGDiS(YO-g?`CcFAl1$ zChAswRZB{!bV>``&k{@vnuf>7-%}Z!i7?x%X+oJ|LNGK{&acz7M}P`8YL7G})<9`5 zUZ`SvkKt53MFJ6J@dlN%vMFy+M5#9rSegYmjGStT{Y?aFpE?n3jOwYb1}@YtK!Vs{ zh{lXN21()cs?C&sdA78 zE0JY`9=lqh8^2=sa7y9^`w)ufLE@ zhThXZKDXZc{9+R_z4qNzv4F_i*UC_OWGX+Y#`Fdfc%v5P>8g}vOMKY3sVSs2TdE#} zjwYl8D=*_Hl%IRfbGNF;J-PyBN}Hp6!!nTy$K_4IH@#0+qecSBa)$ONc~|uK2g{qE zxj`*QvF{>L!4tb%*?0K-1g0L2Tx~T=ve@u^DRg)AXfLaJ{AO3Q*Vcwx{K&nHFP)uD z`~AGFlNG;oiP-w@rrBeaQR7^-|M zGhDReT;dp-8T4|>*H1HhHfj*&j6hq%gnUxh>NybbSpy&SA5~29?oL?5m)RFEq+nat zK`6Wpl{f5`feXnUZtDag1G#03-)b2yDX#MFQX4&ndRg2{r%MuDJ_pI!rHk~C=7$@6 z+dQE%_E`rrCLTTC_l;kcE_xyb4@z4gDNJpO-PYb?3OE>*vqX_-te&D?E$jHc`smQ7 zeJjn%wcyp4qdK|MuzWdt<*O49N961cix|vMCPVDW2w3gvoA!4$5^(FK7!3|YQc*P-hs5j z7?NRqW<{YI;-hNBHtt+hkyU*C*5)>^B*Ob~KsA6+j-`Q$hnXFqr4#A3>t zS4o93%v=;s#(MNQ6Sm)ZkJ<&e_LC6u;AvXvhb^L$e_?G{~LB67%6zx4GHdv%v)i4;&rhW!w*5B&`e2 z`qc}De1;C!P@Csqs;MqbvF#^5%64*{Tv1Zj+t(S0@h}n@-9`3+Wa&ez#%gh$;L@7= z#P>$GXipcTz{VV&k9MlP7ILVGDVpnDNsNV+sul(5%8&jTz`&zoTYB+QMhUm(XEHBBqtH*J?#KVrGGj<#A%#|Ies+x(s zt#*#Wk1mKKM?tqz4Lg6@Eg;JhTH&Ze2acH5C~zhlF?)fx zHI5sl&tNQ~E5WRG)a$u0rU;d5iUL&+QET#hIgyOub?R7G#h+WR{~4$qqF-@>nx@;P zM;I6L#-7gQz$AXavws1bl~+6<5fbz|9aE^^EV_)=#iDQd9QxlVWA8Y9c8U8i`>h#Xn$iQS_+^cB0qtQhcmOun%Lg8u~=O zib4B~avMy7U9}Y|;?H}3*PQ@Z(^E)e56{p{seZIvmC6^_fhv_n2x|5@IfG%o4SJQX5QEC&X0Q$b=0w}2sr*!D~6=RB^~Okr2T$B}lc zZtM&Z9GIAHe~lt2tFZnKE;i2%)9I~W`9eALigK8UFpb59%ILCW-Sj#WPgnok1>sh| zT73)boxJ%;eBJ03pR4r!T)g}))Cpx>GeoFSsUZ+*o=LCVRV**~TB}(@AGb$Fn<`$n ziDkXzB&_3gztMBJFPKhwt6sDp*#`jUJScY$%aiJ+08T9l9aB{FAw^)yAZ-LoF?E}y zvb*x&)VwOqK5u zoG{1ULX9ivtVp^+LB?3D_Iwk1-_oOAxMV)$fBC_u!I}VBqAoN_<1hT9vmlsK$7O=p z(6*DP*`@bh*R6}G4sukU52#43KXNoVFOl>~^fYbTf%bxmAG=cxZ#QW%(BFP$d(1Jm z)u((5X?hd#oQKC9bF83$05eoo55o^Ct5;eWg}yf9OZc&rBPnt z=sSY1=8^#Yl&jMVnGwI?a~@*B8^m9EUwCK|dtyQvo6j3zz$F8RKT+Sk4OTMdZ{C$9 zd<=Rn*_Ryisbl%8hr@fZ7fvG|GW_*IHm~Z0>@}By4`@LpkQIy*xk)xlR&Fc&obTM5 zG0u|fm-E*rcZLlRpVFd(0ckNZ++D~-3Ax)#g_erqF)7qUg7 zqm#i0e?_$f>}N>fT_~t{H4mG!J27AYa9qp@(R@8{y+M4y0+^>3*xV-($eKECu_%qU zY#nCbCa0>~2Rq3~K%$BhUhHfc9yu2}6B7c(hIHQ^5yWJon4ibf1^vd?>`r=0_s8SM zXK-0d5!y?Va^sOazk-Zgo28yLrf<3b(~#<#{_&WPvpApyH;g(EN|zY2S6i4K=U0s* z^;Ll+kTOvEC7R#D8%s_(0W5BW_%%5 t4SeCM8stJVpyP!lK)VaqfVLOvsJmU5t8UNv|E5U(hPpX(uqxeu?>{3}aMAz( delta 3327 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 PJ5qjw6>*I~fWPm5#DiMk diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1dfbbea00e..b3106c59e8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Feb 10 09:53:56 CST 2011 +#Wed Apr 13 22:28:41 CDT 2011 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://gradle.artifactoryonline.com/gradle/distributions/gradle-0.9.2-bin.zip +distributionUrl=http\://repo.gradle.org/gradle/distributions/gradle-snapshots/gradle-1.0-milestone-3-20110411214339+0200-bin.zip diff --git a/hibernate-ehcache/hibernate-ehcache.gradle b/hibernate-ehcache/hibernate-ehcache.gradle index cad959dafb..f0934e7e47 100644 --- a/hibernate-ehcache/hibernate-ehcache.gradle +++ b/hibernate-ehcache/hibernate-ehcache.gradle @@ -1,4 +1,4 @@ - apply plugin: 'java' +apply plugin: 'java' dependencies { compile( project( ':hibernate-core' ) ) diff --git a/hibernate-entitymanager/hibernate-entitymanager.gradle b/hibernate-entitymanager/hibernate-entitymanager.gradle index b6a8946f37..43d1f5ce35 100644 --- a/hibernate-entitymanager/hibernate-entitymanager.gradle +++ b/hibernate-entitymanager/hibernate-entitymanager.gradle @@ -19,7 +19,7 @@ dependencies { testRuntime( libraries.validator ) } -aptDumpDir = file( buildDirName + "/temp/apt" ) +aptDumpDir = file( buildDirName + "/tmp/apt" ) sourceSets.test { originalJavaSrcDirs = java.srcDirs @@ -27,6 +27,10 @@ sourceSets.test { java.srcDir generatedJpaMetamodelSrcDir } +ideaModule { + excludeDirs += file("$buildDir/bundles") +} + task generateJpaMetamodelClasses(type: Compile) { classpath = compileTestJava.classpath + configurations.hibernateJpaModelGenTool source = sourceSets.test.originalJavaSrcDirs