Upcoming maven release likes modelVersions in tiles

Change-Id: I355a6663eabd5228e481e0dba33783aa07ad2e1f
repaint-io · May 27, 2020 · 4630e23 · 4630e23
1 parent 2a0c010
commit 4630e23
Show file tree

Hide file tree

Showing 17 changed files with 20 additions and 4 deletions.
diff --git a/src/it/civersion-tiletest/tile-tile1/tile.xml b/src/it/civersion-tiletest/tile-tile1/tile.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
+    <modelVersion>4.0.0</modelVersion>
     <properties>
         <foo.bar.tile1>tile1</foo.bar.tile1>
     </properties>

diff --git a/src/it/civersion-tiletest/tile-tile2/tile.xml b/src/it/civersion-tiletest/tile-tile2/tile.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
+    <modelVersion>4.0.0</modelVersion>
     <properties>
         <foo.bar.tile2>tile2</foo.bar.tile2>
     </properties>

diff --git a/src/it/civersion-tiletest/tile-tile3/tile.xml b/src/it/civersion-tiletest/tile-tile3/tile.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
+    <modelVersion>4.0.0</modelVersion>
     <build>
         <plugins>
             <plugin>

diff --git a/src/it/sitereporting-tiletest/tile-tile/tile.xml b/src/it/sitereporting-tiletest/tile-tile/tile.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
+    <modelVersion>4.0.0</modelVersion>
     <build>
         <plugins>
             <plugin>

diff --git a/src/test/resources/antrun1-tile.xml b/src/test/resources/antrun1-tile.xml
@@ -2,6 +2,7 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
 	<build>
 		<plugins>
 			<plugin>

diff --git a/src/test/resources/antrun2-tile.xml b/src/test/resources/antrun2-tile.xml
@@ -2,6 +2,7 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
 
 	<dependencyManagement>
 		<dependencies>

diff --git a/src/test/resources/bad-smelly-tile.xml b/src/test/resources/bad-smelly-tile.xml
@@ -2,6 +2,7 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
 
 	<properties>
 		<one>1</one>

diff --git a/src/test/resources/execution-id-tile.xml b/src/test/resources/execution-id-tile.xml
@@ -15,6 +15,7 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
 
 	<build>
 		<plugins>

diff --git a/src/test/resources/extended-syntax-tile.xml b/src/test/resources/extended-syntax-tile.xml
@@ -15,6 +15,7 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
 
 	<properties>
 		<one>1</one>

diff --git a/src/test/resources/filtering/tile.xml b/src/test/resources/filtering/tile.xml
@@ -2,6 +2,7 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
 
 	<tiles>
 		<tile>groupid:antrun1-tile:@project.version@</tile>

diff --git a/src/test/resources/invalid-tile.xml b/src/test/resources/invalid-tile.xml
@@ -3,6 +3,7 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
 
 	<properties>
 		<one>1</one>

diff --git a/src/test/resources/release-tile.xml b/src/test/resources/release-tile.xml
@@ -14,6 +14,7 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
 	<distributionManagement>
 		<repository>
 			<id>sonatype-staging</id>

diff --git a/src/test/resources/session-license-tile.xml b/src/test/resources/session-license-tile.xml
@@ -15,6 +15,7 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
 
 	<properties>
 		<one>1</one>

diff --git a/src/test/resources/smelly-tile.xml b/src/test/resources/smelly-tile.xml
@@ -2,6 +2,7 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
 
 	<properties>
 		<one>1</one>

diff --git a/src/test/resources/test-merge-tile/kapt-dinject-tile.xml b/src/test/resources/test-merge-tile/kapt-dinject-tile.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
+  <modelVersion>4.0.0</modelVersion>
 
   <description>
     Add KAPT annotation processor to generate DInject Dependency injection (as java source code).

diff --git a/src/test/resources/test-merge-tile/kapt-javalin-tile.xml b/src/test/resources/test-merge-tile/kapt-javalin-tile.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
+  <modelVersion>4.0.0</modelVersion>
 
   <description>
     Add KAPT annotation processor to generate javalin controllers (as java source code).

diff --git a/src/test/resources/test-merge-tile/kapt-tile.xml b/src/test/resources/test-merge-tile/kapt-tile.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
-
+  <modelVersion>4.0.0</modelVersion>
   <description>
     Kotlin compiler with KAPT annotation processing support.
   </description>
@@ -42,9 +42,9 @@
               </sourceDirs>
               <annotationProcessorPaths>
 
-                <!-- annotation processors added here -->  
- 
-              </annotationProcessorPaths>         
+                <!-- annotation processors added here -->
+
+              </annotationProcessorPaths>
             </configuration>
           </execution>