Update parent project & adjust configs accordingly

UCLALibrary · Sep 10, 2024 · be1924a · be1924a
1 parent 4ee1cb0
commit be1924a
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 22 deletions.
diff --git a/.classpath b/.classpath
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="test" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="src/main/generated"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/.mvn/maven.config b/.mvn/maven.config
@@ -0,0 +1 @@
+
diff --git a/pom.xml b/pom.xml
@@ -78,7 +78,7 @@
     <openjdk.version>17.0.12+7-1ubuntu2~22.04</openjdk.version>
     <gcc.version>4:11.2.0-1ubuntu1</gcc.version>
     <make.version>4.3-4.1build1</make.version>
-    <libtiff.version>4.3.0-6ubuntu0.9</libtiff.version>
+    <libtiff.version>4.3.0-6ubuntu0.10</libtiff.version>
     <build.essential.version>12.9ubuntu3</build.essential.version>
     <libopenjp2.version>2.4.0-6</libopenjp2.version>
     <libturbojpeg.version>2.1.2-0ubuntu1</libturbojpeg.version>
@@ -203,14 +203,6 @@
     </testResources>
 
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <generatedTestSourcesDirectory>src/main/generated</generatedTestSourcesDirectory>
-        </configuration>
-      </plugin>
-
       <!-- We can skip building the Jar except when Docker runs the build -->
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
@@ -224,6 +216,7 @@
 
       <!-- We don't install the Jar but package it up in our Docker image -->
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-install-plugin</artifactId>
         <configuration>
           <skip>true</skip>
@@ -246,7 +239,7 @@
 
       <!-- Generates a message bundle class for use in the Java tests -->
       <!--<![CDATA[
-        To run the generate-codes plugin manually: mvn info.freelibrary:freelib-utils:generate-codes
+        To run the generate-codes plugin manually: mvn info.freelibrary:freelib-maven-plugins:generate-codes
       ]]>-->
       <plugin>
         <groupId>info.freelibrary</groupId>

diff --git a/src/main/generated/edu/ucla/library/iiif/cantaloupe/MessageCodes.java b/src/main/generated/edu/ucla/library/iiif/cantaloupe/MessageCodes.java
@@ -1,6 +1,13 @@
 package edu.ucla.library.iiif.cantaloupe;
 /**
- * Codes used for internationalized text in logs and other application components. This class is automatically generated from the project's <code>*_messages.xml</code> file (found in the project's <code>src/main/resources</code> directory). Do not manually edit the Java code for this class. <p> BEGIN GENERATED CODE </p>
+ * Codes used for internationalized text in logs and other application
+ * components. This class is automatically generated from the project's
+ * <code>*_messages.xml</code> file (found in the project's
+ * <code>src/main/resources</code> directory). Do not manually edit the Java
+ * code for this class.
+ * <p>
+ * BEGIN GENERATED CODE
+ * </p>
  */
 final public class MessageCodes {
 

diff --git a/src/main/tools/checkstyle/checkstyle-suppressions.xml b/src/main/tools/checkstyle/checkstyle-suppressions.xml
@@ -4,8 +4,6 @@
   "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 
 <suppressions>
-  <suppress files="src[\\/]main[\\/]generated[\\/]" checks="."/>
-  <suppress files="src[\\/]test[\\/]generated[\\/]" checks="."/>
-  <suppress files="target[\\/]" checks="."/>
-  <suppress files=".mvn[\\/]" checks="."/>
+  <suppress files=".*\.mvn[\\/].*" checks="." />
+  <suppress files=".*docs[\\/].*" checks="." />
 </suppressions>
diff --git a/src/main/tools/pmd/ruleset.xml b/src/main/tools/pmd/ruleset.xml
@@ -12,11 +12,12 @@
 
   <rule ref="category/java/bestpractices.xml">
     <exclude name="GuardLogStatement" />
+    <exclude name="LooseCoupling" />
   </rule>
   <rule ref="category/java/bestpractices.xml/UnusedPrivateMethod">
     <properties>
       <property name="ignoredAnnotations"
-        value="com.fasterxml.jackson.annotation.JsonSetter|com.fasterxml.jackson.annotation.JsonGetter" />
+        value="com.fasterxml.jackson.annotation.JsonSetter,com.fasterxml.jackson.annotation.JsonGetter" />
     </properties>
   </rule>
   <rule ref="category/java/bestpractices.xml/ForLoopVariableCount">
@@ -27,12 +28,12 @@
 
   <rule ref="category/java/codestyle.xml">
     <exclude name="OnlyOneReturn" />
-    <exclude name="DefaultPackage" />
+    <exclude name="CommentDefaultAccessModifier" />
     <exclude name="CallSuperInConstructor" /> <!-- Default super is handled by default -->
     <exclude name="ConfusingTernary" /> <!-- It makes more sense to ask if something isn't null, IMHO -->
     <exclude name="PrematureDeclaration" /> <!-- Sometimes useful, but more often than not a false positive -->
-    <exclude name="AtLeastOneConstructor" />
-    <exclude name="CommentDefaultAccessModifier" />
+    <exclude name="UnnecessaryConstructor" /> <!-- Javadocs requires even default constructors to have docs -->
+    <exclude name="AtLeastOneConstructor" /> <!-- Non-public classes can have default constructors -->
   </rule>
   <rule ref="category/java/codestyle.xml/ClassNamingConventions">
     <properties>
@@ -76,7 +77,8 @@
   <rule ref="category/java/design.xml">
     <exclude name="LawOfDemeter" />
     <exclude name="LoosePackageCoupling" />
-    <exclude name="UselessOverridingMethod" />
+    <exclude name="SimplifyBooleanReturns" />
+    <exclude name="DataClass" />
   </rule>
   <rule ref="category/java/design.xml/TooManyMethods">
     <properties>
@@ -94,8 +96,8 @@
 
   <rule ref="category/java/errorprone.xml">
     <exclude name="AssignmentInOperand" />
-    <exclude name="DataflowAnomalyAnalysis" />
-    <exclude name="BeanMembersShouldSerialize" />
+    <exclude name="InvalidLogMessageFormat" />
+    <exclude name="MissingStaticMethodInNonInstantiatableClass" />
   </rule>
 
   <rule ref="category/java/performance.xml">