diff --git a/.github/workflows/maven-and-docker.yml b/.github/workflows/maven-and-docker.yml index 46cea61..bb02049 100644 --- a/.github/workflows/maven-and-docker.yml +++ b/.github/workflows/maven-and-docker.yml @@ -28,7 +28,7 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: maven - name: Build with Maven diff --git a/Dockerfile b/Dockerfile index 54a1aaa..8279dea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:17-jre-jammy +FROM eclipse-temurin:21-jre-jammy LABEL MAINTAINERS="Julian Uszkoreit "\ description="Docker image for command line execution of PIA - Protein Inference Algorithms" diff --git a/Dockerfile-dev b/Dockerfile-dev deleted file mode 100644 index 6e37559..0000000 --- a/Dockerfile-dev +++ /dev/null @@ -1,34 +0,0 @@ -# the building container -FROM maven:3-eclipse-temurin-8 AS builder - -RUN mkdir -p /tmp/pia -COPY . /tmp/pia/ -RUN mvn -f /tmp/pia/pom.xml -Dmaven.test.skip --settings /tmp/pia/.mvn/unblock-mirrors.xml package - - -# start the real container -FROM eclipse-temurin:8-jre-focal - -LABEL MAINTAINERS="Julian Uszkoreit "\ - description="Docker image for command line execution of PIA - Protein Inference Algorithms" - -# prepare zip and wget -RUN apt-get update; \ - apt-get install -y unzip wget; \ - apt-get clean - -#preparing directories -RUN mkdir -p /data/in; mkdir -p /data/out; mkdir -p /opt/pia; - -# copy just build PIA zip and uncompress -COPY --from=builder /tmp/pia/target/pia*.zip /opt/pia/pia.zip -RUN cd /opt/pia; \ - unzip pia.zip; \ - rm pia.zip; \ - mv pia*.jar pia.jar; - -# cleanup -RUN apt-get remove -y unzip wget; - -ENTRYPOINT ["java", "-jar", "/opt/pia/pia.jar"] -CMD ["--help"] diff --git a/pom.xml b/pom.xml index 0ac92d7..004ab1e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.mpc.pia pia - 1.4.9 + 1.4.10 PIA - Protein Inference Algorithms https://github.com/mpc-bioinformatics/pia @@ -50,7 +50,7 @@ 0.23 3.6.1 1.13.0 - 5.0.41 + 5.1.5 7.0.2 2.10.1 4.7.5 @@ -59,9 +59,10 @@ 2.12.2 - 1.4.13 + 1.4.14 2.16.0 5.2.5 + 32.1.3-jre 0.0.1-SNAPSHOT @@ -291,6 +292,11 @@ jackson-annotations ${jackson-annotations.version} + + com.google.guava + guava + ${guava.version} + @@ -307,7 +313,7 @@ maven-compiler-plugin 3.11.0 - 17 + 21 @@ -356,7 +362,7 @@ org.jacoco jacoco-maven-plugin - 0.8.8 + 0.8.11 @@ -376,7 +382,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.2 + 3.2.2 ${argLine} -Xmx2560m