Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace old commons-collections:commons-collections by org.apache.commons:commons-collections4 #6144

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

Replace old commons-collections:commons-collections by org.apache.commons:commons-collections4 #6144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c1045fc
Replace old commons-collections:commons-collections by org.apache.com…
stweil Jul 24, 2024
ae702b4
Moved dependency org.apache.commons:commons-collections4 from Kitodo-…
stweil Jul 25, 2024
ab4bc04
Analyze dependencies and show dependency tree in GitHub CI action
stweil Jul 25, 2024
80c3697
CI: Add config-local/kitodo_projects.xml which is required for depend…
stweil Jul 25, 2024
b09475e
CI: Add config-local/kitodo_config.properties which is required for d…
stweil Jul 25, 2024
1f010e9
CI: Run production build which is required for dependency:tree
stweil Jul 25, 2024
e48caf6
CI: Create directory which is required for development build
stweil Jul 25, 2024
f344e66
CI: Run production build which is required for dependency:tree
stweil Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'


4 changes: 0 additions & 4 deletions Kitodo-DataManagement/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
Expand Down
4 changes: 4 additions & 0 deletions Kitodo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@
</properties>

<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
Expand Down
10 changes: 3 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,9 @@
<version>${commons-codec.version}</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.2</version>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>4.4</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -324,10 +324,6 @@ from system library in Java 11+ -->
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</exclusion>
<exclusion>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
Loading