Skip to content

Commit

Permalink
[SERV-978] Fix nightly build / update packages/dependencies (#158)
Browse files Browse the repository at this point in the history
* Update docker image packages, base project version
* Add some Javadocs that the new project base version requires
  • Loading branch information
ksclarke authored Dec 1, 2023
1 parent 7ac60b6 commit 54cf575
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 14 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@
<!-- Docker container dependency versions -->
<!-- https://packages.ubuntu.com/search?keywords=search -->
<ubuntu.tag>22.04</ubuntu.tag>
<openjdk.version>17.0.8.1+1~us1-0ubuntu1~22.04</openjdk.version>
<openjdk.version>17.0.9+9-1~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.6</libtiff.version>
<libtiff.version>4.3.0-6ubuntu0.7</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 @@ -609,7 +609,7 @@
<parent>
<groupId>info.freelibrary</groupId>
<artifactId>freelib-parent</artifactId>
<version>8.0.0</version>
<version>8.0.4</version>
</parent>

</project>
22 changes: 18 additions & 4 deletions src/main/tools/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,28 @@
<module name="BooleanExpressionComplexity">
<property name="max" value="4" />
</module>
<module name="MissingJavadocMethod" />
<module name="MissingJavadocMethod">
<property name="scope" value="private" />
</module>
<module name="JavadocMethod">
<property name="validateThrows" value="true" />
<property name="allowedAnnotations"
value="Override, Test, Before, BeforeClass, After, AfterClass, JsonInclude, JsonGetter, JsonSetter, JsonProperty" />
</module>
<module name="JavadocType">
<property name="excludeScope" value="anoninner" />
<property name="allowUnknownTags" value="true" />
</module>
<module name="MissingJavadocType" />
<module name="NonEmptyAtclauseDescription"/>
<module name="InvalidJavadocPosition"/>
<module name="JavadocVariable" />
<module name="MissingJavadocPackage" />
<module name="JavadocMethod" />
<module name="SummaryJavadocCheck" />
<module name="MissingJavadocType">
<property name="scope" value="private" />
</module>
<module name="JavadocStyle">
<property name="checkFirstSentence" value="false"/>
</module>
<module name="NeedBraces" />
<module name="LeftCurly" />
<module name="RightCurly" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,22 @@
*/
class AbstractCantaloupeIT {

/** A URL pattern constant. */
private static final String URL_PATTERN = "http://localhost:{}";

/** A default port constant. */
private static final String DEFAULT_PORT = "8182";

/** The URL being tested. */
protected String myURL;

/** The port being tested. */
protected int myPort;

/** Whether the test system has Kakadu installed. */
protected boolean hasKakaduInstalled;

/** Whether the test is running in a development environment. */
protected boolean isDevBuild;

/**
Expand Down
16 changes: 10 additions & 6 deletions src/test/java/edu/ucla/library/iiif/cantaloupe/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,28 @@
*/
public final class Constants {

/* The randomly selected port at which Cantaloupe is run. */
/** The randomly selected port at which Cantaloupe is run. */
public static final String PORT = "http.port";

/* The version of Cantaloupe that's being tested. */
/** The version of Cantaloupe that's being tested. */
public static final String CANTALOUPE_VERSION = "cantaloupe.version";

/* The Cantaloupe commit hash that's being tested. */
/** The Cantaloupe commit hash that's being tested. */
public static final String CANTALOUPE_COMMIT_REF = "cantaloupe.commit.ref";

/* The version of Kakadu that's being tested. */
/** The version of Kakadu that's being tested. */
public static final String KAKADU_VERSION = "kakadu.version";

/* A flag to indicate we want to build a snapshot build from the 5.x line. */
/** A flag to indicate we want to build a snapshot build from the 5.x line. */
public static final String DEV_BUILD = "devBuild";

/* A constant representing an empty string. */
/** A constant representing an empty string. */
public static final String EMPTY = "";

/**
* Creates a new constants class.
*/
private Constants() {
// This is intentionally left empty.
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
*/
public class KakaduIT extends AbstractCantaloupeIT {

/** A test logger. */
private static final Logger LOGGER = LoggerFactory.getLogger(KakaduIT.class, MessageCodes.BUNDLE);

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@

package edu.ucla.library.iiif.cantaloupe;

import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;

import java.io.IOException;

Expand All @@ -19,8 +21,10 @@
*/
public class VersionIT extends AbstractCantaloupeIT {

/** A test logger. */
private static final Logger LOGGER = LoggerFactory.getLogger(VersionIT.class, MessageCodes.BUNDLE);

/** The HTML containing the version to be tested. */
private Document myHTML;

/**
Expand Down

0 comments on commit 54cf575

Please sign in to comment.