Skip to content

Commit f8dc959

Browse files
committed
Merge branch 'chore/upgrade-circle-ci'
resolves #29
2 parents 9112ceb + 3c9284c commit f8dc959

File tree

7 files changed

+303
-291
lines changed

7 files changed

+303
-291
lines changed

.circleci/config.yml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
version: 2
2+
jobs:
3+
build:
4+
working_directory: ~/code
5+
docker:
6+
- image: circleci/openjdk:8-jdk-node-browsers
7+
environment:
8+
JVM_OPTIONS: -Xmx1024M -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=512M
9+
GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-Xmx3840m -XX:+HeapDumpOnOutOfMemoryError"'
10+
steps:
11+
- checkout
12+
- restore_cache:
13+
key: jars-{{ checksum "build.gradle" }}-{{ checksum "build.gradle" }}
14+
# - run:
15+
# name: Chmod permissions #if permission for Gradlew Dependencies fail, use this.
16+
# command: sudo chmod +x ./gradlew
17+
- run:
18+
name: Download Dependencies
19+
command: ./gradlew dependencies
20+
- run:
21+
name: pre-dependencies
22+
command: npm install codecov
23+
- save_cache:
24+
paths:
25+
- ~/node_modules
26+
- ~/.m2
27+
- ~/.gradle
28+
key: jars-{{ checksum "build.gradle" }}-{{ checksum "build.gradle" }}
29+
- run:
30+
name: Run Tests
31+
command: ./gradlew clean build jacocoTestReport --no-daemon
32+
no_output_timeout: 900s
33+
environment:
34+
_JAVA_OPTIONS: -Xmx1024M -XX:ReservedCodeCacheSize=512M
35+
- run:
36+
name: Post test
37+
command: ./node_modules/.bin/codecov
38+
- run:
39+
name: Save test results
40+
command: |
41+
mkdir -p ~/junit/
42+
mkdir -p ~/reports/
43+
find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/junit/ \;
44+
cp -R swagger-grails-contract-tests/build/reports/tests ~/reports
45+
when: always
46+
- store_test_results:
47+
path: ~/junit
48+
- store_test_results:
49+
path: ~/reports
50+
- store_artifacts:
51+
path: ~/junit
52+
- store_artifacts:
53+
path: ~/reports
54+
- deploy:
55+
command: |
56+
if [ "${CIRCLE_BRANCH}" == "master" ]; then
57+
./gradlew artifactoryPublish -x check
58+
fi
59+
notify:
60+
webhooks:
61+
- url: https://webhooks.gitter.im/e/b30a7db820817acfc6d8

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
.idea
33
build
44
.env
5+
springfox-grails-contract-tests/out/
6+
springfox-grails/out/

build.gradle

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
id "net.ltgt.apt" version "0.13"
3-
id 'com.github.ben-manes.versions' version '0.17.0'
2+
id "net.ltgt.apt-idea" version "0.18"
3+
id 'com.github.ben-manes.versions' version '0.20.0'
44
}
55

66
allprojects {
@@ -10,32 +10,34 @@ allprojects {
1010

1111
repositories {
1212
jcenter()
13-
maven { url 'http://oss.jfrog.org/artifactory/oss-snapshot-local/' }
13+
// maven { url 'http://oss.jfrog.org/artifactory/oss-snapshot-local/' }
1414
mavenCentral()
1515
}
1616

1717
ext {
18-
byteBuddyVersion = "1.7.9"
18+
byteBuddyVersion = "1.8.17"
1919
cglib = "3.2.4"
20-
classmate = "1.3.4"
21-
groovy = "2.4.8"
20+
classmate = "1.4.0"
21+
groovy = "2.5.0"
2222
guava = "20.0"
2323
grails = "3.2.4"
24+
htmlUnit = "2.29"
2425
jackson = '2.7.7'
2526
joda = "2.9.4"
2627
jsonPath = "2.4.0"
2728
jsonAssert = "1.5.0"
2829
mockito = "1.10.19"
2930
objenesis = "2.4"
30-
servlet = "3.1.0"
31+
restAssured = '3.0.6'
32+
servlet = "4.0.1"
3133
slf4j = "1.7.22"
3234
snakeyaml = '1.19'
3335
spock = "1.1-groovy-2.4"
34-
spring = "4.2.8.RELEASE"
36+
spring = "4.2.13.RELEASE"
3537
springHateoas = "0.21.0.RELEASE"
3638
springPluginVersion = "1.2.0.RELEASE"
37-
swagger2Core = "1.5.12"
38-
springBoot = "1.5.9.RELEASE"
39-
springfox = "2.7.0"
39+
swagger2Core = "1.5.20"
40+
springBoot = "1.5.15.RELEASE"
41+
springfox = "2.9.2"
4042
}
4143
}

circle.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

springfox-grails-contract-tests/build.gradle

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,15 @@ dependencies {
6868
testCompile "org.grails:grails-plugin-testing"
6969
testCompile "org.grails.plugins:geb"
7070
testCompile "org.grails:grails-datastore-rest-client"
71-
testCompile 'io.rest-assured:rest-assured:3.0.6'
72-
testCompile 'io.rest-assured:json-path:3.0.6'
71+
72+
testCompile "io.rest-assured:rest-assured:$restAssured"
73+
testCompile "io.rest-assured:json-path:$restAssured"
74+
7375
testRuntime "org.seleniumhq.selenium:selenium-htmlunit-driver:2.52.0"
74-
testRuntime "net.sourceforge.htmlunit:htmlunit:2.29"
76+
77+
testRuntime "net.sourceforge.htmlunit:htmlunit:$htmlUnit"
7578
testCompile "org.skyscreamer:jsonassert:${jsonAssert}"
7679
}
80+
springBoot {
81+
mainClass = 'grails.springfox.sample.Application'
82+
}

0 commit comments

Comments
 (0)