Skip to content

Commit

Permalink
upgrade java
Browse files Browse the repository at this point in the history
  • Loading branch information
William Welling committed Jan 28, 2021
1 parent 1ae5bbf commit c8193ab
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# build base image
FROM maven:3-jdk-8-alpine as maven
FROM maven:3-openjdk-11-slim as maven

# copy pom.xml
COPY ./pom.xml ./pom.xml
Expand All @@ -24,7 +24,7 @@ WORKDIR /
RUN mvn package

# final base image
FROM openjdk:8u171-jre-alpine
FROM openjdk:11-jre-slim

# set deployment directory
WORKDIR /mod-camunda
Expand Down
4 changes: 1 addition & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@

buildMvn {
publishAPI = 'no'
mvnDeploy = 'yes'
runLintRamlCop = 'no'
buildNode = 'jenkins-agent-java11'
}

16 changes: 16 additions & 0 deletions codestyles-suppressions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0"?>

<!DOCTYPE suppressions PUBLIC
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
"http://checkstyle.sourceforge.net/dtds/suppressions_1_1.dtd">

<suppressions>
<!-- Tone down the checking for test code -->
<suppress checks="ImportControl" files=".*[\\/]src[\\/](test|it)[\\/]"/>
<suppress checks="Javadoc" files=".*[\\/]src[\\/](test|it)[\\/]"/>
<suppress checks="MagicNumber" files=".*[\\/]src[\\/](test|it)[\\/]"/>
<suppress checks="AvoidStaticImport" files=".*[\\/]src[\\/](test|it)[\\/]"/>
<suppress checks="WriteTag" files=".*[\\/]src[\\/](test|it)[\\/]"/>
<suppress checks="MethodCount" files=".*[\\/]src[\\/](test|it)[\\/]"/>
<suppress checks="." files="[\\/]generated-sources[\\/]"/>
</suppressions>
58 changes: 58 additions & 0 deletions codestyles.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?xml version="1.0" ?>
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">

<module name="Checker">
<property name="fileExtensions" value="java, xml, json, properties" />
<module name="NewlineAtEndOfFile">
<property name="lineSeparator" value="lf"/>
</module>
<module name="FileTabCharacter">
<property name="eachLine" value="true"/>
</module>
<module name="TreeWalker">
<module name="EmptyStatement"/>
<property name="tabWidth" value="2" />
<module name="AvoidStarImport" />
<module name="EmptyBlock" />
<module name="MethodLength">
<property name="tokens" value="METHOD_DEF" /> <!-- max lines for a function -->
<property name="max" value="200" />
<property name="countEmpty" value="false"/>
</module>
<module name="MethodLength">
<property name="tokens" value="CTOR_DEF" /> <!-- max lines for a constructor -->
<property name="max" value="20" />
</module>
<module name="AnonInnerLength">
<property name="max" value="30"/> <!-- max lines for inner class / lambda - note java spec = 20 -->
</module>
<module name="AvoidInlineConditionals"/> <!-- Some developers find inline conditionals hard to read -->
<module name="AvoidStaticImport"> <!-- avoid static imports as they are confusing, allow the list included below -->
<property name="excludes" value="java.lang.System.out,java.lang.Math.*"/>
</module>
<module name="ClassDataAbstractionCoupling"> <!-- the number of instantiations of other classes within the given class -->
<property name="max" value="10"/>
<!-- since cannot pass RMB generated objects as a package with wildcard, thershold may be exceeded, changing this to warning -->
<property name="severity" value="warning"/>
</module>
<module name="ConstantName"> <!-- Validates identifiers for constants (static, final fields). -->
<property name="format" value="^log(ger)?|[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"/>
</module>
<module name="DeclarationOrder"/> <!-- Class (static) variables, instance vars, constructors, methods -->
<module name="EmptyCatchBlock"> <!-- Checks for empty catch blocks,
except is if exception's variable name is expected or ignore or there's any comment inside: -->
<property name="exceptionVariableName" value="expected|ignore"/>
</module>
<module name="VisibilityModifier"> <!-- Checks visibility of class members, allow package visibility of class members that are not
static final, immutable or annotated by specified annotation members may be public -->
<property name="packageAllowed" value="true"/>
</module>
<module name="StaticVariableName"/> <!-- Validates identifiers for static, non-final fields. ^[a-z][a-zA-Z0-9]*$ -->
<module name="TypeName" /> <!-- Validates identifiers for classes, interfaces, enums, and annotations. -->
<module name="SuppressWarningsHolder" /> <!-- provide @SuppressWarnings annotations -->
</module>
<module name="SuppressWarningsFilter" /> <!-- filter using @SuppressWarnings annotations -->
</module>

3 changes: 0 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@
<packaging>jar</packaging>

<properties>
<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<camunda.version>7.12.0</camunda.version>
<camunda.spring.boot.version>3.4.0</camunda.spring.boot.version>
Expand Down

0 comments on commit c8193ab

Please sign in to comment.