From d8d3aa0af74cde14b863829c8b6b11221ad69e5b Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Sun, 7 Jun 2020 12:24:54 +0200
Subject: [PATCH] [scala] Introduce parent pom pmd-scala-common

---
 pmd-scala-modules/pmd-scala-common/pom.xml | 107 +++++++++++++++++++++
 pmd-scala-modules/pmd-scala_2.12/pom.xml   |  79 +--------------
 pmd-scala-modules/pmd-scala_2.13/pom.xml   |  79 +--------------
 pom.xml                                    |   3 +-
 4 files changed, 113 insertions(+), 155 deletions(-)
 create mode 100644 pmd-scala-modules/pmd-scala-common/pom.xml

diff --git a/pmd-scala-modules/pmd-scala-common/pom.xml b/pmd-scala-modules/pmd-scala-common/pom.xml
new file mode 100644
index 0000000000..773337090e
--- /dev/null
+++ b/pmd-scala-modules/pmd-scala-common/pom.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <modelVersion>4.0.0</modelVersion>
+    <name>PMD Scala Common Source and Settings</name>
+    <artifactId>pmd-scala-common</artifactId>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>net.sourceforge.pmd</groupId>
+        <artifactId>pmd</artifactId>
+        <version>6.25.0-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
+    </parent>
+
+    <properties>
+        <scalameta.version>4.2.0</scalameta.version>
+    </properties>
+
+    <build>
+        <sourceDirectory>../pmd-scala-common/src/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>../pmd-scala-common/src/main/resources</directory>
+            </resource>
+        </resources>
+        <testSourceDirectory>../pmd-scala-common/src/test/java</testSourceDirectory>
+        <testResources>
+            <testResource>
+                <directory>../pmd-scala-common/src/test/resources</directory>
+            </testResource>
+        </testResources>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <configuration>
+                        <useDefaultDelimiters>false</useDefaultDelimiters>
+                        <delimiters>
+                            <delimiter>${*}</delimiter>
+                        </delimiters>
+                    </configuration>
+                </plugin>
+
+                <plugin>
+                    <artifactId>kotlin-maven-plugin</artifactId>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <executions>
+                        <execution>
+                            <id>compile</id>
+                            <goals>
+                                <goal>compile</goal>
+                            </goals>
+                            <configuration>
+                                <sourceDirs>
+                                    <sourceDir>../pmd-scala-common/src/main/kotlin</sourceDir>
+                                    <sourceDir>../pmd-scala-common/src/main/java</sourceDir>
+                                </sourceDirs>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>test-compile</id>
+                            <goals>
+                                <goal>test-compile</goal>
+                            </goals>
+                            <configuration>
+                                <sourceDirs>
+                                    <sourceDir>../pmd-scala-common/src/test/kotlin</sourceDir>
+                                    <sourceDir>../pmd-scala-common/src/test/java</sourceDir>
+                                </sourceDirs>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>net.sourceforge.pmd</groupId>
+            <artifactId>pmd-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.sourceforge.pmd</groupId>
+            <artifactId>pmd-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.sourceforge.pmd</groupId>
+            <artifactId>pmd-lang-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/pmd-scala-modules/pmd-scala_2.12/pom.xml b/pmd-scala-modules/pmd-scala_2.12/pom.xml
index 8930224f8e..220974c6e1 100644
--- a/pmd-scala-modules/pmd-scala_2.12/pom.xml
+++ b/pmd-scala-modules/pmd-scala_2.12/pom.xml
@@ -7,70 +7,20 @@
 
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
-        <artifactId>pmd</artifactId>
+        <artifactId>pmd-scala-common</artifactId>
         <version>6.25.0-SNAPSHOT</version>
-        <relativePath>../..</relativePath>
+        <relativePath>../pmd-scala-common</relativePath>
     </parent>
 
     <properties>
         <scalaVersion>2.12</scalaVersion>
-        <scalameta.version>4.2.0</scalameta.version>
     </properties>
 
     <build>
-        <sourceDirectory>../pmd-scala-common/src/main/java</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>../pmd-scala-common/src/main/resources</directory>
-            </resource>
-        </resources>
-        <testSourceDirectory>../pmd-scala-common/src/test/java</testSourceDirectory>
-        <testResources>
-            <testResource>
-                <directory>../pmd-scala-common/src/test/resources</directory>
-            </testResource>
-        </testResources>
-
         <plugins>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <configuration>
-                    <useDefaultDelimiters>false</useDefaultDelimiters>
-                    <delimiters>
-                        <delimiter>${*}</delimiter>
-                    </delimiters>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <artifactId>kotlin-maven-plugin</artifactId>
                 <groupId>org.jetbrains.kotlin</groupId>
-                <executions>
-                    <execution>
-                        <id>compile</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <sourceDirs>
-                                <sourceDir>../pmd-scala-common/src/main/kotlin</sourceDir>
-                                <sourceDir>../pmd-scala-common/src/main/java</sourceDir>
-                            </sourceDirs>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>test-compile</id>
-                        <goals>
-                            <goal>test-compile</goal>
-                        </goals>
-                        <configuration>
-                            <sourceDirs>
-                                <sourceDir>../pmd-scala-common/src/test/kotlin</sourceDir>
-                                <sourceDir>../pmd-scala-common/src/test/java</sourceDir>
-                            </sourceDirs>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>
@@ -81,30 +31,5 @@
             <artifactId>scalameta_${scalaVersion}</artifactId>
             <version>${scalameta.version}</version>
         </dependency>
-        <dependency>
-            <groupId>net.sourceforge.pmd</groupId>
-            <artifactId>pmd-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.sourceforge.pmd</groupId>
-            <artifactId>pmd-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.sourceforge.pmd</groupId>
-            <artifactId>pmd-lang-test</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/pmd-scala-modules/pmd-scala_2.13/pom.xml b/pmd-scala-modules/pmd-scala_2.13/pom.xml
index 1214bb25d7..b314beda49 100644
--- a/pmd-scala-modules/pmd-scala_2.13/pom.xml
+++ b/pmd-scala-modules/pmd-scala_2.13/pom.xml
@@ -7,70 +7,20 @@
 
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
-        <artifactId>pmd</artifactId>
+        <artifactId>pmd-scala-common</artifactId>
         <version>6.25.0-SNAPSHOT</version>
-        <relativePath>../..</relativePath>
+        <relativePath>../pmd-scala-common</relativePath>
     </parent>
 
     <properties>
         <scalaVersion>2.13</scalaVersion>
-        <scalameta.version>4.2.0</scalameta.version>
     </properties>
 
     <build>
-        <sourceDirectory>../pmd-scala-common/src/main/java</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>../pmd-scala-common/src/main/resources</directory>
-            </resource>
-        </resources>
-        <testSourceDirectory>../pmd-scala-common/src/test/java</testSourceDirectory>
-        <testResources>
-            <testResource>
-                <directory>../pmd-scala-common/src/test/resources</directory>
-            </testResource>
-        </testResources>
-
         <plugins>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <configuration>
-                    <useDefaultDelimiters>false</useDefaultDelimiters>
-                    <delimiters>
-                        <delimiter>${*}</delimiter>
-                    </delimiters>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <artifactId>kotlin-maven-plugin</artifactId>
                 <groupId>org.jetbrains.kotlin</groupId>
-                <executions>
-                    <execution>
-                        <id>compile</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <sourceDirs>
-                                <sourceDir>../pmd-scala-common/src/main/kotlin</sourceDir>
-                                <sourceDir>../pmd-scala-common/src/main/java</sourceDir>
-                            </sourceDirs>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>test-compile</id>
-                        <goals>
-                            <goal>test-compile</goal>
-                        </goals>
-                        <configuration>
-                            <sourceDirs>
-                                <sourceDir>../pmd-scala-common/src/test/kotlin</sourceDir>
-                                <sourceDir>../pmd-scala-common/src/test/java</sourceDir>
-                            </sourceDirs>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>
@@ -81,30 +31,5 @@
             <artifactId>scalameta_${scalaVersion}</artifactId>
             <version>${scalameta.version}</version>
         </dependency>
-        <dependency>
-            <groupId>net.sourceforge.pmd</groupId>
-            <artifactId>pmd-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.sourceforge.pmd</groupId>
-            <artifactId>pmd-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.sourceforge.pmd</groupId>
-            <artifactId>pmd-lang-test</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 8793ac0b89..062f361a90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1030,7 +1030,8 @@
         <module>pmd-plsql</module>
         <module>pmd-python</module>
         <module>pmd-ruby</module>
-        <module>pmd-scala</module>
+        <module>pmd-scala</module> <!-- deprecated -->
+        <module>pmd-scala-modules/pmd-scala-common</module>
         <module>pmd-scala-modules/pmd-scala_2.13</module>
         <module>pmd-scala-modules/pmd-scala_2.12</module>
         <module>pmd-swift</module>