From 6c2bcd5ccaae5523b43ef92103c2b81a58d77d6e Mon Sep 17 00:00:00 2001
From: George Gastaldi <gegastaldi@gmail.com>
Date: Tue, 3 Apr 2018 17:17:42 +0000
Subject: [PATCH 1/4] Update Maven Model to 3.5.3

---
 .gitignore                                        | 15 +++++++++++++++
 pom.xml                                           |  2 +-
 .../model/io/jdom/MavenToolchainsJDOMWriter.java  |  3 ++-
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8e567df
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,15 @@
+.classpath
+.project
+.settings
+.DS_Store
+dependency-reduced-pom.xml
+target/
+*.iml
+*.ipr
+*.iws
+*.swp
+/*/src/main/java/META-INF
+.gitignore.swp
+.idea
+.factorypath
+.externalToolBuilders
diff --git a/pom.xml b/pom.xml
index 50d47ae..259ab1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
   <properties>
     <projectOwner>Apache Software Foundation</projectOwner>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <mavenVersion>3.0.3</mavenVersion>
+    <mavenVersion>3.5.3</mavenVersion>
   </properties>
 
   <dependencyManagement>
diff --git a/src/main/java/org/apache/maven/toolchain/model/io/jdom/MavenToolchainsJDOMWriter.java b/src/main/java/org/apache/maven/toolchain/model/io/jdom/MavenToolchainsJDOMWriter.java
index 35532e7..5571f6b 100644
--- a/src/main/java/org/apache/maven/toolchain/model/io/jdom/MavenToolchainsJDOMWriter.java
+++ b/src/main/java/org/apache/maven/toolchain/model/io/jdom/MavenToolchainsJDOMWriter.java
@@ -15,6 +15,7 @@
  */
 package org.apache.maven.toolchain.model.io.jdom;
 
+import static org.apache.maven.io.util.WriterUtils.findAndReplaceProperties;
 import static org.apache.maven.io.util.WriterUtils.findAndReplaceSimpleElement;
 import static org.apache.maven.io.util.WriterUtils.findAndReplaceXpp3DOM;
 
@@ -208,7 +209,7 @@ protected void updateToolchainModel( final ToolchainModel toolchainModel, final
         final IndentationCounter innerCount = new IndentationCounter( counter.getDepth() + 1 );
         findAndReplaceSimpleElement( innerCount, root, "type",
                                      toolchainModel.getType() == null ? null : toolchainModel.getType(), null );
-        findAndReplaceXpp3DOM( innerCount, root, "provides", (Xpp3Dom) toolchainModel.getProvides() );
+        findAndReplaceProperties( innerCount, root, "provides", toolchainModel.getProvides() );
         findAndReplaceXpp3DOM( innerCount, root, "configuration", (Xpp3Dom) toolchainModel.getConfiguration() );
     } // -- void updateToolchainModel( ToolchainModel, String, Counter, Element )
 

From 45b41999e3fbdd2f1da775d64c728a050ec14968 Mon Sep 17 00:00:00 2001
From: George Gastaldi <gegastaldi@gmail.com>
Date: Tue, 3 Apr 2018 17:23:22 +0000
Subject: [PATCH 2/4] Junit and hamcrest as test scoped

---
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pom.xml b/pom.xml
index 259ab1f..71d1814 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,10 +119,12 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-core</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
   

From 4f04aaa4aee80b2f822ecddf798dc516fe9c7fcb Mon Sep 17 00:00:00 2001
From: George Gastaldi <gegastaldi@gmail.com>
Date: Wed, 4 Apr 2018 11:11:29 +0000
Subject: [PATCH 3/4] Update toolchains model to 1.1.0

---
 .gitignore | 1 +
 pom.xml    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 8e567df..47585cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ target/
 .idea
 .factorypath
 .externalToolBuilders
+/bin/
diff --git a/pom.xml b/pom.xml
index 71d1814..915e100 100644
--- a/pom.xml
+++ b/pom.xml
@@ -203,7 +203,7 @@
                   <goal>jdom-writer</goal>
                 </goals>
                 <configuration>
-                  <version>1.0.0</version>
+                  <version>1.1.0</version>
                   <models>
                     <model>target/dependency/apache-maven-${mavenVersion}/maven-core/src/main/mdo/toolchains.mdo</model>
                   </models>

From 71a4ade221960b2463db1f8e52e705f9c14279c9 Mon Sep 17 00:00:00 2001
From: George Gastaldi <gegastaldi@gmail.com>
Date: Wed, 4 Apr 2018 11:21:04 +0000
Subject: [PATCH 4/4] commons-io isn't used at all

---
 pom.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 915e100..916de6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,11 +71,6 @@
         <artifactId>maven-core</artifactId>
         <version>${mavenVersion}</version>
       </dependency>
-      <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>2.4</version>
-      </dependency>
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
@@ -112,10 +107,6 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>