Skip to content
This repository
Browse code

Merge remote-tracking branch 'build/multi-project'

Conflicts:
	settings.gradle
  • Loading branch information...
commit 8096fa5d5d183e020768865e3315eb98a58fbd97 2 parents f170a3e + 2b31d36
authored September 11, 2012
2  .gitignore
@@ -46,6 +46,8 @@ Thumbs.db
46 46
 */build
47 47
 #
48 48
 # # IntelliJ specific files/directories
  49
+
  50
+# IntelliJ specific files/directories
49 51
 out
50 52
 .idea
51 53
 *.ipr
2  gradle/buildscript.gradle
@@ -8,5 +8,5 @@ repositories {
8 8
 dependencies {
9 9
     classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.6.0'
10 10
     classpath 'com.mapvine:gradle-cobertura-plugin:0.1'
11  
-    classpath 'gradle-release:gradle-release:1.0pre'
  11
+    classpath 'gradle-release:gradle-release:1.0-SNAPSHOT'
12 12
 }
6  gradle/convention.gradle
@@ -9,7 +9,7 @@ subprojects { project ->
9 9
     sourceCompatibility = 1.6
10 10
 
11 11
     // GRADLE-2087 workaround, perform after java plugin
12  
-    status = version.contains('-SNAPSHOT')?'snapshot':'release'
  12
+    status = rootProject.status
13 13
 
14 14
     task sourcesJar(type: Jar, dependsOn:classes) {
15 15
         classifier = 'sources'
@@ -21,6 +21,10 @@ subprojects { project ->
21 21
         from javadoc.destinationDir
22 22
     }
23 23
 
  24
+    // Ensure output is on a new line
  25
+    javadoc.doFirst { println "" }
  26
+
  27
+
24 28
     artifacts {
25 29
         archives sourcesJar
26 30
         archives javadocJar
20  gradle/release.gradle
@@ -25,6 +25,8 @@ task uploadArtifactory(type: GradleBuild) {
25 25
     startParameter.getExcludedTaskNames().add('check')
26 26
     tasks = [ 'build', 'artifactoryPublish' ]
27 27
 }
  28
+task releaseArtifactory(dependsOn: [checkSnapshotDependencies, uploadArtifactory])
  29
+
28 30
 
29 31
 task buildWithArtifactory(type: GradleBuild) {
30 32
     startParameter = project.gradle.startParameter.newInstance()
@@ -34,11 +36,11 @@ task buildWithArtifactory(type: GradleBuild) {
34 36
 }
35 37
 
36 38
 // Ensure upload happens before taggging but after all pre-checks
37  
-uploadArtifactory.dependsOn checkSnapshotDependencies
38  
-createReleaseTag.dependsOn uploadArtifactory
  39
+releaseArtifactory.dependsOn checkSnapshotDependencies
  40
+createReleaseTag.dependsOn releaseArtifactory
39 41
 gradle.taskGraph.whenReady { taskGraph ->
40  
-    if ( taskGraph.hasTask(uploadArtifactory) && !taskGraph.hasTask(':release') ) {
41  
-        throw new GradleException('"release" task has to be run before uploading to Artifactory')
  42
+    if ( taskGraph.hasTask(uploadArtifactory) && rootProject.status == 'release' && !taskGraph.hasTask(':release') ) {
  43
+        throw new GradleException('"release" task has to be run before uploading a release to Artifactory')
42 44
     }
43 45
 }
44 46
 subprojects.each { project ->
@@ -57,8 +59,10 @@ ext.'gradle.release.useAutomaticVersion' = "true"
57 59
 
58 60
 release {
59 61
     // http://tellurianring.com/wiki/gradle/release
60  
-    failOnCommitNeeded=false
61  
-    failOnPublishNeeded=false
62  
-    failOnUnversionedFiles=false
63  
-    failOnUpdateNeeded=false
  62
+    failOnCommitNeeded=true
  63
+    failOnPublishNeeded=true
  64
+    failOnUnversionedFiles=true
  65
+    failOnUpdateNeeded=true
  66
+    includeProjectNameInTag=true
  67
+    requireBranch = null
64 68
 }
6  settings.gradle
... ...
@@ -1,4 +1,2 @@
1  
-include 'eureka-client'
2  
-include 'eureka-server'
3  
-include 'eureka-core'
4  
-include 'eureka-resources'
  1
+rootProject.name='eureka' // TEMPLATE: Change this
  2
+include 'eureka-client','eureka-server','eureka-core','eureka-resources'

0 notes on commit 8096fa5

Please sign in to comment.
Something went wrong with that request. Please try again.