diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml new file mode 100644 index 0000000..7d30e1b --- /dev/null +++ b/.github/workflows/CI.yaml @@ -0,0 +1,27 @@ +name: Build +on: + push: + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@main + + - name: Setup java 8 + uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: '8' + cache: 'gradle' + + - name: Gradle Wrapper Validation + uses: gradle/wrapper-validation-action@v1.0.4 + + - name: Setup Gradle + uses: gradle/gradle-build-action@v3 + + - name: Build with Gradle + run: ./gradlew build \ No newline at end of file diff --git a/.github/workflows/publish_to_reposolite.yaml b/.github/workflows/publish_to_reposolite.yaml new file mode 100644 index 0000000..abff151 --- /dev/null +++ b/.github/workflows/publish_to_reposolite.yaml @@ -0,0 +1,39 @@ +name: Publish to Reposilite + +on: + release: + types: [ published ] + +jobs: + publish: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@main + + - name: Set version + run: | + echo "RELEASE_VERSION=$(echo ${GITHUB_REF#refs/*/} | sed "s/^v//")" >> $GITHUB_ENV + echo "refs: ${{ github.ref }}" + + - name: Set up JDK 8 + uses: actions/setup-java@v4 + with: + java-version: '8' + distribution: 'adopt' + + - name: Gradle Wrapper Validation + uses: gradle/wrapper-validation-action@v2 + + - name: Gradle Setup + uses: gradle/actions/setup-gradle@v3 + with: + gradle-version: wrapper + + - name: Gradle build + run: ./gradlew clean build publish -Pversion=${{ env.RELEASE_VERSION }} + + env: + REPOSILITE_USERNAME: ${{ secrets.REPOSILITE_USERNAME }} + REPOSILITE_PASSWORD: ${{ secrets.REPOSILITE_PASSWORD }} \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 5554d63..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,31 +0,0 @@ -pipeline { - agent { - docker { - label 'docker' - image 'gradle:4.6.0-jdk8-alpine' - } - } - stages { - stage('Build') { - steps { - sh 'gradle --no-daemon clean build' - archiveArtifacts 'build/libs/*.jar' - } - } - stage('Deploy') { - environment { - REPOSILITE = credentials('reposilite') - } - when { - tag pattern: "v\\d+\\.\\d+\\.\\d+(-\\w+-\\d+)?", comparator: "REGEXP" - } - steps { - script { - VERSION = TAG_NAME[1..-1] - } - sh "echo Version is ${VERSION}" - sh "gradle --no-daemon -Pversion=${VERSION} -PreposiliteUsername=${REPOSILITE_USR} -PreposiliteToken=${REPOSILITE_PSW} publish" - } - } - } -} diff --git a/README.md b/README.md index 11cb45b..131a097 100644 --- a/README.md +++ b/README.md @@ -12,11 +12,11 @@ build.gradle ```groovy repositories { maven { - url "http://dl.bintray.com/fint/maven" + url "http://repo.fintlabs.no/releases" } } -compile('no.fint:fint-event-model:3.0.0') +implementation 'no.fintlabs:fint-event-model:4.0.0' ``` ## Usage diff --git a/build.gradle b/build.gradle index 409e632..26c6e79 100644 --- a/build.gradle +++ b/build.gradle @@ -53,4 +53,4 @@ jacocoTestReport { } } -apply from: 'https://raw.githubusercontent.com/FINTLabs/fint-buildscripts/master/reposilite.gradle' +apply from: 'https://raw.githubusercontent.com/FINTLabs/fint-buildscripts/master/reposilite.ga.gradle' diff --git a/src/main/java/no/fint/event/model/DefaultActions.java b/src/main/java/no/fintlabs/event/model/DefaultActions.java similarity index 79% rename from src/main/java/no/fint/event/model/DefaultActions.java rename to src/main/java/no/fintlabs/event/model/DefaultActions.java index 71861f2..e8aef8e 100644 --- a/src/main/java/no/fint/event/model/DefaultActions.java +++ b/src/main/java/no/fintlabs/event/model/DefaultActions.java @@ -1,11 +1,13 @@ -package no.fint.event.model; +package no.fintlabs.event.model; + +import no.fintlabs.event.model.health.Health; import java.util.Arrays; import java.util.List; public enum DefaultActions { /** - * Tells the adapter to check communication with application and that the adapter can perform necessary actions {@link no.fint.event.model.health.Health} + * Tells the adapter to check communication with application and that the adapter can perform necessary actions {@link Health} */ HEALTH, /** diff --git a/src/main/java/no/fint/event/model/Event.java b/src/main/java/no/fintlabs/event/model/Event.java similarity index 99% rename from src/main/java/no/fint/event/model/Event.java rename to src/main/java/no/fintlabs/event/model/Event.java index b029ae7..62a5cd4 100644 --- a/src/main/java/no/fint/event/model/Event.java +++ b/src/main/java/no/fintlabs/event/model/Event.java @@ -1,4 +1,4 @@ -package no.fint.event.model; +package no.fintlabs.event.model; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/no/fint/event/model/EventRequest.java b/src/main/java/no/fintlabs/event/model/EventRequest.java similarity index 90% rename from src/main/java/no/fint/event/model/EventRequest.java rename to src/main/java/no/fintlabs/event/model/EventRequest.java index da99c09..4713cce 100644 --- a/src/main/java/no/fint/event/model/EventRequest.java +++ b/src/main/java/no/fintlabs/event/model/EventRequest.java @@ -1,4 +1,4 @@ -package no.fint.event.model; +package no.fintlabs.event.model; import lombok.Data; diff --git a/src/main/java/no/fint/event/model/EventResponse.java b/src/main/java/no/fintlabs/event/model/EventResponse.java similarity index 96% rename from src/main/java/no/fint/event/model/EventResponse.java rename to src/main/java/no/fintlabs/event/model/EventResponse.java index c71b928..780e9be 100644 --- a/src/main/java/no/fint/event/model/EventResponse.java +++ b/src/main/java/no/fintlabs/event/model/EventResponse.java @@ -1,4 +1,4 @@ -package no.fint.event.model; +package no.fintlabs.event.model; import lombok.Data; diff --git a/src/main/java/no/fint/event/model/EventUtil.java b/src/main/java/no/fintlabs/event/model/EventUtil.java similarity index 98% rename from src/main/java/no/fint/event/model/EventUtil.java rename to src/main/java/no/fintlabs/event/model/EventUtil.java index e89f96a..b7fc543 100644 --- a/src/main/java/no/fint/event/model/EventUtil.java +++ b/src/main/java/no/fintlabs/event/model/EventUtil.java @@ -1,4 +1,4 @@ -package no.fint.event.model; +package no.fintlabs.event.model; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/src/main/java/no/fint/event/model/HeaderConstants.java b/src/main/java/no/fintlabs/event/model/HeaderConstants.java similarity index 89% rename from src/main/java/no/fint/event/model/HeaderConstants.java rename to src/main/java/no/fintlabs/event/model/HeaderConstants.java index 882d15e..183e2a2 100644 --- a/src/main/java/no/fint/event/model/HeaderConstants.java +++ b/src/main/java/no/fintlabs/event/model/HeaderConstants.java @@ -1,4 +1,4 @@ -package no.fint.event.model; +package no.fintlabs.event.model; public enum HeaderConstants { ; diff --git a/src/main/java/no/fint/event/model/Operation.java b/src/main/java/no/fintlabs/event/model/Operation.java similarity index 94% rename from src/main/java/no/fint/event/model/Operation.java rename to src/main/java/no/fintlabs/event/model/Operation.java index c0503d1..1157d7a 100644 --- a/src/main/java/no/fint/event/model/Operation.java +++ b/src/main/java/no/fintlabs/event/model/Operation.java @@ -1,4 +1,4 @@ -package no.fint.event.model; +package no.fintlabs.event.model; public enum Operation { diff --git a/src/main/java/no/fint/event/model/Problem.java b/src/main/java/no/fintlabs/event/model/Problem.java similarity index 94% rename from src/main/java/no/fint/event/model/Problem.java rename to src/main/java/no/fintlabs/event/model/Problem.java index d6fad18..c7a8a08 100644 --- a/src/main/java/no/fint/event/model/Problem.java +++ b/src/main/java/no/fintlabs/event/model/Problem.java @@ -1,4 +1,4 @@ -package no.fint.event.model; +package no.fintlabs.event.model; import lombok.Data; diff --git a/src/main/java/no/fint/event/model/ResponseStatus.java b/src/main/java/no/fintlabs/event/model/ResponseStatus.java similarity index 96% rename from src/main/java/no/fint/event/model/ResponseStatus.java rename to src/main/java/no/fintlabs/event/model/ResponseStatus.java index 3cf3ae8..7c4fd36 100644 --- a/src/main/java/no/fint/event/model/ResponseStatus.java +++ b/src/main/java/no/fintlabs/event/model/ResponseStatus.java @@ -1,4 +1,4 @@ -package no.fint.event.model; +package no.fintlabs.event.model; /** * The response status indicates the result of the event from the adapter. diff --git a/src/main/java/no/fint/event/model/Status.java b/src/main/java/no/fintlabs/event/model/Status.java similarity index 98% rename from src/main/java/no/fint/event/model/Status.java rename to src/main/java/no/fintlabs/event/model/Status.java index 56860a7..12d2011 100644 --- a/src/main/java/no/fint/event/model/Status.java +++ b/src/main/java/no/fintlabs/event/model/Status.java @@ -1,4 +1,4 @@ -package no.fint.event.model; +package no.fintlabs.event.model; /** * The Status Enum indicates what step the {@link Event} is at. The steps can be: diff --git a/src/main/java/no/fint/event/model/health/Health.java b/src/main/java/no/fintlabs/event/model/health/Health.java similarity index 97% rename from src/main/java/no/fint/event/model/health/Health.java rename to src/main/java/no/fintlabs/event/model/health/Health.java index cbe4858..4577e5c 100644 --- a/src/main/java/no/fint/event/model/health/Health.java +++ b/src/main/java/no/fintlabs/event/model/health/Health.java @@ -1,4 +1,4 @@ -package no.fint.event.model.health; +package no.fintlabs.event.model.health; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.AllArgsConstructor; diff --git a/src/main/java/no/fint/event/model/health/HealthStatus.java b/src/main/java/no/fintlabs/event/model/health/HealthStatus.java similarity index 96% rename from src/main/java/no/fint/event/model/health/HealthStatus.java rename to src/main/java/no/fintlabs/event/model/health/HealthStatus.java index 87bb493..525abd7 100644 --- a/src/main/java/no/fint/event/model/health/HealthStatus.java +++ b/src/main/java/no/fintlabs/event/model/health/HealthStatus.java @@ -1,4 +1,4 @@ -package no.fint.event.model.health; +package no.fintlabs.event.model.health; public enum HealthStatus { /** diff --git a/src/test/groovy/no/fint/event/model/DefaultActionsSpec.groovy b/src/test/groovy/no/fintlabs/event/model/DefaultActionsSpec.groovy similarity index 88% rename from src/test/groovy/no/fint/event/model/DefaultActionsSpec.groovy rename to src/test/groovy/no/fintlabs/event/model/DefaultActionsSpec.groovy index f8732b4..308f0c5 100644 --- a/src/test/groovy/no/fint/event/model/DefaultActionsSpec.groovy +++ b/src/test/groovy/no/fintlabs/event/model/DefaultActionsSpec.groovy @@ -1,4 +1,4 @@ -package no.fint.event.model +package no.fintlabs.event.model import spock.lang.Specification diff --git a/src/test/groovy/no/fint/event/model/EventSpec.groovy b/src/test/groovy/no/fintlabs/event/model/EventSpec.groovy similarity index 99% rename from src/test/groovy/no/fint/event/model/EventSpec.groovy rename to src/test/groovy/no/fintlabs/event/model/EventSpec.groovy index 13df122..4a6caa9 100644 --- a/src/test/groovy/no/fint/event/model/EventSpec.groovy +++ b/src/test/groovy/no/fintlabs/event/model/EventSpec.groovy @@ -1,4 +1,4 @@ -package no.fint.event.model +package no.fintlabs.event.model import com.fasterxml.jackson.databind.ObjectMapper import groovy.json.JsonSlurper diff --git a/src/test/groovy/no/fint/event/model/EventUtilSpec.groovy b/src/test/groovy/no/fintlabs/event/model/EventUtilSpec.groovy similarity index 98% rename from src/test/groovy/no/fint/event/model/EventUtilSpec.groovy rename to src/test/groovy/no/fintlabs/event/model/EventUtilSpec.groovy index 4286482..ec31a74 100644 --- a/src/test/groovy/no/fint/event/model/EventUtilSpec.groovy +++ b/src/test/groovy/no/fintlabs/event/model/EventUtilSpec.groovy @@ -1,9 +1,9 @@ -package no.fint.event.model +package no.fintlabs.event.model import com.fasterxml.jackson.core.JsonProcessingException import com.fasterxml.jackson.core.type.TypeReference import com.fasterxml.jackson.databind.ObjectMapper -import no.fint.event.model.testutils.TestDto +import no.fintlabs.event.model.testutils.TestDto import spock.lang.Specification diff --git a/src/test/groovy/no/fint/event/model/StatusSpec.groovy b/src/test/groovy/no/fintlabs/event/model/StatusSpec.groovy similarity index 89% rename from src/test/groovy/no/fint/event/model/StatusSpec.groovy rename to src/test/groovy/no/fintlabs/event/model/StatusSpec.groovy index 6b70f67..f2a21f5 100644 --- a/src/test/groovy/no/fint/event/model/StatusSpec.groovy +++ b/src/test/groovy/no/fintlabs/event/model/StatusSpec.groovy @@ -1,4 +1,4 @@ -package no.fint.event.model +package no.fintlabs.event.model import spock.lang.Specification diff --git a/src/test/groovy/no/fint/event/model/health/HealthSpec.groovy b/src/test/groovy/no/fintlabs/event/model/health/HealthSpec.groovy similarity index 97% rename from src/test/groovy/no/fint/event/model/health/HealthSpec.groovy rename to src/test/groovy/no/fintlabs/event/model/health/HealthSpec.groovy index 163c0a0..c4eb832 100644 --- a/src/test/groovy/no/fint/event/model/health/HealthSpec.groovy +++ b/src/test/groovy/no/fintlabs/event/model/health/HealthSpec.groovy @@ -1,4 +1,4 @@ -package no.fint.event.model.health +package no.fintlabs.event.model.health import spock.lang.Specification diff --git a/src/test/groovy/no/fint/event/model/testutils/TestDto.java b/src/test/groovy/no/fintlabs/event/model/testutils/TestDto.java similarity index 87% rename from src/test/groovy/no/fint/event/model/testutils/TestDto.java rename to src/test/groovy/no/fintlabs/event/model/testutils/TestDto.java index 51be58c..c9183f3 100644 --- a/src/test/groovy/no/fint/event/model/testutils/TestDto.java +++ b/src/test/groovy/no/fintlabs/event/model/testutils/TestDto.java @@ -1,4 +1,4 @@ -package no.fint.event.model.testutils; +package no.fintlabs.event.model.testutils; public class TestDto { private String value;