Skip to content

Commit b9563fe

Browse files
authored
Fix retrieving AWS credentials from gradle.properties (#45)
* Fix retrieving AWS credentials from gradle.properties * Fix artifact bucket location * Update gradle wrapper, plugins and dependencies * Add example of how to depend on client project
1 parent c15a31e commit b9563fe

File tree

6 files changed

+44
-11
lines changed

6 files changed

+44
-11
lines changed

build.gradle

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ plugins {
77
}
88

99
ext {
10-
awsAccessKeyId = hasProperty('AWS_ACCESS_KEY_ID') ? AWS_ACCESS_KEY_ID : System.getenv('AWS_ACCESS_KEY_ID')
11-
awsSecretAccessKey = hasProperty('AWS_SECRET_ACCESS_KEY') ? AWS_SECRET_ACCESS_KEY : System.getenv('AWS_SECRET_ACCESS_KEY')
10+
awsAccessKeyId = properties.containsKey('AWS_ACCESS_KEY_ID') ? AWS_ACCESS_KEY_ID : System.getenv('AWS_ACCESS_KEY_ID')
11+
awsSecretAccessKey = properties.containsKey('AWS_SECRET_ACCESS_KEY') ? AWS_SECRET_ACCESS_KEY : System.getenv('AWS_SECRET_ACCESS_KEY')
1212
}
1313

1414
travisVersioner {
@@ -32,7 +32,7 @@ allprojects {
3232
mavenCentral()
3333
jcenter()
3434
maven {
35-
url "s3://artifact.bravenewcoin.com.s3-website-us-west-2.amazonaws.com/maven/release"
35+
url "s3://artifact.bravenewcoin.com/maven/release"
3636
credentials(AwsCredentials) {
3737
accessKey "${awsAccessKeyId}"
3838
secretKey "${awsSecretAccessKey}"
@@ -55,7 +55,7 @@ allprojects {
5555
}
5656

5757
checkstyle {
58-
toolVersion '8.19'
58+
toolVersion '8.20'
5959
tasks.withType(Checkstyle) {
6060
reports {
6161
xml.enabled false
@@ -72,11 +72,11 @@ allprojects {
7272
}
7373

7474
dependencies {
75-
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: '5.4.1'
75+
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: '5.4.2'
7676
testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.12.2'
77-
testImplementation group: 'org.mockito', name: 'mockito-core', version: '2.26.0'
78-
testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '2.26.0'
79-
testRuntime group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.4.1'
77+
testImplementation group: 'org.mockito', name: 'mockito-core', version: '2.27.0'
78+
testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '2.27.0'
79+
testRuntime group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.4.2'
8080
}
8181
}
8282

gradle/wrapper/gradle-wrapper.jar

-561 Bytes
Binary file not shown.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

+17-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
#!/usr/bin/env sh
22

3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
319
##############################################################################
420
##
521
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
2844
APP_BASE_NAME=`basename "$0"`
2945

3046
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS=""
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
3248

3349
# Use the maximum available, or set MAX_FD != -1 to use that value.
3450
MAX_FD="maximum"

gradlew.bat

+17-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem http://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
117
@if "%DEBUG%" == "" @echo off
218
@rem ##########################################################################
319
@rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
1430
set APP_HOME=%DIRNAME%
1531

1632
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17-
set DEFAULT_JVM_OPTS=
33+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
1834

1935
@rem Find java.exe
2036
if defined JAVA_HOME goto findJavaFromJavaHome

service/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ dependencyManagement {
4343
}
4444

4545
dependencies {
46+
implementation project(':client')
4647
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web'
4748
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-actuator'
4849
implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-sleuth'

0 commit comments

Comments
 (0)