Skip to content

Commit 9b463c0

Browse files
glasntglasnt
authored
fixit: remove redundant region tags (GoogleCloudPlatform#9316)
1 parent 827486a commit 9b463c0

File tree

10 files changed

+2
-30
lines changed

10 files changed

+2
-30
lines changed

‎run/hello-broken/pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,14 @@ limitations under the License.
2525
<artifactId>shared-configuration</artifactId>
2626
<version>1.2.0</version>
2727
</parent>
28-
28+
2929
<properties>
3030
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3131
<maven.compiler.target>11</maven.compiler.target>
3232
<maven.compiler.source>11</maven.compiler.source>
3333
</properties>
3434
<dependencies>
3535
<!-- [START cloudrun_broken_service_dep] -->
36-
<!-- [START run_broken_service_dep] -->
3736
<dependency>
3837
<groupId>com.sparkjava</groupId>
3938
<artifactId>spark-core</artifactId>
@@ -49,7 +48,6 @@ limitations under the License.
4948
<artifactId>slf4j-simple</artifactId>
5049
<version>2.0.12</version>
5150
</dependency>
52-
<!-- [END run_broken_service_dep] -->
5351
<!-- [END cloudrun_broken_service_dep] -->
5452
<dependency>
5553
<groupId>junit</groupId>
@@ -65,11 +63,9 @@ limitations under the License.
6563
</dependency>
6664
</dependencies>
6765
<!-- [START cloudrun_broken_service_build] -->
68-
<!-- [START run_broken_service_build] -->
6966
<build>
7067
<plugins>
7168
<!-- [START cloudrun_broken_service_jib] -->
72-
<!-- [START run_broken_service_jib] -->
7369
<plugin>
7470
<groupId>com.google.cloud.tools</groupId>
7571
<artifactId>jib-maven-plugin</artifactId>
@@ -80,10 +76,8 @@ limitations under the License.
8076
</to>
8177
</configuration>
8278
</plugin>
83-
<!-- [END run_broken_service_jib] -->
8479
<!-- [END cloudrun_broken_service_jib] -->
8580
</plugins>
8681
</build>
87-
<!-- [END run_broken_service_build] -->
8882
<!-- [END cloudrun_broken_service_build] -->
8983
</project>

‎run/helloworld/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
# limitations under the License.
1414

1515
# [START cloudrun_helloworld_dockerfile]
16-
# [START run_helloworld_dockerfile]
1716
# Use the official maven image to create a build artifact.
1817
# https://hub.docker.com/_/maven
1918
FROM maven:3-eclipse-temurin-17-alpine as builder
@@ -36,5 +35,4 @@ COPY --from=builder /app/target/helloworld-*.jar /helloworld.jar
3635
# Run the web service on container startup.
3736
CMD ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/helloworld.jar"]
3837

39-
# [END run_helloworld_dockerfile]
4038
# [END cloudrun_helloworld_dockerfile]

‎run/helloworld/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ limitations under the License.
8181
</executions>
8282
</plugin>
8383
<!-- [START cloudrun_helloworld_jib] -->
84-
<!-- [START run_helloworld_jib] -->
8584
<plugin>
8685
<groupId>com.google.cloud.tools</groupId>
8786
<artifactId>jib-maven-plugin</artifactId>
@@ -92,7 +91,6 @@ limitations under the License.
9291
</to>
9392
</configuration>
9493
</plugin>
95-
<!-- [END run_helloworld_jib] -->
9694
<!-- [END cloudrun_helloworld_jib] -->
9795
</plugins>
9896
</build>

‎run/helloworld/src/main/resources/application.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,5 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
# [START cloudrun_helloworld_properties]
15-
# [START run_helloworld_properties]
1615
server.port=${PORT:8080}
17-
# [END run_helloworld_properties]
1816
# [END cloudrun_helloworld_properties]

‎run/image-processing/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
# limitations under the License.
1414

1515
# [START cloudrun_imageproc_dockerfile]
16-
# [START run_imageproc_dockerfile]
1716
# Use eclipse-temurin for base image.
1817
# It's important to use JDK 8u191 or above that has container support enabled.
1918
# https://hub.docker.com/_/eclipse-temurin/
@@ -27,5 +26,4 @@ RUN set -ex; \
2726
apt-get -y update; \
2827
apt-get -y install imagemagick; \
2928
rm -rf /var/lib/apt/lists/*
30-
# [END run_imageproc_dockerfile]
3129
# [END cloudrun_imageproc_dockerfile]

‎run/image-processing/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,13 @@ limitations under the License.
4141
<scope>import</scope>
4242
</dependency>
4343
<!-- [START cloudrun_imageproc_dep_management] -->
44-
<!-- [START run_imageproc_dep_management] -->
4544
<dependency>
4645
<groupId>com.google.cloud</groupId>
4746
<artifactId>spring-cloud-gcp-dependencies</artifactId>
4847
<version>4.9.2</version>
4948
<type>pom</type>
5049
<scope>import</scope>
5150
</dependency>
52-
<!-- [END run_imageproc_dep_management] -->
5351
<!-- [END cloudrun_imageproc_dep_management] -->
5452
</dependencies>
5553
</dependencyManagement>
@@ -69,7 +67,6 @@ limitations under the License.
6967
<scope>test</scope>
7068
</dependency>
7169
<!-- [START cloudrun_imageproc_dep] -->
72-
<!-- [START run_imageproc_dep] -->
7370
<dependency>
7471
<groupId>com.google.code.gson</groupId>
7572
<artifactId>gson</artifactId>
@@ -83,7 +80,6 @@ limitations under the License.
8380
<groupId>com.google.cloud</groupId>
8481
<artifactId>spring-cloud-gcp-starter-storage</artifactId>
8582
</dependency>
86-
<!-- [END run_imageproc_dep] -->
8783
<!-- [END cloudrun_imageproc_dep] -->
8884
<dependency>
8985
<groupId>junit</groupId>
@@ -99,7 +95,6 @@ limitations under the License.
9995
<version>${spring-boot.version}</version>
10096
</plugin>
10197
<!-- [START cloudrun_imageproc_jib] -->
102-
<!-- [START run_imageproc_jib] -->
10398
<plugin>
10499
<groupId>com.google.cloud.tools</groupId>
105100
<artifactId>jib-maven-plugin</artifactId>
@@ -113,7 +108,6 @@ limitations under the License.
113108
</to>
114109
</configuration>
115110
</plugin>
116-
<!-- [END run_imageproc_jib] -->
117111
<!-- [END cloudrun_imageproc_jib] -->
118112
</plugins>
119113
</build>

‎run/logging-manual/src/main/resources/logback.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!-- [START cloudrun_manual_logging_logback] -->
3-
<!-- [START run_manual_logging_logback] -->
43
<configuration>
54
<appender name="jsonConsoleAppender" class="ch.qos.logback.core.ConsoleAppender">
65
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
@@ -19,5 +18,4 @@
1918
<appender-ref ref="jsonConsoleAppender"/>
2019
</root>
2120
</configuration>
22-
<!-- [END run_manual_logging_logback] -->
2321
<!-- [END cloudrun_manual_logging_logback] -->

‎run/pubsub/pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ limitations under the License.
8686
<version>${spring-boot.version}</version>
8787
</plugin>
8888
<!-- [START cloudrun_pubsub_jib] -->
89-
<!-- [START run_pubsub_jib] -->
9089
<plugin>
9190
<groupId>com.google.cloud.tools</groupId>
9291
<artifactId>jib-maven-plugin</artifactId>
@@ -97,8 +96,7 @@ limitations under the License.
9796
</to>
9897
</configuration>
9998
</plugin>
100-
<!-- [END run_pubsub_jib] -->
10199
<!-- [END cloudrun_pubsub_jib] -->
102100
</plugins>
103101
</build>
104-
</project>
102+
</project>

‎run/system-package/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@
1313
# limitations under the License.
1414

1515
# [START cloudrun_system_package_dockerfile]
16-
# [START run_system_package_dockerfile]
1716
# Use the Official eclipse-temurin image for a lean production stage of our multi-stage build.
1817
# https://hub.docker.com/_/eclipse-temurin/
1918
FROM eclipse-temurin:17.0.10_7-jre
2019

2120
RUN apt-get update -y && apt-get install -y \
2221
graphviz \
2322
&& apt-get clean
24-
# [END run_system_package_dockerfile]
2523
# [END cloudrun_system_package_dockerfile]

‎run/system-package/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ limitations under the License.
6767
</configuration>
6868
</plugin>
6969
<!-- [START cloudrun_system_package_jib] -->
70-
<!-- [START run_system_package_jib] -->
7170
<plugin>
7271
<groupId>com.google.cloud.tools</groupId>
7372
<artifactId>jib-maven-plugin</artifactId>
@@ -81,7 +80,6 @@ limitations under the License.
8180
</to>
8281
</configuration>
8382
</plugin>
84-
<!-- [END run_system_package_jib] -->
8583
<!-- [END cloudrun_system_package_jib] -->
8684
</plugins>
8785
</build>

0 commit comments

Comments
 (0)