From a86aea2379cfbc00a986433b77132493fd47ce69 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@adangel.org>
Date: Wed, 6 Dec 2017 20:14:03 +0100
Subject: [PATCH] [apex] Create separate module "pmd-apex-jorje" which provides
 the apex jorje parser

---
 pmd-apex-jorje/pom.xml                        | 137 ++++++++++++++++++
 {pmd-apex => pmd-apex-jorje}/repo/README.md   |   0
 .../apex-jorje-lsp-minimized-2017-11-17.jar   | Bin
 .../apex-jorje-lsp-minimized-2017-11-17.pom   |   0
 .../maven-metadata-local.xml                  |   0
 .../repo/create-local-repo.sh                 |   0
 pmd-apex/pom.xml                              | 131 ++---------------
 pom.xml                                       |   1 +
 8 files changed, 147 insertions(+), 122 deletions(-)
 create mode 100644 pmd-apex-jorje/pom.xml
 rename {pmd-apex => pmd-apex-jorje}/repo/README.md (100%)
 rename {pmd-apex => pmd-apex-jorje}/repo/apex/apex-jorje-lsp-minimized/2017-11-17/apex-jorje-lsp-minimized-2017-11-17.jar (100%)
 rename {pmd-apex => pmd-apex-jorje}/repo/apex/apex-jorje-lsp-minimized/2017-11-17/apex-jorje-lsp-minimized-2017-11-17.pom (100%)
 rename {pmd-apex => pmd-apex-jorje}/repo/apex/apex-jorje-lsp-minimized/maven-metadata-local.xml (100%)
 rename {pmd-apex => pmd-apex-jorje}/repo/create-local-repo.sh (100%)

diff --git a/pmd-apex-jorje/pom.xml b/pmd-apex-jorje/pom.xml
new file mode 100644
index 0000000000..5aa8487889
--- /dev/null
+++ b/pmd-apex-jorje/pom.xml
@@ -0,0 +1,137 @@
+<?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>
+  <artifactId>pmd-apex-jorje</artifactId>
+  <name>PMD Apex Jorje Parser Library</name>
+  <packaging>pom</packaging>
+
+  <parent>
+    <groupId>net.sourceforge.pmd</groupId>
+    <artifactId>pmd</artifactId>
+    <version>6.0.0-SNAPSHOT</version>
+  </parent>
+
+  <properties>
+    <config.basedir>${basedir}/../pmd-core</config.basedir>
+    <java.version>8</java.version>
+    <apex.jorje.version>2017-11-17</apex.jorje.version>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>3.0.0</version>
+        <executions>
+            <execution>
+                <id>attach-apex-jorje</id>
+                <phase>package</phase>
+                <goals>
+                    <goal>attach-artifact</goal>
+                </goals>
+                <configuration>
+                    <artifacts>
+                        <artifact>
+                            <file>${basedir}/repo/apex/apex-jorje-lsp-minimized/${apex.jorje.version}/apex-jorje-lsp-minimized-${apex.jorje.version}.jar</file>
+                            <type>jar</type>
+                            <classifier>lib</classifier>
+                        </artifact>
+                    </artifacts>
+                </configuration>
+            </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <!-- transitive dependencies of apex-jorje -->
+    <dependency>
+        <groupId>cglib</groupId>
+        <artifactId>cglib</artifactId>
+        <version>3.2.0</version>
+    </dependency>
+    <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-classic</artifactId>
+        <version>1.1.7</version>
+    </dependency>
+    <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-core</artifactId>
+        <version>1.1.7</version>
+    </dependency>
+    <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>jsr305</artifactId>
+        <version>3.0.1</version>
+    </dependency>
+    <dependency>
+        <groupId>com.google.code.gson</groupId>
+        <artifactId>gson</artifactId>
+        <version>2.7</version>
+    </dependency>
+    <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>22.0</version>
+    </dependency>
+    <dependency>
+        <groupId>org.antlr</groupId>
+        <artifactId>antlr-runtime</artifactId>
+        <version>3.5.2</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+        <version>3.0</version>
+    </dependency>
+    <dependency>
+        <groupId>org.eclipse.xtend</groupId>
+        <artifactId>org.eclipse.xtend.lib</artifactId>
+        <version>2.10.0</version>
+    </dependency>
+    <dependency>
+        <groupId>org.eclipse.xtend</groupId>
+        <artifactId>org.eclipse.xtend.lib.macro</artifactId>
+        <version>2.10.0</version>
+    </dependency>
+    <dependency>
+        <groupId>org.eclipse.xtext</groupId>
+        <artifactId>org.eclipse.xtext.xbase.lib</artifactId>
+        <version>2.10.0</version>
+    </dependency>
+    <dependency>
+        <groupId>org.openjdk.jol</groupId>
+        <artifactId>jol-core</artifactId>
+        <version>0.4</version>
+    </dependency>
+    <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>1.7.20</version>
+    </dependency>
+    <dependency>
+        <groupId>org.yaml</groupId>
+        <artifactId>snakeyaml</artifactId>
+        <version>1.17</version>
+    </dependency>
+    <dependency>
+        <groupId>aopalliance</groupId>
+        <artifactId>aopalliance</artifactId>
+        <version>1.0</version>
+    </dependency>
+    <dependency>
+        <groupId>javax.inject</groupId>
+        <artifactId>javax.inject</artifactId>
+        <version>1</version>
+    </dependency>
+    <dependency>
+        <groupId>org.ow2.asm</groupId>
+        <artifactId>asm</artifactId>
+        <version>5.0.3</version>
+        <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/pmd-apex/repo/README.md b/pmd-apex-jorje/repo/README.md
similarity index 100%
rename from pmd-apex/repo/README.md
rename to pmd-apex-jorje/repo/README.md
diff --git a/pmd-apex/repo/apex/apex-jorje-lsp-minimized/2017-11-17/apex-jorje-lsp-minimized-2017-11-17.jar b/pmd-apex-jorje/repo/apex/apex-jorje-lsp-minimized/2017-11-17/apex-jorje-lsp-minimized-2017-11-17.jar
similarity index 100%
rename from pmd-apex/repo/apex/apex-jorje-lsp-minimized/2017-11-17/apex-jorje-lsp-minimized-2017-11-17.jar
rename to pmd-apex-jorje/repo/apex/apex-jorje-lsp-minimized/2017-11-17/apex-jorje-lsp-minimized-2017-11-17.jar
diff --git a/pmd-apex/repo/apex/apex-jorje-lsp-minimized/2017-11-17/apex-jorje-lsp-minimized-2017-11-17.pom b/pmd-apex-jorje/repo/apex/apex-jorje-lsp-minimized/2017-11-17/apex-jorje-lsp-minimized-2017-11-17.pom
similarity index 100%
rename from pmd-apex/repo/apex/apex-jorje-lsp-minimized/2017-11-17/apex-jorje-lsp-minimized-2017-11-17.pom
rename to pmd-apex-jorje/repo/apex/apex-jorje-lsp-minimized/2017-11-17/apex-jorje-lsp-minimized-2017-11-17.pom
diff --git a/pmd-apex/repo/apex/apex-jorje-lsp-minimized/maven-metadata-local.xml b/pmd-apex-jorje/repo/apex/apex-jorje-lsp-minimized/maven-metadata-local.xml
similarity index 100%
rename from pmd-apex/repo/apex/apex-jorje-lsp-minimized/maven-metadata-local.xml
rename to pmd-apex-jorje/repo/apex/apex-jorje-lsp-minimized/maven-metadata-local.xml
diff --git a/pmd-apex/repo/create-local-repo.sh b/pmd-apex-jorje/repo/create-local-repo.sh
similarity index 100%
rename from pmd-apex/repo/create-local-repo.sh
rename to pmd-apex-jorje/repo/create-local-repo.sh
diff --git a/pmd-apex/pom.xml b/pmd-apex/pom.xml
index ed5a5f879b..a938271394 100644
--- a/pmd-apex/pom.xml
+++ b/pmd-apex/pom.xml
@@ -14,7 +14,6 @@
   <properties>
     <config.basedir>${basedir}/../pmd-core</config.basedir>
     <java.version>8</java.version>
-    <apex.jorje.version>2017-11-17</apex.jorje.version>
   </properties>
 
   <build>
@@ -60,30 +59,6 @@
           </execution>
         </executions>
       </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>3.0.0</version>
-        <executions>
-            <execution>
-                <id>attach-apex-jorje</id>
-                <phase>package</phase>
-                <goals>
-                    <goal>attach-artifact</goal>
-                </goals>
-                <configuration>
-                    <artifacts>
-                        <artifact>
-                            <file>${basedir}/repo/apex/apex-jorje-lsp-minimized/${apex.jorje.version}/apex-jorje-lsp-minimized-${apex.jorje.version}.jar</file>
-                            <type>jar</type>
-                            <classifier>apex-jorje</classifier>
-                        </artifact>
-                    </artifacts>
-                </configuration>
-            </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   <dependencies>
@@ -93,98 +68,18 @@
     </dependency>
 
     <dependency>
-      <groupId>apex</groupId>
-      <artifactId>apex-jorje-lsp-minimized</artifactId>
-      <version>${apex.jorje.version}</version>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>pmd-apex-jorje</artifactId>
+      <version>${project.version}</version>
+      <classifier>lib</classifier>
     </dependency>
-    <!-- transitive dependencies of apex-jorje -->
+
     <dependency>
-        <groupId>cglib</groupId>
-        <artifactId>cglib</artifactId>
-        <version>3.2.0</version>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>pmd-apex-jorje</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
     </dependency>
-    <dependency>
-        <groupId>ch.qos.logback</groupId>
-        <artifactId>logback-classic</artifactId>
-        <version>1.1.7</version>
-    </dependency>
-    <dependency>
-        <groupId>ch.qos.logback</groupId>
-        <artifactId>logback-core</artifactId>
-        <version>1.1.7</version>
-    </dependency>
-    <dependency>
-        <groupId>com.google.code.findbugs</groupId>
-        <artifactId>jsr305</artifactId>
-        <version>3.0.1</version>
-    </dependency>
-    <dependency>
-        <groupId>com.google.code.gson</groupId>
-        <artifactId>gson</artifactId>
-        <version>2.7</version>
-    </dependency>
-    <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>22.0</version>
-    </dependency>
-    <dependency>
-        <groupId>org.antlr</groupId>
-        <artifactId>antlr-runtime</artifactId>
-        <version>3.5.2</version>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-lang3</artifactId>
-        <version>3.0</version>
-    </dependency>
-    <dependency>
-        <groupId>org.eclipse.xtend</groupId>
-        <artifactId>org.eclipse.xtend.lib</artifactId>
-        <version>2.10.0</version>
-    </dependency>
-    <dependency>
-        <groupId>org.eclipse.xtend</groupId>
-        <artifactId>org.eclipse.xtend.lib.macro</artifactId>
-        <version>2.10.0</version>
-    </dependency>
-    <dependency>
-        <groupId>org.eclipse.xtext</groupId>
-        <artifactId>org.eclipse.xtext.xbase.lib</artifactId>
-        <version>2.10.0</version>
-    </dependency>
-    <dependency>
-        <groupId>org.openjdk.jol</groupId>
-        <artifactId>jol-core</artifactId>
-        <version>0.4</version>
-    </dependency>
-    <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>1.7.20</version>
-    </dependency>
-    <dependency>
-        <groupId>org.yaml</groupId>
-        <artifactId>snakeyaml</artifactId>
-        <version>1.17</version>
-    </dependency>
-    <dependency>
-        <groupId>aopalliance</groupId>
-        <artifactId>aopalliance</artifactId>
-        <version>1.0</version>
-    </dependency>
-    <dependency>
-        <groupId>javax.inject</groupId>
-        <artifactId>javax.inject</artifactId>
-        <version>1</version>
-    </dependency>
-    <dependency>
-        <groupId>org.ow2.asm</groupId>
-        <artifactId>asm</artifactId>
-        <version>5.0.3</version>
-        <scope>runtime</scope>
-    </dependency>
-    <!--  end transitive dependencies of apex-jorje -->
 
     <dependency>
       <groupId>commons-io</groupId>
@@ -208,16 +103,8 @@
       <artifactId>pmd-test</artifactId>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
 
-  <repositories>
-    <repository>
-      <id>local-apex-repo</id>
-      <url>file://${basedir}/repo</url>
-    </repository>
-  </repositories>
-
   <profiles>
     <profile>
       <id>designer</id>
diff --git a/pom.xml b/pom.xml
index 91d65d54e5..8f0c91ee34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -931,6 +931,7 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
                 <jdk>[1.8,</jdk>
             </activation>
             <modules>
+                <module>pmd-apex-jorje</module>
                 <module>pmd-apex</module>
                 <module>pmd-java8</module>
                 <module>pmd-ui</module>