diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a2bc338..53e808e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,15 +1,11 @@ version: 2 registries: - maven-github-uio-bmi: + maven-github-elixir-no: type: maven-repository - url: 'https://maven.pkg.github.com/uio-bmi' - username: '${{secrets.MAVEN_USER}}' - password: '${{secrets.MAVEN_GITHUB}}' - maven-github-elixir-oslo: - type: maven-repository - url: 'https://maven.pkg.github.com/elixir-oslo' + url: 'https://maven.pkg.github.com/ELIXIR-NO' username: '${{secrets.MAVEN_USER}}' password: '${{secrets.MAVEN_GITHUB}}' + updates: - package-ecosystem: maven directory: "/" diff --git a/.github/workflows/build-and-scan-PR-container.yml b/.github/workflows/build-and-scan-PR-container.yml index 075fd92..e183996 100644 --- a/.github/workflows/build-and-scan-PR-container.yml +++ b/.github/workflows/build-and-scan-PR-container.yml @@ -17,12 +17,7 @@ jobs: with: servers: | [{ - "id":"github-clearinghouse", - "username": "${{github.actor}}", - "password": "${{ secrets.GITHUB_TOKEN }}" - }, - { - "id":"github-crypt4gh", + "id":"github-fega-norway", "username": "${{github.actor}}", "password": "${{ secrets.GITHUB_TOKEN }}" }] diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml index 58bd543..3cbd7cc 100644 --- a/.github/workflows/docker-build-test.yml +++ b/.github/workflows/docker-build-test.yml @@ -20,12 +20,7 @@ jobs: with: servers: | [{ - "id":"github-clearinghouse", - "username": "${{ github.actor }}", - "password": "${{ secrets.GITHUB_TOKEN }}" - }, - { - "id":"github-crypt4gh", + "id":"github-fega-norway", "username": "${{ github.actor }}", "password": "${{ secrets.GITHUB_TOKEN }}" }] diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0695334..8e7e8db 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -59,12 +59,7 @@ jobs: with: servers: | [{ - "id":"github-clearinghouse", - "username": "${{ github.actor }}", - "password": "${{ secrets.GITHUB_TOKEN }}" - }, - { - "id":"github-crypt4gh", + "id":"github-fega-norway", "username": "${{ github.actor }}", "password": "${{ secrets.GITHUB_TOKEN }}" }] diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d41088d..3aefaf6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -74,12 +74,7 @@ jobs: with: servers: | [{ - "id":"github-clearinghouse", - "username": "${{github.actor}}", - "password": "${{ secrets.GITHUB_TOKEN }}" - }, - { - "id":"github-crypt4gh", + "id":"github-fega-norway", "username": "${{github.actor}}", "password": "${{ secrets.GITHUB_TOKEN }}" }] diff --git a/pom.xml b/pom.xml index 88ac4ff..c4b56e2 100644 --- a/pom.xml +++ b/pom.xml @@ -19,6 +19,11 @@ + + com.google.code.gson + gson + 2.11.0 + org.springframework.boot spring-boot-starter-data-jpa @@ -110,9 +115,9 @@ test - no.uio.ifi + no.elixir crypt4gh - 2.5.0 + 3.0.1 org.slf4j @@ -123,7 +128,7 @@ no.elixir clearinghouse - 2.0.1 + 2.0.2 org.slf4j @@ -140,14 +145,8 @@ - github-clearinghouse - elixir-oslo-clearinghouse - https://maven.pkg.github.com/elixir-oslo/clearinghouse - - - github-crypt4gh - uio-bmi-Crypt4GH - https://maven.pkg.github.com/uio-bmi/crypt4gh + github-fega-norway + https://maven.pkg.github.com/ELIXIR-NO/FEGA-Norway diff --git a/src/main/java/no/uio/ifi/localega/doa/services/StreamingService.java b/src/main/java/no/uio/ifi/localega/doa/services/StreamingService.java index b59ecd8..a887cb2 100644 --- a/src/main/java/no/uio/ifi/localega/doa/services/StreamingService.java +++ b/src/main/java/no/uio/ifi/localega/doa/services/StreamingService.java @@ -4,13 +4,13 @@ import io.minio.MinioClient; import io.minio.errors.*; import lombok.extern.slf4j.Slf4j; -import no.uio.ifi.crypt4gh.pojo.header.DataEditList; -import no.uio.ifi.crypt4gh.pojo.header.Header; -import no.uio.ifi.crypt4gh.pojo.header.HeaderPacket; -import no.uio.ifi.crypt4gh.pojo.header.X25519ChaCha20IETFPoly1305HeaderPacket; -import no.uio.ifi.crypt4gh.stream.Crypt4GHInputStream; -import no.uio.ifi.crypt4gh.util.Crypt4GHUtils; -import no.uio.ifi.crypt4gh.util.KeyUtils; +import no.elixir.crypt4gh.pojo.header.DataEditList; +import no.elixir.crypt4gh.pojo.header.Header; +import no.elixir.crypt4gh.pojo.header.HeaderPacket; +import no.elixir.crypt4gh.pojo.header.X25519ChaCha20IETFPoly1305HeaderPacket; +import no.elixir.crypt4gh.stream.Crypt4GHInputStream; +import no.elixir.crypt4gh.util.Crypt4GHUtils; +import no.elixir.crypt4gh.util.KeyUtils; import no.uio.ifi.localega.doa.dto.DestinationFormat; import no.uio.ifi.localega.doa.model.LEGADataset; import no.uio.ifi.localega.doa.model.LEGAFile; diff --git a/src/test/java/no/uio/ifi/localega/doa/LocalEGADOAApplicationTests.java b/src/test/java/no/uio/ifi/localega/doa/LocalEGADOAApplicationTests.java index aebad2a..12fb76a 100644 --- a/src/test/java/no/uio/ifi/localega/doa/LocalEGADOAApplicationTests.java +++ b/src/test/java/no/uio/ifi/localega/doa/LocalEGADOAApplicationTests.java @@ -11,8 +11,8 @@ import kong.unirest.json.JSONArray; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import no.uio.ifi.crypt4gh.stream.Crypt4GHInputStream; -import no.uio.ifi.crypt4gh.util.KeyUtils; +import no.elixir.crypt4gh.stream.Crypt4GHInputStream; +import no.elixir.crypt4gh.util.KeyUtils; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils;