Skip to content

Commit b0fda6e

Browse files
dpebotdpebot
authored
Merge pull request GoogleCloudPlatform#300 from GoogleCloudPlatform/tswast-plugins
2 parents 1a4a5d7 + a1561a4 commit b0fda6e

File tree

29 files changed

+573
-367
lines changed

29 files changed

+573
-367
lines changed

‎appengine/analytics/pom.xml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@
2727
<relativePath>../..</relativePath>
2828
</parent>
2929
<!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
30+
31+
<properties>
32+
<maven.compiler.target>1.7</maven.compiler.target>
33+
<maven.compiler.source>1.7</maven.compiler.source>
34+
</properties>
35+
3036
<dependencies>
3137
<dependency>
3238
<groupId>com.google.appengine</groupId>
@@ -55,15 +61,6 @@
5561
<artifactId>appengine-maven-plugin</artifactId>
5662
<version>${appengine.sdk.version}</version>
5763
</plugin>
58-
<plugin>
59-
<groupId>org.apache.maven.plugins</groupId>
60-
<version>3.3</version>
61-
<artifactId>maven-compiler-plugin</artifactId>
62-
<configuration>
63-
<source>1.7</source>
64-
<target>1.7</target>
65-
</configuration>
66-
</plugin>
6764
</plugins>
6865
</build>
6966
</project>

‎appengine/appidentity/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
<relativePath>../..</relativePath>
2828
</parent>
2929

30+
<properties>
31+
<gcloud-maven-plugin-version>2.0.9.101.v20160316</gcloud-maven-plugin-version>
32+
</properties>
33+
3034
<dependencies>
3135
<dependency>
3236
<groupId>com.google.appengine</groupId>
@@ -96,7 +100,7 @@
96100
<plugin>
97101
<groupId>com.google.appengine</groupId>
98102
<artifactId>gcloud-maven-plugin</artifactId>
99-
<version>2.0.9.101.v20160316</version>
103+
<version>${gcloud-maven-plugin-version}</version>
100104
</plugin>
101105
</plugins>
102106
</build>

‎compute/error-reporting/pom.xml

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<!--
2-
Copyright 2016 Google Inc. All Rights Reserved.
2+
Copyright 2016 Google Inc. All Rights Reserved.
33
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
77
88
http://www.apache.org/licenses/LICENSE-2.0
99
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
1515
-->
1616
<project>
1717
<modelVersion>4.0.0</modelVersion>
@@ -20,6 +20,22 @@ Copyright 2016 Google Inc. All Rights Reserved.
2020
<groupId>com.example.compute</groupId>
2121
<artifactId>compute-error-reporting</artifactId>
2222

23+
<!-- TODO: Use common parent after fixing checkstyle errors.
24+
https://github.com/GoogleCloudPlatform/java-docs-samples/issues/298
25+
<parent>
26+
<artifactId>doc-samples</artifactId>
27+
<groupId>com.google.cloud</groupId>
28+
<version>1.0.0</version>
29+
<relativePath>../..</relativePath>
30+
</parent>
31+
-->
32+
33+
<properties>
34+
<maven.compiler.target>1.8</maven.compiler.target>
35+
<maven.compiler.source>1.8</maven.compiler.source>
36+
<maven-assembly-plugin-version>2.6</maven-assembly-plugin-version>
37+
</properties>
38+
2339
<dependencies>
2440
<!-- [START dependencies] -->
2541
<dependency>
@@ -33,6 +49,7 @@ Copyright 2016 Google Inc. All Rights Reserved.
3349
<plugins>
3450
<plugin>
3551
<artifactId>maven-assembly-plugin</artifactId>
52+
<version>${maven-assembly-plugin-version}</version>
3653
<executions>
3754
<execution>
3855
<phase>package</phase>
@@ -52,15 +69,6 @@ Copyright 2016 Google Inc. All Rights Reserved.
5269
</descriptorRefs>
5370
</configuration>
5471
</plugin>
55-
<plugin>
56-
<groupId>org.apache.maven.plugins</groupId>
57-
<version>3.3</version>
58-
<artifactId>maven-compiler-plugin</artifactId>
59-
<configuration>
60-
<source>1.8</source>
61-
<target>1.8</target>
62-
</configuration>
63-
</plugin>
6472
</plugins>
6573
</build>
6674
</project>

‎compute/sendgrid/pom.xml

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<!--
2-
Copyright 2016 Google Inc. All Rights Reserved.
2+
Copyright 2016 Google Inc. All Rights Reserved.
33
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
77
88
http://www.apache.org/licenses/LICENSE-2.0
99
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
1515
-->
1616
<project>
1717
<modelVersion>4.0.0</modelVersion>
@@ -20,6 +20,22 @@ Copyright 2016 Google Inc. All Rights Reserved.
2020
<groupId>com.example.compute</groupId>
2121
<artifactId>compute-sendgrid</artifactId>
2222

23+
<!-- TODO: Use common parent after fixing checkstyle errors.
24+
https://github.com/GoogleCloudPlatform/java-docs-samples/issues/298
25+
<parent>
26+
<artifactId>doc-samples</artifactId>
27+
<groupId>com.google.cloud</groupId>
28+
<version>1.0.0</version>
29+
<relativePath>../..</relativePath>
30+
</parent>
31+
-->
32+
33+
<properties>
34+
<maven.compiler.target>1.8</maven.compiler.target>
35+
<maven.compiler.source>1.8</maven.compiler.source>
36+
<maven-assembly-plugin-version>2.6</maven-assembly-plugin-version>
37+
</properties>
38+
2339
<dependencies>
2440
<!-- [START dependencies] -->
2541
<dependency>
@@ -33,6 +49,7 @@ Copyright 2016 Google Inc. All Rights Reserved.
3349
<plugins>
3450
<plugin>
3551
<artifactId>maven-assembly-plugin</artifactId>
52+
<version>${maven-assembly-plugin-version}</version>
3653
<executions>
3754
<execution>
3855
<phase>package</phase>
@@ -52,15 +69,6 @@ Copyright 2016 Google Inc. All Rights Reserved.
5269
</descriptorRefs>
5370
</configuration>
5471
</plugin>
55-
<plugin>
56-
<groupId>org.apache.maven.plugins</groupId>
57-
<version>3.3</version>
58-
<artifactId>maven-compiler-plugin</artifactId>
59-
<configuration>
60-
<source>1.8</source>
61-
<target>1.8</target>
62-
</configuration>
63-
</plugin>
6472
</plugins>
6573
</build>
6674
</project>

‎java-repo-tools/pom.xml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,16 @@ limitations under the License.
2424
<properties>
2525
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2626
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
27+
<codehaus-versions-maven-plugin-version>2.2</codehaus-versions-maven-plugin-version>
28+
<jacoco-maven-plugin-version>0.7.6.201602180812</jacoco-maven-plugin-version>
29+
<maven-clean-plugin-version>3.0.0</maven-clean-plugin-version>
30+
<maven-checkstyle-plugin-version>2.17</maven-checkstyle-plugin-version>
31+
<maven-deploy-plugin-version>2.8.2</maven-deploy-plugin-version>
32+
<maven-failsafe-plugin-version>2.19.1</maven-failsafe-plugin-version>
33+
<maven-install-plugin-version>2.5.2</maven-install-plugin-version>
34+
<maven-resources-plugin-version>2.7</maven-resources-plugin-version>
35+
<maven-site-plugin-version>3.5.1</maven-site-plugin-version>
36+
<maven-surefire-plugin-version>2.19.1</maven-surefire-plugin-version>
2737
</properties>
2838

2939
<prerequisites>
@@ -40,7 +50,7 @@ limitations under the License.
4050
<!-- Unit tests -->
4151
<groupId>org.apache.maven.plugins</groupId>
4252
<artifactId>maven-surefire-plugin</artifactId>
43-
<version>2.19.1</version>
53+
<version>${maven-surefire-plugin-version}</version>
4454
<configuration>
4555
<trimStackTrace>false</trimStackTrace>
4656
</configuration>
@@ -49,7 +59,7 @@ limitations under the License.
4959
<!-- Integration / system tests -->
5060
<groupId>org.apache.maven.plugins</groupId>
5161
<artifactId>maven-failsafe-plugin</artifactId>
52-
<version>2.19.1</version>
62+
<version>${maven-failsafe-plugin-version}</version>
5363
<executions>
5464
<execution>
5565
<goals>
@@ -62,7 +72,7 @@ limitations under the License.
6272
<plugin>
6373
<groupId>org.apache.maven.plugins</groupId>
6474
<artifactId>maven-checkstyle-plugin</artifactId>
65-
<version>2.17</version>
75+
<version>${maven-checkstyle-plugin-version}</version>
6676
<configuration>
6777
<configLocation>google-checks.xml</configLocation>
6878
<consoleOutput>true</consoleOutput>
@@ -78,12 +88,12 @@ limitations under the License.
7888
<plugin>
7989
<groupId>org.codehaus.mojo</groupId>
8090
<artifactId>versions-maven-plugin</artifactId>
81-
<version>2.2</version>
91+
<version>${codehaus-versions-maven-plugin-version}</version>
8292
</plugin>
8393
<plugin>
8494
<groupId>org.jacoco</groupId>
8595
<artifactId>jacoco-maven-plugin</artifactId>
86-
<version>0.7.6.201602180812</version>
96+
<version>${jacoco-maven-plugin-version}</version>
8797
<executions>
8898
<execution>
8999
<goals>

‎managed_vms/analytics/pom.xml

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<!--
2+
Copyright 2016 Google Inc. All Rights Reserved.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
-->
16+
<project>
417
<modelVersion>4.0.0</modelVersion>
518
<packaging>war</packaging>
619
<version>1.0-SNAPSHOT</version>
@@ -14,6 +27,14 @@
1427
<relativePath>../..</relativePath>
1528
</parent>
1629

30+
<properties>
31+
<maven.compiler.target>1.8</maven.compiler.target>
32+
<maven.compiler.source>1.8</maven.compiler.source>
33+
<maven-war-plugin-version>2.6</maven-war-plugin-version>
34+
<gcloud-maven-plugin-version>2.0.9.106.v20160420</gcloud-maven-plugin-version>
35+
<jetty-maven-plugin-version>9.3.7.v20160115</jetty-maven-plugin-version>
36+
</properties>
37+
1738
<dependencies>
1839
<dependency>
1940
<groupId>org.apache.httpcomponents</groupId>
@@ -35,29 +56,20 @@
3556
<plugin>
3657
<groupId>com.google.appengine</groupId>
3758
<artifactId>gcloud-maven-plugin</artifactId>
38-
<version>2.0.9.106.v20160420</version>
59+
<version>${gcloud-maven-plugin-version}</version>
3960
</plugin>
4061
<plugin>
4162
<groupId>org.apache.maven.plugins</groupId>
4263
<artifactId>maven-war-plugin</artifactId>
43-
<version>2.6</version>
64+
<version>${maven-war-plugin-version}</version>
4465
<configuration>
4566
<failOnMissingWebXml>false</failOnMissingWebXml>
4667
</configuration>
4768
</plugin>
48-
<plugin>
49-
<groupId>org.apache.maven.plugins</groupId>
50-
<version>3.3</version>
51-
<artifactId>maven-compiler-plugin</artifactId>
52-
<configuration>
53-
<source>1.8</source>
54-
<target>1.8</target>
55-
</configuration>
56-
</plugin>
5769
<plugin>
5870
<groupId>org.eclipse.jetty</groupId>
5971
<artifactId>jetty-maven-plugin</artifactId>
60-
<version>9.3.7.v20160115</version>
72+
<version>${jetty-maven-plugin-version}</version>
6173
</plugin>
6274
</plugins>
6375
</build>

0 commit comments

Comments
 (0)