Skip to content

Commit d1e23ca

Browse files
dpebotlesv
dpebot
authored and
lesv
committed
Auto-update dependencies. (GoogleCloudPlatform#853)
* Auto-update dependencies. * fixup stuff. 1. Bigtable uses 1.1.33.Final 2. Bigtable should use 1.0.0-pre3 3. Try and fix logging 4. remove a bunch of <prerequsites> (which is both required and annoys Maven - the versions plugin is confused, recommends using enforcer, then doesn’t care. 5. update to guava 23.0 where possible. 6. requires ignoring guava-jdk5 7. Storage sample would never compile. 8. add —fail-at-end so we see more of what’s wrong.
1 parent 3415324 commit d1e23ca

File tree

94 files changed

+221
-200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+221
-200
lines changed

‎appengine-java8/analytics/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<properties>
3232
<maven.compiler.target>1.8</maven.compiler.target>
3333
<maven.compiler.source>1.8</maven.compiler.source>
34-
<appengine.sdk.version>1.9.54</appengine.sdk.version>
34+
<appengine.sdk.version>1.9.56</appengine.sdk.version>
3535
</properties>
3636

3737
<dependencies>
@@ -85,7 +85,7 @@
8585
<dependency>
8686
<groupId>org.mockito</groupId>
8787
<artifactId>mockito-core</artifactId>
88-
<version>2.8.47</version>
88+
<version>2.10.0</version>
8989
<scope>test</scope>
9090
</dependency>
9191
<dependency>
@@ -96,7 +96,7 @@
9696
<dependency>
9797
<groupId>com.google.truth</groupId>
9898
<artifactId>truth</artifactId>
99-
<version>0.34</version>
99+
<version>0.35</version>
100100
<scope>test</scope>
101101
</dependency>
102102
</dependencies>

‎appengine-java8/appidentity/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<properties>
3131
<maven.compiler.target>1.8</maven.compiler.target>
3232
<maven.compiler.source>1.8</maven.compiler.source>
33-
<appengine.sdk.version>1.9.54</appengine.sdk.version>
33+
<appengine.sdk.version>1.9.56</appengine.sdk.version>
3434
</properties>
3535

3636
<dependencies>
@@ -95,7 +95,7 @@
9595
<dependency>
9696
<groupId>com.google.truth</groupId>
9797
<artifactId>truth</artifactId>
98-
<version>0.34</version>
98+
<version>0.35</version>
9999
<scope>test</scope>
100100
</dependency>
101101
</dependencies>

‎appengine-java8/bigtable/pom.xml‎

Lines changed: 45 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,11 @@ limitations under the License.
3737
<maven.compiler.source>1.8</maven.compiler.source>
3838
<maven.compiler.target>1.8</maven.compiler.target>
3939

40-
<bigtable.version>0.9.6.2</bigtable.version>
41-
<hbase.version>1.2.4</hbase.version>
40+
<bigtable.version>1.0.0-pre3</bigtable.version>
41+
<hbase.version>1.2.6</hbase.version>
4242
<bigtable.projectID>YOUR_PROJECT_ID</bigtable.projectID>
4343
<bigtable.instanceID>YOUR_INSTANCE_ID</bigtable.instanceID>
4444

45-
<hadoop.version>2.4.1</hadoop.version>
46-
<compat.module>hbase-hadoop2-compat</compat.module>
47-
4845
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
4946
<archiveClasses>true</archiveClasses>
5047
<failOnMissingWebXml>false</failOnMissingWebXml>
@@ -53,16 +50,10 @@ limitations under the License.
5350
<dependencies>
5451
<dependency>
5552
<groupId>com.google.cloud.bigtable</groupId>
56-
<artifactId>bigtable-hbase-1.2</artifactId>
53+
<artifactId>bigtable-hbase-1.x</artifactId>
5754
<version>${bigtable.version}</version>
5855
</dependency>
5956

60-
<dependency>
61-
<groupId>org.apache.hbase</groupId>
62-
<artifactId>hbase-client</artifactId>
63-
<version>${hbase.version}</version>
64-
</dependency>
65-
6657
<dependency>
6758
<groupId>io.netty</groupId>
6859
<artifactId>netty-tcnative-boringssl-static</artifactId>
@@ -88,7 +79,7 @@ limitations under the License.
8879
<dependency>
8980
<groupId>com.google.truth</groupId>
9081
<artifactId>truth</artifactId>
91-
<version>0.30</version>
82+
<version>0.35</version>
9283
<scope>test</scope>
9384
</dependency>
9485

@@ -110,20 +101,20 @@ limitations under the License.
110101
<!-- for hot reload of the web application-->
111102
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
112103
<plugins>
113-
<plugin>
114-
<groupId>org.codehaus.mojo</groupId>
115-
<artifactId>versions-maven-plugin</artifactId>
116-
<version>2.3</version>
117-
<executions>
118-
<execution>
119-
<phase>compile</phase>
120-
<goals>
121-
<goal>display-dependency-updates</goal>
122-
<goal>display-plugin-updates</goal>
123-
</goals>
124-
</execution>
125-
</executions>
126-
</plugin>
104+
<!--<plugin>-->
105+
<!--<groupId>org.codehaus.mojo</groupId>-->
106+
<!--<artifactId>versions-maven-plugin</artifactId>-->
107+
<!--<version>2.4</version>-->
108+
<!--<executions>-->
109+
<!--<execution>-->
110+
<!--<phase>compile</phase>-->
111+
<!--<goals>-->
112+
<!--<goal>display-dependency-updates</goal>-->
113+
<!--<goal>display-plugin-updates</goal>-->
114+
<!--</goals>-->
115+
<!--</execution>-->
116+
<!--</executions>-->
117+
<!--</plugin>-->
127118

128119
<plugin>
129120
<groupId>org.apache.maven.plugins</groupId>
@@ -142,7 +133,7 @@ limitations under the License.
142133
<plugin>
143134
<groupId>org.apache.maven.plugins</groupId>
144135
<artifactId>maven-war-plugin</artifactId>
145-
<version>3.0.0</version>
136+
<version>3.1.0</version>
146137
<configuration>
147138
<archiveClasses>true</archiveClasses>
148139
<webResources>
@@ -159,7 +150,7 @@ limitations under the License.
159150
<plugin>
160151
<groupId>org.apache.maven.plugins</groupId>
161152
<artifactId>maven-failsafe-plugin</artifactId>
162-
<version>2.19.1</version>
153+
<version>2.20.1</version>
163154
<configuration>
164155
<systemPropertyVariables>
165156
<BIGTABLE_PROJECT>${bigtable.projectID}</BIGTABLE_PROJECT>
@@ -175,6 +166,31 @@ limitations under the License.
175166
<configuration>
176167
</configuration>
177168
</plugin>
169+
170+
<plugin>
171+
<groupId>org.apache.maven.plugins</groupId>
172+
<artifactId>maven-compiler-plugin</artifactId>
173+
<version>3.7.0</version>
174+
</plugin>
175+
176+
<plugin>
177+
<groupId>org.apache.maven.plugins</groupId>
178+
<artifactId>maven-clean-plugin</artifactId>
179+
<version>3.0.0</version>
180+
</plugin>
181+
182+
<plugin>
183+
<groupId>org.apache.maven.plugins</groupId>
184+
<artifactId>maven-enforcer-plugin</artifactId>
185+
<version>3.0.0-M1</version>
186+
<configuration>
187+
<rules>
188+
<requireMavenVersion>
189+
<version>[3.5.0,)</version>
190+
</requireMavenVersion>
191+
</rules>
192+
</configuration>
193+
</plugin>
178194
</plugins>
179195
</build>
180196

‎appengine-java8/bigtable/src/main/webapp/WEB-INF/appengine-web.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<system-properties>
2020
<property name="BIGTABLE_PROJECT" value="@bigtable.projectID@" />
2121
<property name="BIGTABLE_INSTANCE" value="@bigtable.instanceID@" />
22+
<property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
2223
</system-properties>
2324
</appengine-web-app>
2425
<!-- [END config] -->

‎appengine-java8/bigtable/src/main/webapp/WEB-INF/logging.properties‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# A default java.util.logging configuration.
2+
# (All App Engine logging is through java.util.logging by default).
3+
#
4+
# To use this configuration, copy it into your application's WEB-INF
5+
# folder and add the following to your appengine-web.xml:
6+
#
7+
# <system-properties>
8+
# <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
9+
# </system-properties>
10+
#
11+
12+
# Set the default logging level for all loggers to WARNING
13+
.level = WARNING

‎appengine-java8/bigtable/src/test/java/com/example/bigtable/ITBigtableHelloWorld.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.junit.runner.RunWith;
2222
import org.junit.runners.JUnit4;
2323

24-
/** Unit tests for {@link HelloAppEngine}. */
24+
/** Unit tests for {@link BigtableHelloWorld}. */
2525
@RunWith(JUnit4.class)
2626
@SuppressWarnings("checkstyle:abbreviationaswordinname")
2727
public class ITBigtableHelloWorld {

‎appengine-java8/cloudsql/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>com.google.appengine</groupId>
5151
<artifactId>appengine-api-1.0-sdk</artifactId>
52-
<version>1.9.54</version>
52+
<version>1.9.56</version>
5353
</dependency>
5454

5555
<dependency>
@@ -76,7 +76,7 @@
7676
<dependency>
7777
<groupId>com.google.cloud.sql</groupId>
7878
<artifactId>mysql-socket-factory</artifactId> <!-- mysql-socket-factory-connector-j-6 if using 6.x.x -->
79-
<version>1.0.3</version>
79+
<version>1.0.4</version>
8080
</dependency>
8181
<!-- [END dependencies] -->
8282
</dependencies>

‎appengine-java8/datastore-indexes-exploding/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<dependency>
7676
<groupId>com.google.truth</groupId>
7777
<artifactId>truth</artifactId>
78-
<version>0.34</version>
78+
<version>0.35</version>
7979
<scope>test</scope>
8080
</dependency>
8181
</dependencies>

‎appengine-java8/datastore-indexes-perfect/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<dependency>
7676
<groupId>com.google.truth</groupId>
7777
<artifactId>truth</artifactId>
78-
<version>0.34</version>
78+
<version>0.35</version>
7979
<scope>test</scope>
8080
</dependency>
8181
</dependencies>

‎appengine-java8/datastore-indexes/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<dependency>
7777
<groupId>com.google.truth</groupId>
7878
<artifactId>truth</artifactId>
79-
<version>0.34</version>
79+
<version>0.35</version>
8080
<scope>test</scope>
8181
</dependency>
8282
</dependencies>

0 commit comments

Comments
 (0)