Skip to content

Commit 6f75c08

Browse files
adservice - openjdk:18 + gradle-7.5.1 (GoogleCloudPlatform#1007)
* Update Dockerfile * JavaVersion.VERSION_17 * gradle-7.5.1 * configurations.compileClasspath * openjdk:18-slim * JavaVersion.VERSION_18
1 parent 97a3f74 commit 6f75c08

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/adservice/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM openjdk:8-slim as builder
15+
FROM openjdk:18-slim as builder
1616

1717
WORKDIR /app
1818

@@ -25,7 +25,7 @@ COPY . .
2525
RUN chmod +x gradlew
2626
RUN ./gradlew installDist
2727

28-
FROM openjdk:8-slim
28+
FROM openjdk:18-slim
2929

3030
# Download Stackdriver Profiler Java agent
3131
RUN apt-get -y update && apt-get install -qqy \

src/adservice/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ def jacksonVersion = "2.13.3"
2020
def protocVersion = "3.21.5"
2121

2222
tasks.withType(JavaCompile) {
23-
sourceCompatibility = JavaVersion.VERSION_1_8
24-
targetCompatibility = JavaVersion.VERSION_1_8
23+
sourceCompatibility = JavaVersion.VERSION_18
24+
targetCompatibility = JavaVersion.VERSION_18
2525
}
2626

2727
ext {
@@ -93,9 +93,9 @@ startScripts.enabled = false
9393
// This to cache dependencies during Docker image building. First build will take time.
9494
// Subsequent build will be incremental.
9595
task downloadRepos(type: Copy) {
96-
from configurations.compile
96+
from configurations.compileClasspath
9797
into offlineCompile
98-
from configurations.runtime
98+
from configurations.compileClasspath
9999
into offlineCompile
100100
}
101101

Lines changed: 1 addition & 1 deletion
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-6.9.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)