From 41365f7879376ac044dcadae0b4b90c15fa411ef Mon Sep 17 00:00:00 2001
From: Ferdinand Swoboda <ferdinand.swoboda@googlemail.com>
Date: Fri, 20 Oct 2023 22:49:55 +0200
Subject: [PATCH] Enforce more Maven rules

---
 LICENSE.md | 22 ----------------------
 pom.xml    | 32 +++++++++++++++++++-------------
 2 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/LICENSE.md b/LICENSE.md
index a4fe16f..e69de29 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,22 +0,0 @@
-MIT License
-
-Copyright (c) 2018-2019 Picnic Technologies BV
-Copyright (c) 2022 Ferdinand Swoboda
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/pom.xml b/pom.xml
index 4c9f82e..18c3bc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,16 +43,6 @@
         <system>Github CI</system>
         <url>https://github.com/ferdinand-swoboda/folo</url>
     </ciManagement>
-    <distributionManagement>
-        <repository>
-            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
 
     <properties>
         <!-- Property using which additional Error Prone flags can be
@@ -88,7 +78,6 @@
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
                 <version>${version.guava}</version>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>javax.annotation</groupId>
@@ -147,13 +136,11 @@
                 <artifactId>mockito-bom</artifactId>
                 <version>${version.mockito}</version>
                 <type>pom</type>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.postgresql</groupId>
                 <artifactId>postgresql</artifactId>
                 <version>${version.postgresql}</version>
-                <scope>test</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -349,8 +336,25 @@
                     <configuration>
                         <fail>false</fail>
                         <rules>
+                            <banDependencyManagementScope/>
+                            <banDistributionManagement/>
+                            <banDuplicateClasses/>
                             <banDuplicatePomDependencyVersions/>
+                            <banDynamicVersions/>
+                            <banCircularDependencies/>
+                            <banTransitiveDependencies>
+                                <excludes>
+                                    <exclude>org.jooq:jooq</exclude>
+                                </excludes>
+                            </banTransitiveDependencies>
                             <dependencyConvergence/>
+                            <reactorModuleConvergence/>
+                            <requireNoRepositories/>
+                            <!-- Enable once all files have been converted to UTF-8-->
+                            <!-- <requireEncoding/>-->
+                            <enforceBytecodeVersion>
+                                <maxJdkVersion>${version.jdk}</maxJdkVersion>
+                            </enforceBytecodeVersion>
                             <requireJavaVersion>
                                 <version>${version.jdk}</version>
                             </requireJavaVersion>
@@ -359,6 +363,8 @@
                             <!--     <version>${version.maven}</version>-->
                             <!-- </requireMavenVersion>-->
                             <requirePluginVersions/>
+                            <requireReleaseDeps/>
+                            <requirePluginVersions/>
                             <requireSameVersions/>
                             <requireUpperBoundDeps/>
                         </rules>