[PATCH 5 of 7] Cleanup POM inheritance

Wald Commits scm-commit at wald.intevation.org
Fri Jan 13 18:59:44 CET 2023


# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1673632332 -3600
#      Fri Jan 13 18:52:12 2023 +0100
# Branch 3.2.x
# Node ID 9f49cf2d05bc5a097501035cdd73976b256230b5
# Parent  a12a136e3d4c4ac10cb2314cce72619fb4c1b402
Cleanup POM inheritance

diff -r a12a136e3d4c -r 9f49cf2d05bc artifact-database/pom.xml
--- a/artifact-database/pom.xml	Fri Jan 13 15:31:02 2023 +0100
+++ b/artifact-database/pom.xml	Fri Jan 13 18:52:12 2023 +0100
@@ -5,15 +5,9 @@
     <artifactId>artifact-system</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.dive4elements</groupId>
   <artifactId>artifact-database</artifactId>
   <name>artifact-database</name>
-  <version>1.0-SNAPSHOT</version>
-  <url>http://maven.apache.org</url>
   <build>
     <plugins>
       <plugin>
diff -r a12a136e3d4c -r 9f49cf2d05bc artifacts-common/pom.xml
--- a/artifacts-common/pom.xml	Fri Jan 13 15:31:02 2023 +0100
+++ b/artifacts-common/pom.xml	Fri Jan 13 18:52:12 2023 +0100
@@ -1,18 +1,15 @@
 <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/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.dive4elements</groupId>
+    <artifactId>artifact-system</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
   <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.dive4elements</groupId>
   <artifactId>artifacts-common</artifactId>
-  <version>1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>artifacts-common</name>
-  <url>http://maven.apache.org</url>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
 
   <dependencies>
     <dependency>
@@ -45,17 +42,6 @@
         <include>**/*.gwt.xml</include>
       </includes>
     </resource>
-  </resources>
-  <plugins>
-      <plugin>
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-compiler-plugin</artifactId>
-         <version>2.0.2</version>
-         <configuration>
-            <source>1.6</source>
-            <target>1.6</target>
-         </configuration>
-      </plugin>
-   </plugins>
+   </resources>
   </build>
 </project>
diff -r a12a136e3d4c -r 9f49cf2d05bc artifacts/pom.xml
--- a/artifacts/pom.xml	Fri Jan 13 15:31:02 2023 +0100
+++ b/artifacts/pom.xml	Fri Jan 13 18:52:12 2023 +0100
@@ -1,28 +1,12 @@
 <?xml version="1.0"?>
 <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">
+  <parent>
+    <groupId>org.dive4elements</groupId>
+    <artifactId>artifact-system</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.dive4elements.artifacts</groupId>
   <artifactId>artifacts</artifactId>
   <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
   <name>artifacts</name>
-  <url>http://maven.apache.org</url>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-  </dependencies>
 </project>


More information about the Dive4Elements-commits mailing list