diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d3f54021dee..33bc64d07f6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,6 +34,9 @@ jobs: run: | cp $GITHUB_WORKSPACE/config/database.yml.actions $GITHUB_WORKSPACE/config/database.yml cp $GITHUB_WORKSPACE/Kitodo-DataManagement/src/main/resources/db/config/flyway.properties.actions $GITHUB_WORKSPACE/Kitodo-DataManagement/src/main/resources/db/config/flyway.properties + mkdir -p $GITHUB_WORKSPACE/config-local + # cp $GITHUB_WORKSPACE/Kitodo/src/main/resources/kitodo_config.properties $GITHUB_WORKSPACE/config-local + # cp $GITHUB_WORKSPACE/Kitodo/src/main/resources/kitodo_projects.xml $GITHUB_WORKSPACE/config-local # Runs a set of commands using the runners shell - name: start mysql @@ -66,8 +69,17 @@ jobs: - name: check maven version run: mvn --version + - name: Run dependency:analyze + run: + mvn -B '-P!development' dependency:analyze + - name: Run production build (required for dependency tree) + run: | + # sudo mkdir -p /usr/local/kitodo/modules + # ls -l /usr/local/kitodo $GITHUB_WORKSPACE + mvn -B '-P!development' clean install + - name: Run dependency:tree + run: + mvn -B '-P!development' dependency:tree - name: run build run: mvn clean install -B '-Pall-tests,flyway,checkstyle,!development' && xvfb-run --server-args="-screen 0 1600x1280x24" mvn clean install -B '-Pselenium,!development' - - diff --git a/Kitodo-DataManagement/pom.xml b/Kitodo-DataManagement/pom.xml index 3e23d11c5b0..3551fe47f63 100644 --- a/Kitodo-DataManagement/pom.xml +++ b/Kitodo-DataManagement/pom.xml @@ -43,10 +43,6 @@ commons-codec commons-codec - - commons-collections - commons-collections - commons-io commons-io diff --git a/Kitodo/pom.xml b/Kitodo/pom.xml index 466cd7b1ee9..04893281531 100644 --- a/Kitodo/pom.xml +++ b/Kitodo/pom.xml @@ -34,6 +34,10 @@ + + org.apache.commons + commons-collections4 + org.apache.tomcat tomcat-servlet-api diff --git a/pom.xml b/pom.xml index 1af50162450..f811ca873a0 100644 --- a/pom.xml +++ b/pom.xml @@ -153,9 +153,9 @@ ${commons-codec.version} - commons-collections - commons-collections - 3.2.2 + org.apache.commons + commons-collections4 + 4.4 org.apache.commons @@ -324,10 +324,6 @@ from system library in Java 11+ --> commons-beanutils commons-beanutils - - commons-collections - commons-collections -