Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move plugin version definitions to properties. #300

Merged
merged 2 commits into from
Aug 16, 2016
Merged

Move plugin version definitions to properties. #300

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3092446
Move plugin version definitions to properties.
tswast Aug 16, 2016
a1561a4
Update compiler targets.
tswast Aug 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions appengine/analytics/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@
<relativePath>../..</relativePath>
</parent>
<!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->

<properties>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
</properties>

<dependencies>
<dependency>
<groupId>com.google.appengine</groupId>
Expand Down Expand Up @@ -55,15 +61,6 @@
<artifactId>appengine-maven-plugin</artifactId>
<version>${appengine.sdk.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<version>3.3</version>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
6 changes: 5 additions & 1 deletion appengine/appidentity/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
<relativePath>../..</relativePath>
</parent>

<properties>
<gcloud-maven-plugin-version>2.0.9.101.v20160316</gcloud-maven-plugin-version>
</properties>

<dependencies>
<dependency>
<groupId>com.google.appengine</groupId>
Expand Down Expand Up @@ -96,7 +100,7 @@
<plugin>
<groupId>com.google.appengine</groupId>
<artifactId>gcloud-maven-plugin</artifactId>
<version>2.0.9.101.v20160316</version>
<version>${gcloud-maven-plugin-version}</version>
</plugin>
</plugins>
</build>
Expand Down
44 changes: 26 additions & 18 deletions compute/error-reporting/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<!--
Copyright 2016 Google Inc. All Rights Reserved.
Copyright 2016 Google Inc. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -20,6 +20,22 @@ Copyright 2016 Google Inc. All Rights Reserved.
<groupId>com.example.compute</groupId>
<artifactId>compute-error-reporting</artifactId>

<!-- TODO: Use common parent after fixing checkstyle errors.
https://github.com/GoogleCloudPlatform/java-docs-samples/issues/298
<parent>
<artifactId>doc-samples</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
</parent>
-->

<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven-assembly-plugin-version>2.6</maven-assembly-plugin-version>
</properties>

<dependencies>
<!-- [START dependencies] -->
<dependency>
Expand All @@ -33,6 +49,7 @@ Copyright 2016 Google Inc. All Rights Reserved.
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven-assembly-plugin-version}</version>
<executions>
<execution>
<phase>package</phase>
Expand All @@ -52,15 +69,6 @@ Copyright 2016 Google Inc. All Rights Reserved.
</descriptorRefs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<version>3.3</version>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
44 changes: 26 additions & 18 deletions compute/sendgrid/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<!--
Copyright 2016 Google Inc. All Rights Reserved.
Copyright 2016 Google Inc. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -20,6 +20,22 @@ Copyright 2016 Google Inc. All Rights Reserved.
<groupId>com.example.compute</groupId>
<artifactId>compute-sendgrid</artifactId>

<!-- TODO: Use common parent after fixing checkstyle errors.
https://github.com/GoogleCloudPlatform/java-docs-samples/issues/298
<parent>
<artifactId>doc-samples</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
</parent>
-->

<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven-assembly-plugin-version>2.6</maven-assembly-plugin-version>
</properties>

<dependencies>
<!-- [START dependencies] -->
<dependency>
Expand All @@ -33,6 +49,7 @@ Copyright 2016 Google Inc. All Rights Reserved.
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven-assembly-plugin-version}</version>
<executions>
<execution>
<phase>package</phase>
Expand All @@ -52,15 +69,6 @@ Copyright 2016 Google Inc. All Rights Reserved.
</descriptorRefs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<version>3.3</version>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
20 changes: 15 additions & 5 deletions java-repo-tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,16 @@ limitations under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<codehaus-versions-maven-plugin-version>2.2</codehaus-versions-maven-plugin-version>
<jacoco-maven-plugin-version>0.7.6.201602180812</jacoco-maven-plugin-version>
<maven-clean-plugin-version>3.0.0</maven-clean-plugin-version>
<maven-checkstyle-plugin-version>2.17</maven-checkstyle-plugin-version>
<maven-deploy-plugin-version>2.8.2</maven-deploy-plugin-version>
<maven-failsafe-plugin-version>2.19.1</maven-failsafe-plugin-version>
<maven-install-plugin-version>2.5.2</maven-install-plugin-version>
<maven-resources-plugin-version>2.7</maven-resources-plugin-version>
<maven-site-plugin-version>3.5.1</maven-site-plugin-version>
<maven-surefire-plugin-version>2.19.1</maven-surefire-plugin-version>
</properties>

<prerequisites>
Expand All @@ -40,7 +50,7 @@ limitations under the License.
<!-- Unit tests -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<version>${maven-surefire-plugin-version}</version>
<configuration>
<trimStackTrace>false</trimStackTrace>
</configuration>
Expand All @@ -49,7 +59,7 @@ limitations under the License.
<!-- Integration / system tests -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.19.1</version>
<version>${maven-failsafe-plugin-version}</version>
<executions>
<execution>
<goals>
Expand All @@ -62,7 +72,7 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<version>${maven-checkstyle-plugin-version}</version>
<configuration>
<configLocation>google-checks.xml</configLocation>
<consoleOutput>true</consoleOutput>
Expand All @@ -78,12 +88,12 @@ limitations under the License.
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.2</version>
<version>${codehaus-versions-maven-plugin-version}</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.6.201602180812</version>
<version>${jacoco-maven-plugin-version}</version>
<executions>
<execution>
<goals>
Expand Down
42 changes: 27 additions & 15 deletions managed_vms/analytics/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
Copyright 2016 Google Inc. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project>
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
<version>1.0-SNAPSHOT</version>
Expand All @@ -14,6 +27,14 @@
<relativePath>../..</relativePath>
</parent>

<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven-war-plugin-version>2.6</maven-war-plugin-version>
<gcloud-maven-plugin-version>2.0.9.106.v20160420</gcloud-maven-plugin-version>
<jetty-maven-plugin-version>9.3.7.v20160115</jetty-maven-plugin-version>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand All @@ -35,29 +56,20 @@
<plugin>
<groupId>com.google.appengine</groupId>
<artifactId>gcloud-maven-plugin</artifactId>
<version>2.0.9.106.v20160420</version>
<version>${gcloud-maven-plugin-version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<version>${maven-war-plugin-version}</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<version>3.3</version>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.3.7.v20160115</version>
<version>${jetty-maven-plugin-version}</version>
</plugin>
</plugins>
</build>
Expand Down
Loading