Merge pull request #83 from hazendaz/master

Cleanup poms with move to native maven plugin to plugin management
mybatis · Mar 11, 2023 · 58f6062 · 58f6062
2 parents 502c288 + 695d3fe
commit 58f6062
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 61 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2022 the original author or authors.
+       Copyright 2022-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
     <groupId>org.mybatis.spring.native</groupId>
     <artifactId>mybatis-spring-native</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>mybatis-spring-native-core</artifactId>

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2022 the original author or authors.
+       Copyright 2022-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
     <groupId>org.mybatis.spring.native</groupId>
     <artifactId>mybatis-spring-native</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>mybatis-spring-native-docs</artifactId>

diff --git a/extensions/pom.xml b/extensions/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2022 the original author or authors.
+       Copyright 2022-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
     <groupId>org.mybatis.spring.native</groupId>
     <artifactId>mybatis-spring-native</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>mybatis-spring-native-extensions</artifactId>

diff --git a/samples/cache/pom.xml b/samples/cache/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2022 the original author or authors.
+       Copyright 2022-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
     <groupId>org.mybatis.spring.native</groupId>
     <artifactId>mybatis-spring-native-samples</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>mybatis-spring-native-sample-cache</artifactId>
   <name>mybatis-spring-native-sample-cache</name>
@@ -122,7 +121,6 @@
       <id>native</id>
       <properties>
         <repackage.classifier>exec</repackage.classifier>
-        <native-buildtools.version>0.9.13</native-buildtools.version>
       </properties>
       <dependencies>
         <dependency>
@@ -136,7 +134,6 @@
           <plugin>
             <groupId>org.graalvm.buildtools</groupId>
             <artifactId>native-maven-plugin</artifactId>
-            <version>${native-buildtools.version}</version>
             <extensions>true</extensions>
             <configuration>
               <buildArgs>

diff --git a/samples/configuration/pom.xml b/samples/configuration/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2022 the original author or authors.
+       Copyright 2022-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
     <groupId>org.mybatis.spring.native</groupId>
     <artifactId>mybatis-spring-native-samples</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>mybatis-spring-native-sample-configuration</artifactId>
   <name>mybatis-spring-native-sample-configuration</name>
@@ -122,7 +121,6 @@
       <id>native</id>
       <properties>
         <repackage.classifier>exec</repackage.classifier>
-        <native-buildtools.version>0.9.13</native-buildtools.version>
       </properties>
       <dependencies>
         <dependency>
@@ -136,7 +134,6 @@
           <plugin>
             <groupId>org.graalvm.buildtools</groupId>
             <artifactId>native-maven-plugin</artifactId>
-            <version>${native-buildtools.version}</version>
             <extensions>true</extensions>
             <executions>
               <execution>

diff --git a/samples/dao/pom.xml b/samples/dao/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2022 the original author or authors.
+       Copyright 2022-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
     <groupId>org.mybatis.spring.native</groupId>
     <artifactId>mybatis-spring-native-samples</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>mybatis-spring-native-sample-dao</artifactId>
   <name>mybatis-spring-native-sample-dao</name>
@@ -122,7 +121,6 @@
       <id>native</id>
       <properties>
         <repackage.classifier>exec</repackage.classifier>
-        <native-buildtools.version>0.9.13</native-buildtools.version>
       </properties>
       <dependencies>
         <dependency>
@@ -136,7 +134,6 @@
           <plugin>
             <groupId>org.graalvm.buildtools</groupId>
             <artifactId>native-maven-plugin</artifactId>
-            <version>${native-buildtools.version}</version>
             <extensions>true</extensions>
             <executions>
               <execution>

diff --git a/samples/dynamic-sql/pom.xml b/samples/dynamic-sql/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2022 the original author or authors.
+       Copyright 2022-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
     <groupId>org.mybatis.spring.native</groupId>
     <artifactId>mybatis-spring-native-samples</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>mybatis-spring-native-sample-dynamic-sql</artifactId>
   <name>mybatis-spring-native-sample-dynamic-sql</name>
@@ -126,7 +125,6 @@
       <id>native</id>
       <properties>
         <repackage.classifier>exec</repackage.classifier>
-        <native-buildtools.version>0.9.13</native-buildtools.version>
       </properties>
       <dependencies>
         <dependency>
@@ -140,7 +138,6 @@
           <plugin>
             <groupId>org.graalvm.buildtools</groupId>
             <artifactId>native-maven-plugin</artifactId>
-            <version>${native-buildtools.version}</version>
             <extensions>true</extensions>
             <executions>
               <execution>

diff --git a/samples/freemarker/pom.xml b/samples/freemarker/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2022 the original author or authors.
+       Copyright 2022-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
     <groupId>org.mybatis.spring.native</groupId>
     <artifactId>mybatis-spring-native-samples</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>mybatis-spring-native-sample-freemarker</artifactId>
   <name>mybatis-spring-native-sample-freemarker</name>
@@ -126,7 +125,6 @@
       <id>native</id>
       <properties>
         <repackage.classifier>exec</repackage.classifier>
-        <native-buildtools.version>0.9.13</native-buildtools.version>
       </properties>
       <dependencies>
         <dependency>
@@ -140,7 +138,6 @@
           <plugin>
             <groupId>org.graalvm.buildtools</groupId>
             <artifactId>native-maven-plugin</artifactId>
-            <version>${native-buildtools.version}</version>
             <extensions>true</extensions>
             <executions>
               <execution>

diff --git a/samples/pom.xml b/samples/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2022 the original author or authors.
+       Copyright 2022-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -24,24 +24,20 @@
     <groupId>org.mybatis.spring.native</groupId>
     <artifactId>mybatis-spring-native</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>mybatis-spring-native-samples</artifactId>
   <name>mybatis-spring-native-samples</name>
   <packaging>pom</packaging>
 
   <properties>
-    <animal.sniffer.skip>true</animal.sniffer.skip>
     <enforcer.skip>true</enforcer.skip>
     <maven.deploy.skip>true</maven.deploy.skip>
     <maven.test.skip>true</maven.test.skip>
     <maven.site.skip>true</maven.site.skip>
+
+    <native-buildtools.version>0.9.13</native-buildtools.version>
   </properties>
-
-  <build>
-    <finalName>${project.artifactId}</finalName>
-  </build>
 
   <modules>
     <module>simple</module>
@@ -58,4 +54,17 @@
     <module>dynamic-sql</module>
   </modules>
 
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.graalvm.buildtools</groupId>
+          <artifactId>native-maven-plugin</artifactId>
+          <version>${native-buildtools.version}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
+    <finalName>${project.artifactId}</finalName>
+  </build>
 </project>
diff --git a/samples/scan/pom.xml b/samples/scan/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2022 the original author or authors.
+       Copyright 2022-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
     <groupId>org.mybatis.spring.native</groupId>
     <artifactId>mybatis-spring-native-samples</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>mybatis-spring-native-sample-scan</artifactId>
   <name>mybatis-spring-native-sample-scan</name>
@@ -122,7 +121,6 @@
       <id>native</id>
       <properties>
         <repackage.classifier>exec</repackage.classifier>
-        <native-buildtools.version>0.9.13</native-buildtools.version>
       </properties>
       <dependencies>
         <dependency>
@@ -136,7 +134,6 @@
           <plugin>
             <groupId>org.graalvm.buildtools</groupId>
             <artifactId>native-maven-plugin</artifactId>
-            <version>${native-buildtools.version}</version>
             <extensions>true</extensions>
             <executions>
               <execution>

diff --git a/samples/simple/pom.xml b/samples/simple/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2022 the original author or authors.
+       Copyright 2022-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
     <groupId>org.mybatis.spring.native</groupId>
     <artifactId>mybatis-spring-native-samples</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>mybatis-spring-native-sample-simple</artifactId>
   <name>mybatis-spring-native-sample-simple</name>
@@ -122,7 +121,6 @@
       <id>native</id>
       <properties>
         <repackage.classifier>exec</repackage.classifier>
-        <native-buildtools.version>0.9.13</native-buildtools.version>
       </properties>
       <dependencies>
         <dependency>
@@ -136,7 +134,6 @@
           <plugin>
             <groupId>org.graalvm.buildtools</groupId>
             <artifactId>native-maven-plugin</artifactId>
-            <version>${native-buildtools.version}</version>
             <extensions>true</extensions>
             <executions>
               <execution>

diff --git a/samples/sqlprovider/pom.xml b/samples/sqlprovider/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2022 the original author or authors.
+       Copyright 2022-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
     <groupId>org.mybatis.spring.native</groupId>
     <artifactId>mybatis-spring-native-samples</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>mybatis-spring-native-sample-sqlprovider</artifactId>
   <name>mybatis-spring-native-sample-sqlprovider</name>
@@ -122,7 +121,6 @@
       <id>native</id>
       <properties>
         <repackage.classifier>exec</repackage.classifier>
-        <native-buildtools.version>0.9.13</native-buildtools.version>
       </properties>
       <dependencies>
         <dependency>
@@ -136,7 +134,6 @@
           <plugin>
             <groupId>org.graalvm.buildtools</groupId>
             <artifactId>native-maven-plugin</artifactId>
-            <version>${native-buildtools.version}</version>
             <extensions>true</extensions>
             <executions>
               <execution>