Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update parent project & adjust configs accordingly #200

Merged
merged 2 commits into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .mvn/maven.config
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

13 changes: 3 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
6 changes: 2 additions & 4 deletions src/main/tools/checkstyle/checkstyle-suppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
16 changes: 9 additions & 7 deletions src/main/tools/pmd/ruleset.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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">
Expand Down
Loading