Skip to content
This repository has been archived by the owner on May 22, 2021. It is now read-only.

Commit

Permalink
Migrated to maven (#57)
Browse files Browse the repository at this point in the history
* Migrated to maven

* Finished migration and fixed transitive dependencies

Co-authored-by: Steve Hb <[email protected]>
  • Loading branch information
msentwickler and steve-hb authored May 6, 2020
1 parent 2f977f2 commit db7e78d
Show file tree
Hide file tree
Showing 17 changed files with 443 additions and 414 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 1.9
- run: chmod 755 gradlew
- run: ./gradlew build
- run: mvn clean install -Dcheckstyle.skip
3 changes: 1 addition & 2 deletions .github/workflows/checkstyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 1.9
- run: chmod 755 gradlew
- run: ./gradlew checkstyleMain
- run: mvn checkstyle:check -q
3 changes: 1 addition & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 1.9
- run: chmod 755 gradlew
- run: ./gradlew build
- run: mvn clean install -Dcheckstyle.skip

- name: Docker Build & Push
uses: docker/build-push-action@v1
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM adoptopenjdk/openjdk11:alpine-jre

WORKDIR /eedu

COPY /build/libs/gateway-0.0.1-SNAPSHOT.jar gateway.jar
COPY /target/gateway-0.1-SNAPSHOT.jar gateway.jar

EXPOSE 80

Expand Down
92 changes: 0 additions & 92 deletions build.gradle

This file was deleted.

2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env sh

./gradlew build -x checkstyleMain -x checkstyleTest
mvn clean install -Dcheckstyle.skip
3 changes: 0 additions & 3 deletions checkstyle.sh

This file was deleted.

115 changes: 115 additions & 0 deletions checkstyle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">

<module name="Checker">

<!-- Check for new Line at EOF -->
<module name="NewlineAtEndOfFile">
<property name="lineSeparator" value="lf"/>
</module>

<!-- Allow ignoring things with @SuppressWarnings or comment -->
<module name="SuppressWarningsFilter"/>

<!--Check for trailing spaces -->
<module name="RegexpSingleline">
<property name="format" value="(^\t{0,} + (?![\*@]))|([ \t]+$)"/>
<property name="minimum" value="0"/>
<property name="maximum" value="0"/>
<property name="message" value="Line should use tab indentation and have no trailing spaces."/>
</module>

<module name="TreeWalker">

<module name="SuppressionCommentFilter" />

<!-- Ignore if SuppressWarnings or comment -->
<module name="SuppressWarningsHolder"/>

<!-- Check if Methods, Classes, Interfaces and Enums have a Javadoc Comments -->
<module name="JavadocMethod"/>
<module name="JavadocType">
<property name="scope" value="PRIVATE"/>
<property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF"/>
</module>

<!-- Check formatting of Javadoc comments -->
<module name="JavadocStyle">
<property name="checkEmptyJavadoc" value="true"/>
</module>
<module name="JavadocParagraph"/>
<module name="AtclauseOrder">
<property name="tagOrder"
value="@version, @param, @return, @throws, @exception, @see, @since, @serial, @serialField, @serialData, @deprecated"/>
<property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
</module>
<module name="NonEmptyAtclauseDescription"/>

<!-- Check imports -->
<module name="UnusedImports"/>
<module name="AvoidStarImport"/>
<module name="RedundantImport"/>
<module name="IllegalImport">
<property name="illegalPkgs" value="java.awt, java.sql, javafx, sun"/>
</module>

<!-- Check declaration order of variables -->
<module name="DeclarationOrder"/>

<!-- Check if Constants are written in Capital Letters -->
<module name="ConstantName"/>

<!-- Check if Package Name is correct -->
<module name="PackageName"/>

<!-- Check if non static fields begin lower case -->
<module name="MemberName"/>

<!-- Check if method identifiers begin lower case -->
<module name="MethodName"/>

<!-- Check empty line separators -->
<module name="EmptyLineSeparator">
<property name="tokens"
value="IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF, STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF"/>
</module>

<!-- Check default is at end of switch if there is one -->
<module name="DefaultComesLast"/>

<!-- Check if package declaration is correct -->
<module name="PackageDeclaration"/>

<!-- Check different whitespaces -->
<module name="EmptyForIteratorPad"/>
<module name="GenericWhitespace"/>
<module name="MethodParamPad"/>
<module name="ParenPad"/>
<module name="WhitespaceAfter"/>
<module name="WhitespaceAround"/>
<module name="SingleSpaceSeparator"/>

<!-- Check Blocks -->
<module name="EmptyBlock"/>
<module name="LeftCurly"/>
<module name="RightCurly"/>

<!-- Check Code -->
<module name="EmptyStatement"/>
<module name="EqualsHashCode"/>
<module name="MissingSwitchDefault"/>
<module name="IllegalThrows"/>
<module name="IllegalCatch"/>
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
<module name="OneStatementPerLine"/>
<module name="ModifiedControlVariable"/>
<module name="RequireThis"/>
<module name="StringLiteralEquality"/>

<!-- Check Misc -->
<module name="ArrayTypeStyle"/>
</module>
</module>
Binary file removed gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 0 additions & 6 deletions gradle/wrapper/gradle-wrapper.properties

This file was deleted.

Loading

0 comments on commit db7e78d

Please sign in to comment.