Skip to content

Commit 507ff6f

Browse files
authored
Merge branch 'master' into asm-9.7
2 parents b65d21b + b06b001 commit 507ff6f

File tree

33 files changed

+415
-37
lines changed

33 files changed

+415
-37
lines changed

config/checkstyle/copyright-java.header

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
^/\*$
2-
^ \* Copyright 20(17|18|19|20|21|22|23) Google LLC\.$
2+
^ \* Copyright 20(17|18|19|20|21|22|23|24) Google LLC\.$
33
^ \*$
44
^ \* Licensed under the Apache License, Version 2\.0 \(the "License"\); you may not$
55
^ \* use this file except in compliance with the License\. You may obtain a copy of$

examples/dropwizard/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<dropwizard-template-config.version>1.5.0</dropwizard-template-config.version>
2727

2828
<jib.container.appRoot>/app</jib.container.appRoot>
29-
<jib-maven-plugin.version>3.4.2</jib-maven-plugin.version>
29+
<jib-maven-plugin.version>3.4.3</jib-maven-plugin.version>
3030
</properties>
3131

3232
<dependencyManagement>

examples/helloworld/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id 'java'
3-
id 'com.google.cloud.tools.jib' version '3.4.2'
3+
id 'com.google.cloud.tools.jib' version '3.4.3'
44
}
55

66
sourceCompatibility = 1.8

examples/helloworld/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<properties>
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12-
<jib-maven-plugin.version>3.4.2</jib-maven-plugin.version>
12+
<jib-maven-plugin.version>3.4.3</jib-maven-plugin.version>
1313
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
1414
</properties>
1515

examples/java-agent/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id 'java'
3-
id 'com.google.cloud.tools.jib' version '3.4.2'
3+
id 'com.google.cloud.tools.jib' version '3.4.3'
44
id 'de.undercouch.download' version '4.0.0'
55
id 'com.gorylenko.gradle-git-properties' version '2.2.0'
66
}

examples/java-agent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<properties>
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12-
<jib-maven-plugin.version>3.4.2</jib-maven-plugin.version>
12+
<jib-maven-plugin.version>3.4.3</jib-maven-plugin.version>
1313
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
1414
<download-maven-plugin.version>1.4.2</download-maven-plugin.version>
1515
<git-commit-id-plugin.version>3.0.1</git-commit-id-plugin.version>

examples/ktor/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
application
33
kotlin("jvm") version "1.3.10"
4-
id("com.google.cloud.tools.jib") version "3.4.2"
4+
id("com.google.cloud.tools.jib") version "3.4.3"
55
}
66

77
group = "example"

examples/micronaut/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id "groovy"
33
id "com.github.johnrengelman.shadow" version "5.2.0"
44
id "application"
5-
id 'com.google.cloud.tools.jib' version '3.4.2'
5+
id 'com.google.cloud.tools.jib' version '3.4.3'
66
}
77

88
version "0.1"

examples/multi-module/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
plugins {
33
id 'org.springframework.boot' version '2.0.3.RELEASE' apply false
44
id 'io.spring.dependency-management' version '1.0.6.RELEASE' apply false
5-
id 'com.google.cloud.tools.jib' version '3.4.2' apply false
5+
id 'com.google.cloud.tools.jib' version '3.4.3' apply false
66
}

examples/multi-module/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<plugin>
4242
<groupId>com.google.cloud.tools</groupId>
4343
<artifactId>jib-maven-plugin</artifactId>
44-
<version>3.4.2</version>
44+
<version>3.4.3</version>
4545
</plugin>
4646
</plugins>
4747
</pluginManagement>

0 commit comments

Comments
 (0)