Allow publishing to repo.micronaut.io. Fix tests

glorrian · Apr 13, 2018 · 59083dc · 59083dc
1 parent 621e4a1
commit 59083dc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/cli/build.gradle b/cli/build.gradle
@@ -76,8 +76,6 @@ task cliZip(type: Zip, dependsOn: ['fatJar']) {
     from('../LICENSE')
 }
 
-
-
 publishing {
     publications {
         maven(MavenPublication) {

diff --git a/function-web/build.gradle b/function-web/build.gradle
@@ -7,6 +7,4 @@ dependencies {
     testCompile project(":http-client")
     testCompile project(":inject-groovy")
     testCompile project(":http-server-netty")
-
-
 }
diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
@@ -66,10 +66,10 @@ publishing {
                 password = p
             }
             if(isBuildSnapshot) {
-                url  "https://repo.grails.org/grails/libs-snapshots-local"
+                url  "https://repo.micronaut.io/artifactory/libs-snapshots-local"
             }
             else {
-                url "https://repo.grails.org/grails/libs-releases-local"
+                url "https://repo.micronaut.io/artifactory/libs-releases-local"
             }
         }
     }
@@ -168,8 +168,8 @@ bintray {
     publications = ['maven']
     publish = true
     pkg {
-        repo = 'grails-core'
-        userOrg = 'grails'
+        repo = 'micronaut-core'
+        userOrg = 'micronaut-projects'
         name = project.name
         desc = "${project.title} - ${project.projectDesc}".toString()
         websiteUrl = projectUrl

diff --git a/test-suite/src/test/groovy/io/micronaut/upload/UploadSpec.groovy b/test-suite/src/test/groovy/io/micronaut/upload/UploadSpec.groovy
@@ -77,7 +77,7 @@ class UploadSpec extends AbstractMicronautSpec {
 
         then:
         def e = thrown(HttpClientResponseException)
-        e.message == HttpStatus.BAD_REQUEST.reason
+        e.response.status == HttpStatus.BAD_REQUEST
 
 
         when:
@@ -128,7 +128,7 @@ class UploadSpec extends AbstractMicronautSpec {
 
         then:
         def e = thrown(HttpClientResponseException)
-        e.message == HttpStatus.BAD_REQUEST.reason
+        e.response.status == HttpStatus.BAD_REQUEST
 
         when:
         def json = new JsonSlurper().parseText(e.response.getBody().get())
@@ -155,7 +155,7 @@ class UploadSpec extends AbstractMicronautSpec {
 
         then:
         def e = thrown(HttpClientResponseException)
-        e.message == HttpStatus.BAD_REQUEST.reason
+        e.response.status == HttpStatus.BAD_REQUEST
 
         when:
         def json = new JsonSlurper().parseText(e.response.getBody().get())
@@ -181,7 +181,7 @@ class UploadSpec extends AbstractMicronautSpec {
 
         then:
         def e = thrown(HttpClientResponseException)
-        e.message == HttpStatus.BAD_REQUEST.reason
+        e.response.status == HttpStatus.BAD_REQUEST
 
         when:
         def json = new JsonSlurper().parseText(e.response.getBody().get())
@@ -207,7 +207,7 @@ class UploadSpec extends AbstractMicronautSpec {
 
         then:
         def e = thrown(HttpClientResponseException)
-        e.message == HttpStatus.BAD_REQUEST.reason
+        e.response.status == HttpStatus.BAD_REQUEST
 
         when:
         def json = new JsonSlurper().parseText(e.response.getBody().get())
@@ -255,7 +255,7 @@ class UploadSpec extends AbstractMicronautSpec {
 
         then:
         def e = thrown(HttpClientResponseException)
-        e.message == HttpStatus.REQUEST_ENTITY_TOO_LARGE.reason
+        e.response.status == HttpStatus.REQUEST_ENTITY_TOO_LARGE
 
         when:
         def json = new JsonSlurper().parseText(e.response.getBody().get())