From 74ae8d0d6e9a5463b29cb54c01728441d34c733d Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@adangel.org>
Date: Sun, 18 Feb 2018 19:07:37 +0100
Subject: [PATCH] Remove profile jdk9-disabled - scala is now active always

---
 pmd-dist/pom.xml | 24 ++++++------------------
 pom.xml          | 17 +----------------
 2 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/pmd-dist/pom.xml b/pmd-dist/pom.xml
index 8adfe16154..5a3ba1cad6 100644
--- a/pmd-dist/pom.xml
+++ b/pmd-dist/pom.xml
@@ -156,6 +156,11 @@
             <artifactId>pmd-ruby</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>net.sourceforge.pmd</groupId>
+            <artifactId>pmd-scala</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-swift</artifactId>
@@ -172,6 +177,7 @@
             <version>${project.version}</version>
         </dependency>
 
+
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -214,23 +220,5 @@
                 </dependency>
             </dependencies>
         </profile>
-        <profile>
-            <id>jdk9-disabled</id>
-            <activation>
-                <jdk>!9</jdk>
-            </activation>
-            <dependencies>
-                <!--
-                    https://github.com/scala/scala-dev/issues/139
-                    https://issues.scala-lang.org/browse/SI-9103
-                    https://sourceforge.net/p/pmd/bugs/1314/
-                 -->
-                <dependency>
-                    <groupId>net.sourceforge.pmd</groupId>
-                    <artifactId>pmd-scala</artifactId>
-                    <version>${project.version}</version>
-                </dependency>
-            </dependencies>
-        </profile>
     </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index 4a11b60bb0..d5b49aaab8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -975,21 +975,6 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
             </build>
         </profile>
 
-        <profile>
-            <id>jdk9-disabled</id>
-            <activation>
-                <jdk>!9</jdk>
-            </activation>
-            <modules>
-                <!--
-                    https://github.com/scala/scala-dev/issues/139
-                    https://issues.scala-lang.org/browse/SI-9103
-                    https://sourceforge.net/p/pmd/bugs/1314/
-                 -->
-                <module>pmd-scala</module>
-            </modules>
-        </profile>
-
         <profile>
             <id>doclint</id>
             <build>
@@ -1051,11 +1036,11 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
         <module>pmd-plsql</module>
         <module>pmd-python</module>
         <module>pmd-ruby</module>
+        <module>pmd-scala</module>
         <module>pmd-swift</module>
         <module>pmd-test</module>
         <module>pmd-visualforce</module>
         <module>pmd-vm</module>
         <module>pmd-xml</module>
-        <module>pmd-scala</module>
     </modules>
 </project>