Skip to content

Commit 962de55

Browse files
Les Vogellesv
authored andcommitted
Update for api-client
1. Update to Java 11 2. Get rid of Findbugs (no longer supported) 3. WAR's should use the latest war plugin. 4. Remvoe a bad / wrong import in MqttExampleOptions
1 parent f35eb86 commit 962de55

File tree

4 files changed

+11
-24
lines changed

4 files changed

+11
-24
lines changed

compute/cmdline/pom.xml

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ limitations under the License.
3030
</parent>
3131

3232
<properties>
33-
<maven.compiler.target>1.8</maven.compiler.target>
34-
<maven.compiler.source>1.8</maven.compiler.source>
33+
<maven.compiler.target>11</maven.compiler.target>
34+
<maven.compiler.source>11</maven.compiler.source>
3535
<project.compute.version>v1-rev20200114-1.30.8</project.compute.version>
3636
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3737
</properties>
@@ -74,22 +74,6 @@ limitations under the License.
7474
</configuration>
7575
</plugin>
7676

77-
<plugin>
78-
<groupId>org.codehaus.mojo</groupId>
79-
<artifactId>findbugs-maven-plugin</artifactId>
80-
<version>3.0.5</version>
81-
<configuration>
82-
<failOnError>false</failOnError>
83-
</configuration>
84-
<executions>
85-
<execution>
86-
<goals>
87-
<goal>check</goal>
88-
</goals>
89-
</execution>
90-
</executions>
91-
</plugin>
92-
9377
</plugins>
9478
<finalName>${project.artifactId}-${project.version}</finalName>
9579
</build>

endpoints/getting-started/pom.xml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,9 @@
3333
</parent>
3434

3535
<properties>
36-
<maven.compiler.target>1.8</maven.compiler.target>
37-
<maven.compiler.source>1.8</maven.compiler.source>
36+
<maven.compiler.target>11</maven.compiler.target>
37+
<maven.compiler.source>11</maven.compiler.source>
3838

39-
<maven.war.plugin>2.6</maven.war.plugin>
4039
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->
4140
</properties>
4241

@@ -61,6 +60,11 @@
6160
<!-- for hot reload of the web application -->
6261
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
6362
<plugins>
63+
<plugin>
64+
<groupId>org.apache.maven.plugins</groupId>
65+
<artifactId>maven-war-plugin</artifactId>
66+
<version>3.2.3</version>
67+
</plugin>
6468
<plugin>
6569
<groupId>com.google.cloud.tools</groupId>
6670
<artifactId>appengine-maven-plugin</artifactId>

iot/api-client/codelab/manager/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<version>1.0.11</version>
3434
</parent>
3535
<properties>
36-
<maven.compiler.target>1.8</maven.compiler.target>
37-
<maven.compiler.source>1.8</maven.compiler.source>
36+
<maven.compiler.target>11</maven.compiler.target>
37+
<maven.compiler.source>11</maven.compiler.source>
3838
</properties>
3939

4040
<dependencies>

iot/api-client/codelab/manager/src/main/java/com/example/cloud/iot/examples/MqttExampleOptions.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.apache.commons.cli.Option;
2323
import org.apache.commons.cli.Options;
2424
import org.apache.commons.cli.ParseException;
25-
import org.omg.PortableInterceptor.SYSTEM_EXCEPTION;
2625

2726
/** Command line options for the MQTT example. */
2827
public class MqttExampleOptions {

0 commit comments

Comments
 (0)