Skip to content

Commit

Permalink
prep for release (#79)
Browse files Browse the repository at this point in the history
1. relax checkstyle a bit
2. remove -SNAPSHOT
3. upgrade truth
4. fix metadata
  • Loading branch information
lesv authored Aug 16, 2017
1 parent 1051261 commit 245f002
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 7 deletions.
2 changes: 1 addition & 1 deletion checkstyle-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ limitations under the License.

<groupId>com.google.cloud.samples</groupId>
<artifactId>checkstyle-configuration</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.2</version>
<packaging>jar</packaging>

<name>${project.groupId}:${project.artifactId}</name>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ limitations under the License.

<groupId>com.google.cloud.samples</groupId>
<artifactId>shared-configuration</artifactId>
<version>1.0.6-SNAPSHOT</version>
<version>1.0.6</version>
<packaging>pom</packaging>

<name>${project.groupId}:${project.artifactId}</name>
Expand Down Expand Up @@ -217,7 +217,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.samples</groupId>
<artifactId>checkstyle-configuration</artifactId>
<version>1.0.1</version>
<version>1.0.2</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ limitations under the License.
<parent>
<artifactId>shared-configuration</artifactId>
<groupId>com.google.cloud.samples</groupId>
<version>1.0.6-SNAPSHOT</version>
<version>1.0.6</version>
<relativePath>..</relativePath>
</parent>

Expand All @@ -46,7 +46,7 @@ limitations under the License.
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>0.30</version>
<version>0.34</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
41 changes: 41 additions & 0 deletions testing-images/getting-started-java/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Copyright 2017 Google Inc.
#
# 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.

FROM ubuntu:artful

RUN apt-get update \
&& apt-get upgrade -y\
&& apt-get install -y \
software-properties-common \
curl \
git \
openssl \
openjdk-8-jdk \
maven \
gradle \
python \
python3.6 \
python3.6-dev \
&& apt-get clean

RUN curl https://sdk.cloud.google.com > cloudsdk.sh \
&& chmod +x cloudsdk.sh \
&& ./cloudsdk.sh --disable-prompts --install-dir=/ \
&& export PATH=/google-cloud-sdk/bin:$PATH \
&& gcloud components install --quiet \
app-engine-java \
cbt \
kubectl \
alpha \
beta
4 changes: 2 additions & 2 deletions third_party/checkstyle/METADATA
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ third_party {
type: GIT
value: "https://github.com/checkstyle/checkstyle"
}
version: "8.0"
last_upgrade_date { year: 2017 month: 7 day: 24 }
version: "8.0.1"
last_upgrade_date { year: 2017 month: 8 day: 10 }
local_modifications: "SuppressWarningsFilter & SuppressionCommentFilter"
}
8 changes: 8 additions & 0 deletions third_party/checkstyle/google_checks.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,15 @@
<property name="eachLine" value="true"/>
</module>

<module name="SuppressWarningsFilter" />

<module name="TreeWalker">
<!-- Allow silencing rules with annotations http://stackoverflow.com/a/22556386/101923 -->
<!-- Make the @SuppressWarnings annotations available to Checkstyle -->
<!-- Allow silencing with comment http://stackoverflow.com/questions/4023185 -->
<module name="SuppressWarningsHolder" /> <!-- Java DPE's -->
<module name="SuppressionCommentFilter" />

<module name="OuterTypeFilename"/>
<module name="IllegalTokenText">
<property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
Expand Down

0 comments on commit 245f002

Please sign in to comment.