Skip to content

Commit c72649a

Browse files
author
Ace Nassri
authored
Fix region tags (GoogleCloudPlatform#2800)
1 parent baeaac3 commit c72649a

File tree

4 files changed

+44
-9
lines changed

4 files changed

+44
-9
lines changed

functions/helloworld/groovy-helloworld/pom.xml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,35 @@
1616
limitations under the License.
1717
-->
1818

19+
<!-- [START functions_groovy_pom] -->
1920
<project xmlns="http://maven.apache.org/POM/4.0.0"
2021
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2122
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2223
<modelVersion>4.0.0</modelVersion>
2324

2425
<groupId>com.example.cloud.functions</groupId>
2526
<artifactId>functions-groovy-hello-world</artifactId>
26-
27+
28+
<!-- [END functions_groovy_pom] -->
2729
<parent>
2830
<groupId>com.google.cloud.samples</groupId>
2931
<artifactId>shared-configuration</artifactId>
3032
<version>1.0.17</version>
3133
</parent>
32-
34+
35+
<!-- [START functions_groovy_pom] -->
3336
<properties>
37+
<!-- [END functions_groovy_pom] -->
3438
<powermock.version>2.0.7</powermock.version>
39+
<!-- [START functions_groovy_pom] -->
3540
<maven.compiler.target>11</maven.compiler.target>
3641
<maven.compiler.source>11</maven.compiler.source>
3742
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3843
<groovy.version>3.0.3</groovy.version>
3944
</properties>
4045

4146
<dependencies>
47+
<!-- [END functions_groovy_pom] -->
4248
<!-- The following dependencies are only required for testing -->
4349
<dependency>
4450
<groupId>org.mockito</groupId>
@@ -85,6 +91,7 @@
8591
<scope>test</scope>
8692
</dependency>
8793

94+
<!-- [START functions_groovy_pom] -->
8895
<!-- Required for Function primitives -->
8996
<dependency>
9097
<groupId>com.google.cloud.functions</groupId>
@@ -100,6 +107,8 @@
100107
<type>pom</type>
101108
</dependency>
102109
</dependencies>
110+
111+
<!-- [END functions_groovy_pom] -->
103112

104113
<!-- Disable tests during GCF builds (from parent POM) -->
105114
<!-- You can remove this profile to run tests -->
@@ -119,6 +128,7 @@
119128
</profile>
120129
</profiles>
121130

131+
<!-- [START functions_groovy_pom] -->
122132
<build>
123133
<plugins>
124134
<plugin>
@@ -163,6 +173,7 @@
163173
</dependency>
164174
</dependencies>
165175
</plugin>
176+
<!-- [END functions_groovy_pom] -->
166177
<plugin>
167178
<groupId>org.apache.maven.plugins</groupId>
168179
<artifactId>maven-surefire-plugin</artifactId>
@@ -173,6 +184,7 @@
173184
<trimStackTrace>false</trimStackTrace>
174185
</configuration>
175186
</plugin>
187+
<!-- [START functions_groovy_pom] -->
176188
<plugin> <!-- Required for Java 8 (Alpha) functions in the inline editor -->
177189
<groupId>org.apache.maven.plugins</groupId>
178190
<artifactId>maven-compiler-plugin</artifactId>
@@ -201,3 +213,4 @@
201213
</plugins>
202214
</build>
203215
</project>
216+
<!-- [END functions_groovy_pom] -->

functions/helloworld/groovy-helloworld/src/main/groovy/functions/GroovyHelloWorld.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package functions
22

3-
// [START functions_helloworld_get_groovy]
3+
// [START functions_helloworld_get]
44
import com.google.cloud.functions.HttpFunction
55
import com.google.cloud.functions.HttpRequest
66
import com.google.cloud.functions.HttpResponse
@@ -11,4 +11,4 @@ class GroovyHelloWorld implements HttpFunction {
1111
response.writer.write("Hello World!")
1212
}
1313
}
14-
// [END functions_helloworld_get_groovy]
14+
// [END functions_helloworld_get]

functions/helloworld/kotlin-helloworld/pom.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
limitations under the License.
1717
-->
1818

19+
<!-- [START functions_kotlin_pom] -->
1920
<project xmlns="http://maven.apache.org/POM/4.0.0"
2021
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2122
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -24,21 +25,26 @@
2425
<groupId>com.example.cloud.functions</groupId>
2526
<artifactId>functions-kotlin-hello-world</artifactId>
2627

28+
<!-- [END functions_kotlin_pom] -->
2729
<parent>
2830
<groupId>com.google.cloud.samples</groupId>
2931
<artifactId>shared-configuration</artifactId>
3032
<version>1.0.17</version>
3133
</parent>
34+
<!-- [START functions_kotlin_pom] -->
3235

3336
<properties>
37+
<!-- [END functions_kotlin_pom] -->
3438
<powermock.version>2.0.7</powermock.version>
39+
<!-- [START functions_kotlin_pom] -->
3540
<maven.compiler.target>11</maven.compiler.target>
3641
<maven.compiler.source>11</maven.compiler.source>
3742
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3843
<kotlin.version>1.3.72</kotlin.version>
3944
</properties>
4045

4146
<dependencies>
47+
<!-- [END functions_kotlin_pom] -->
4248
<!-- The following dependencies are only required for testing -->
4349
<dependency>
4450
<groupId>org.mockito</groupId>
@@ -84,7 +90,7 @@
8490
<version>${powermock.version}</version>
8591
<scope>test</scope>
8692
</dependency>
87-
93+
<!-- [START functions_kotlin_pom] -->
8894
<!-- Required for Function primitives -->
8995
<dependency>
9096
<groupId>com.google.cloud.functions</groupId>
@@ -104,6 +110,7 @@
104110
</dependency>
105111
</dependencies>
106112

113+
<!-- [END functions_kotlin_pom] -->
107114
<!-- Disable tests during GCF builds (from parent POM) -->
108115
<!-- You can remove this profile to run tests -->
109116
<!-- when deploying, but we recommend creating -->
@@ -122,6 +129,7 @@
122129
</profile>
123130
</profiles>
124131

132+
<!-- [START functions_kotlin_pom] -->
125133
<build>
126134
<plugins>
127135
<plugin>
@@ -171,6 +179,7 @@
171179
<jvmTarget>1.8</jvmTarget>
172180
</configuration>
173181
</plugin>
182+
<!-- [END functions_kotlin_pom] -->
174183
<plugin>
175184
<groupId>org.apache.maven.plugins</groupId>
176185
<artifactId>maven-surefire-plugin</artifactId>
@@ -181,6 +190,7 @@
181190
<trimStackTrace>false</trimStackTrace>
182191
</configuration>
183192
</plugin>
193+
<!-- [START functions_kotlin_pom] -->
184194
<plugin> <!-- Required for Java 8 (Alpha) functions in the inline editor -->
185195
<groupId>org.apache.maven.plugins</groupId>
186196
<artifactId>maven-compiler-plugin</artifactId>
@@ -209,3 +219,4 @@
209219
</plugins>
210220
</build>
211221
</project>
222+
<!-- [END functions_kotlin_pom] -->

functions/helloworld/scala-helloworld/pom.xml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
limitations under the License.
1717
-->
1818

19+
<!-- [START functions_scala_pom] -->
1920
<project xmlns="http://maven.apache.org/POM/4.0.0"
2021
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2122
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -24,14 +25,18 @@
2425
<groupId>com.example.cloud.functions</groupId>
2526
<artifactId>functions-scala-hello-world</artifactId>
2627

28+
<!-- [END functions_scala_pom] -->
2729
<parent>
2830
<groupId>com.google.cloud.samples</groupId>
2931
<artifactId>shared-configuration</artifactId>
3032
<version>1.0.17</version>
3133
</parent>
32-
34+
35+
<!-- [START functions_scala_pom] -->
3336
<properties>
37+
<!-- [END functions_scala_pom] -->
3438
<powermock.version>2.0.7</powermock.version>
39+
<!-- [START functions_scala_pom] -->
3540
<maven.compiler.target>11</maven.compiler.target>
3641
<maven.compiler.source>11</maven.compiler.source>
3742
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -44,7 +49,7 @@
4449
<artifactId>scala-library</artifactId>
4550
<version>2.13.2</version>
4651
</dependency>
47-
52+
<!-- [END functions_scala_pom] -->
4853
<!-- The following dependencies are only required for testing -->
4954
<dependency>
5055
<groupId>org.mockito</groupId>
@@ -90,7 +95,8 @@
9095
<version>${powermock.version}</version>
9196
<scope>test</scope>
9297
</dependency>
93-
98+
<!-- [START functions_scala_pom] -->
99+
94100
<!-- Required for Function primitives -->
95101
<dependency>
96102
<groupId>com.google.cloud.functions</groupId>
@@ -99,6 +105,7 @@
99105
</dependency>
100106
</dependencies>
101107

108+
<!-- [END functions_scala_pom] -->
102109
<!-- Disable tests during GCF builds (from parent POM) -->
103110
<!-- You can remove this profile to run tests -->
104111
<!-- when deploying, but we recommend creating -->
@@ -116,7 +123,8 @@
116123
</properties>
117124
</profile>
118125
</profiles>
119-
126+
127+
<!-- [START functions_scala_pom] -->
120128
<build>
121129
<plugins>
122130
<plugin>
@@ -151,6 +159,7 @@
151159
</execution>
152160
</executions>
153161
</plugin>
162+
<!-- [END functions_scala_pom] -->
154163
<plugin>
155164
<groupId>org.apache.maven.plugins</groupId>
156165
<artifactId>maven-surefire-plugin</artifactId>
@@ -161,6 +170,7 @@
161170
<trimStackTrace>false</trimStackTrace>
162171
</configuration>
163172
</plugin>
173+
<!-- [START functions_scala_pom] -->
164174
<plugin> <!-- Required for Java 8 (Alpha) functions in the inline editor -->
165175
<groupId>org.apache.maven.plugins</groupId>
166176
<artifactId>maven-compiler-plugin</artifactId>
@@ -189,3 +199,4 @@
189199
</plugins>
190200
</build>
191201
</project>
202+
<!-- [END functions_scala_pom] -->

0 commit comments

Comments
 (0)