From ef950622826435c55c4dd03d533e9184541d2288 Mon Sep 17 00:00:00 2001
From: Anton Klaren <anton.klaren@neotechnology.com>
Date: Wed, 21 Feb 2018 14:55:46 +0100
Subject: [PATCH] Added enforcing of package naming to maven and java classes

---
 community/cypher/pom.xml  | 34 ++++++++++++----------------------
 enterprise/cypher/pom.xml | 34 ++++++++++++----------------------
 pom.xml                   | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 44 deletions(-)

diff --git a/community/cypher/pom.xml b/community/cypher/pom.xml
index 8bd573bea4d8..65d290cd24be 100644
--- a/community/cypher/pom.xml
+++ b/community/cypher/pom.xml
@@ -106,28 +106,18 @@
       <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>1.3.1</version>
-          <executions>
-              <execution>
-                  <id>enforce-dont-exist</id>
-                  <goals>
-                      <goal>enforce</goal>
-                  </goals>
-                  <configuration>
-                      <rules>
-                          <requireFilesDontExist>
-                              <files>
-                                  <file>cypher-compiler-3.2</file>
-                                  <file>cypher-compiler-3.1</file>
-                                  <file>cypher-compiler-3.0</file>
-                                  <file>cypher-compiler-2.3</file>
-                              </files>
-                          </requireFilesDontExist>
-                      </rules>
-                      <fail>true</fail>
-                  </configuration>
-              </execution>
-          </executions>
+          <configuration>
+              <rules combine.children="append">
+                  <requireFilesDontExist>
+                      <files>
+                          <file>cypher-compiler-3.2</file>
+                          <file>cypher-compiler-3.1</file>
+                          <file>cypher-compiler-3.0</file>
+                          <file>cypher-compiler-2.3</file>
+                      </files>
+                  </requireFilesDontExist>
+              </rules>
+          </configuration>
       </plugin>
     </plugins>
 
diff --git a/enterprise/cypher/pom.xml b/enterprise/cypher/pom.xml
index 7732fd66ec8e..21041d0ab1d0 100644
--- a/enterprise/cypher/pom.xml
+++ b/enterprise/cypher/pom.xml
@@ -106,28 +106,18 @@
       <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>1.3.1</version>
-          <executions>
-              <execution>
-                  <id>enforce-dont-exist</id>
-                  <goals>
-                      <goal>enforce</goal>
-                  </goals>
-                  <configuration>
-                      <rules>
-                          <requireFilesDontExist>
-                              <files>
-                                  <file>cypher-compiler-3.2</file>
-                                  <file>cypher-compiler-3.1</file>
-                                  <file>cypher-compiler-3.0</file>
-                                  <file>cypher-compiler-2.3</file>
-                              </files>
-                          </requireFilesDontExist>
-                      </rules>
-                      <fail>true</fail>
-                  </configuration>
-              </execution>
-          </executions>
+          <configuration>
+              <rules combine.children="append">
+                  <requireFilesDontExist>
+                      <files>
+                          <file>cypher-compiler-3.2</file>
+                          <file>cypher-compiler-3.1</file>
+                          <file>cypher-compiler-3.0</file>
+                          <file>cypher-compiler-2.3</file>
+                      </files>
+                  </requireFilesDontExist>
+              </rules>
+          </configuration>
       </plugin>
     </plugins>
 
diff --git a/pom.xml b/pom.xml
index bfae51c6b4c4..57ee5d9439e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,6 +139,17 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>
@@ -162,6 +173,27 @@
           <artifactId>maven-source-plugin</artifactId>
           <version>3.0.1</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-enforcer-plugin</artifactId>
+          <version>3.0.0-M1</version>
+          <configuration>
+            <rules>
+              <evaluateBeanshell>
+                <message>Maven module has to be in a "groupId" beginning with "org.neo4j"</message>
+                <condition>String s = "${project.groupId}"; s.startsWith("org.neo4j")</condition>
+              </evaluateBeanshell>
+              <requireFilesDontExist>
+                <message>You are not allowed to have classes in "com" package</message>
+                <files>
+                  <file>${project.build.sourceDirectory}/com</file>
+                  <file>${project.build.testSourceDirectory}/com</file>
+                </files>
+              </requireFilesDontExist>
+            </rules>
+            <fail>true</fail>
+          </configuration>
+        </plugin>
         <plugin>
           <groupId>org.neo4j.build.plugins</groupId>
           <artifactId>clirr-maven-plugin</artifactId>