Maven version to 3.6.1 (#802)

* Maven version 3.6.1 * Using maven BOM to control plexus-util version
GoogleCloudPlatform · Jul 31, 2019 · 5d43390 · 5d43390
1 parent 6cd83f2
commit 5d43390
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/enforcer-rules/pom.xml b/enforcer-rules/pom.xml
@@ -53,6 +53,19 @@
     <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <!-- To avoid plexus-util version conflict (#803) -->
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven</artifactId>
+        <version>${maven.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/pom.xml b/pom.xml
@@ -41,7 +41,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <guava.version>28.0-jre</guava.version>
     <resolver.version>1.4.0</resolver.version>
-    <maven.version>3.6.0</maven.version>
+    <maven.version>3.6.1</maven.version>
     <truth.version>1.0</truth.version>
   </properties>