Skip to content

Commit 234e52d

Browse files
kosarkokosarko
authored
Merge pull request #1282 from ufal/dataquest/dtq-dev
dataquest-dev/dtq-dev -> lindat sync
2 parents 8467ef1 + f8559fb commit 234e52d

File tree

647 files changed

+19618
-10941
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

647 files changed

+19618
-10941
lines changed

‎.github/dependabot.yml‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
#-------------------
2+
# DSpace's dependabot rules. Enables maven updates for all dependencies on a weekly basis
3+
# for main and any maintenance branches. Security updates only apply to main.
4+
#-------------------
5+
version: 2
6+
updates:
7+
- package-ecosystem: "maven"
8+
directory: "/"
9+
schedule:
10+
interval: "weekly"
11+
# Allow up to 10 open PRs for dependencies
12+
open-pull-requests-limit: 10
13+
# Group together some upgrades in a single PR
14+
groups:
15+
# Group together all Build Tools in a single PR
16+
build-tools:
17+
applies-to: version-updates
18+
patterns:
19+
- "org.apache.maven.plugins:*"
20+
- "*:*-maven-plugin"
21+
- "*:maven-*-plugin"
22+
- "com.github.spotbugs:spotbugs"
23+
- "com.google.code.findbugs:*"
24+
- "com.google.errorprone:*"
25+
- "com.puppycrawl.tools:checkstyle"
26+
- "org.sonatype.plugins:*"
27+
exclude-patterns:
28+
# Exclude anything from Spring, as that is in a separate group
29+
- "org.springframework.*:*"
30+
update-types:
31+
- "minor"
32+
- "patch"
33+
test-tools:
34+
applies-to: version-updates
35+
patterns:
36+
- "junit:*"
37+
- "com.github.stefanbirker:system-rules"
38+
- "com.h2database:*"
39+
- "io.findify:s3mock*"
40+
- "io.netty:*"
41+
- "org.hamcrest:*"
42+
- "org.mock-server:*"
43+
- "org.mockito:*"
44+
update-types:
45+
- "minor"
46+
- "patch"
47+
# Group together all Apache Commons deps in a single PR
48+
apache-commons:
49+
applies-to: version-updates
50+
patterns:
51+
- "org.apache.commons:*"
52+
- "commons-*:commons-*"
53+
update-types:
54+
- "minor"
55+
- "patch"
56+
# Group together all fasterxml deps in a single PR
57+
fasterxml:
58+
applies-to: version-updates
59+
patterns:
60+
- "com.fasterxml:*"
61+
- "com.fasterxml.*:*"
62+
update-types:
63+
- "minor"
64+
- "patch"
65+
# Group together all Hibernate deps in a single PR
66+
hibernate:
67+
applies-to: version-updates
68+
patterns:
69+
- "org.hibernate.*:*"
70+
update-types:
71+
- "minor"
72+
- "patch"
73+
# Group together all Jakarta deps in a single PR
74+
jakarta:
75+
applies-to: version-updates
76+
patterns:
77+
- "jakarta.*:*"
78+
- "org.eclipse.angus:jakarta.mail"
79+
- "org.glassfish.jaxb:jaxb-runtime"
80+
update-types:
81+
- "minor"
82+
- "patch"
83+
# Group together all Google deps in a single PR
84+
google-apis:
85+
applies-to: version-updates
86+
patterns:
87+
- "com.google.apis:*"
88+
- "com.google.api-client:*"
89+
- "com.google.http-client:*"
90+
- "com.google.oauth-client:*"
91+
update-types:
92+
- "minor"
93+
- "patch"
94+
# Group together all Spring deps in a single PR
95+
spring:
96+
applies-to: version-updates
97+
patterns:
98+
- "org.springframework:*"
99+
- "org.springframework.*:*"
100+
update-types:
101+
- "minor"
102+
- "patch"
103+
# Group together all WebJARs deps in a single PR
104+
webjars:
105+
applies-to: version-updates
106+
patterns:
107+
- "org.webjars:*"
108+
- "org.webjars.*:*"
109+
update-types:
110+
- "minor"
111+
- "patch"
112+
ignore:
113+
# Don't try to auto-update any DSpace dependencies
114+
- dependency-name: "org.dspace:*"
115+
- dependency-name: "org.dspace.*:*"
116+
# Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
117+
- dependency-name: "*"
118+
update-types: ["version-update:semver-major"]

‎.github/issue_template.md‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
## Problem Description
2+
3+
---
4+
5+
6+
## Steps to Reproduce Problem
7+
8+
9+
---
10+
11+
12+
## Additional Info
13+
(Logs, screenshots, configuration, etc.)
14+
15+
---
16+
17+
## Pre-check
18+
- [ ] Confirmed in upstream
19+
- [ ] Verified that it’s not already fixed or being worked on?
20+
21+
---
22+
23+
## Workflow
24+
- [ ] Replicate the issue.
25+
- [ ] Explore possible solutions and estimate the required time.
26+
- [ ] Write a test or include it in manual testing scenarios.
27+
- [ ] Code to pass the tests.
28+
- [ ] Refactor and review.
29+
- [ ] Update documentation.
30+
31+
---
32+

‎.github/pull_request_template.md‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
| Phases | MP | MM | MB | MR | JM | Total |
2-
|-----------------|----:|----:|----:|-----:|-----:|-------:|
3-
| ETA | 0 | 0 | 0 | 0 | 0 | 0 |
4-
| Developing | 0 | 0 | 0 | 0 | 0 | 0 |
5-
| Review | 0 | 0 | 0 | 0 | 0 | 0 |
6-
| Total | - | - | - | - | - | 0 |
7-
| ETA est. | | | | | | 0 |
8-
| ETA cust. | - | - | - | - | - | 0 |
91
## Problem description
10-
### Reported issues
11-
### Not-reported issues
2+
123
## Analysis
134
(Write here, if there is needed describe some specific problem. Erase it, when it is not needed.)
145
## Problems
156
(Write here, if some unexpected problems occur during solving issues. Erase it, when it is not needed.)
7+
8+
### Manual Testing (if applicable)
9+
- [ ] Added to [testing scenarios](https://github.com/dataquest-dev/dspace-customers/issues/55)
10+
11+
### Copilot review
12+
- [ ] Requested review from Copilot

‎.github/workflows/build.yml‎

Lines changed: 35 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212
- clarin-v7
1313
- customer/*
1414
pull_request:
15+
workflow_dispatch:
1516

1617
permissions:
1718
contents: read # to fetch code (actions/checkout)
@@ -56,20 +57,11 @@ jobs:
5657

5758
# https://github.com/actions/setup-java
5859
- name: Install JDK ${{ matrix.java }}
59-
uses: actions/setup-java@v3
60+
uses: actions/setup-java@v4
6061
with:
6162
java-version: ${{ matrix.java }}
6263
distribution: 'temurin'
63-
64-
# https://github.com/actions/cache
65-
- name: Cache Maven dependencies
66-
uses: actions/cache@v3
67-
with:
68-
# Cache entire ~/.m2/repository
69-
path: ~/.m2/repository
70-
# Cache key is hash of all pom.xml files. Therefore any changes to POMs will invalidate cache
71-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
72-
restore-keys: ${{ runner.os }}-maven-
64+
cache: 'maven'
7365

7466
# Run parallel Maven builds based on the above 'strategy.matrix'
7567
- name: Run Maven ${{ matrix.type }}
@@ -94,31 +86,35 @@ jobs:
9486
path: 'dspace/target/site/jacoco-aggregate/jacoco.xml'
9587
retention-days: 14
9688

97-
# # Codecov upload is a separate job in order to allow us to restart this separate from the entire build/test
98-
# # job above. This is necessary because Codecov uploads seem to randomly fail at times.
99-
# # See https://community.codecov.com/t/upload-issues-unable-to-locate-build-via-github-actions-api/3954
100-
# codecov:
101-
# # Must run after 'tests' job above
102-
# needs: tests
103-
# runs-on: ubuntu-latest
104-
# steps:
105-
# - name: Checkout
106-
# uses: actions/checkout@v3
107-
108-
# # Download artifacts from previous 'tests' job
109-
# - name: Download coverage artifacts
110-
# uses: actions/download-artifact@v3
111-
112-
# # Now attempt upload to Codecov using its action.
113-
# # NOTE: We use a retry action to retry the Codecov upload if it fails the first time.
114-
# #
115-
# # Retry action: https://github.com/marketplace/actions/retry-action
116-
# # Codecov action: https://github.com/codecov/codecov-action
117-
# - name: Upload coverage to Codecov.io
118-
# uses: Wandalen/wretry.action@v1.0.36
119-
# with:
120-
# action: codecov/codecov-action@v3
121-
# # Try upload 5 times max
122-
# attempt_limit: 5
123-
# # Run again in 30 seconds
124-
# attempt_delay: 30000
89+
# # Codecov upload is a separate job in order to allow us to restart this separate from the entire build/test
90+
# # job above. This is necessary because Codecov uploads seem to randomly fail at times.
91+
# # See https://community.codecov.com/t/upload-issues-unable-to-locate-build-via-github-actions-api/3954
92+
# codecov:
93+
# # Must run after 'tests' job above
94+
# needs: tests
95+
# runs-on: ubuntu-latest
96+
# steps:
97+
# - name: Checkout
98+
# uses: actions/checkout@v4
99+
#
100+
# # Download artifacts from previous 'tests' job
101+
# - name: Download coverage artifacts
102+
# uses: actions/download-artifact@v4
103+
#
104+
# # Now attempt upload to Codecov using its action.
105+
# # NOTE: We use a retry action to retry the Codecov upload if it fails the first time.
106+
# #
107+
# # Retry action: https://github.com/marketplace/actions/retry-action
108+
# # Codecov action: https://github.com/codecov/codecov-action
109+
# - name: Upload coverage to Codecov.io
110+
# uses: Wandalen/wretry.action@v1.3.0
111+
# with:
112+
# action: codecov/codecov-action@v4
113+
# # Ensure codecov-action throws an error when it fails to upload
114+
# with: |
115+
# fail_ci_if_error: true
116+
# token: ${{ secrets.CODECOV_TOKEN }}
117+
# # Try re-running action 5 times max
118+
# attempt_limit: 5
119+
# # Run again in 30 seconds
120+
# attempt_delay: 30000

‎.github/workflows/codescan.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ jobs:
3131
steps:
3232
# https://github.com/actions/checkout
3333
- name: Checkout repository
34-
uses: actions/checkout@v3
34+
uses: actions/checkout@v4
3535

3636
# https://github.com/actions/setup-java
3737
- name: Install JDK
38-
uses: actions/setup-java@v3
38+
uses: actions/setup-java@v4
3939
with:
4040
java-version: 11
4141
distribution: 'temurin'

‎.github/workflows/docker.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
build_id: dspace-dependencies
3232
image_name: ufal/dspace-dependencies
3333
dockerfile_path: ./Dockerfile.dependencies
34-
34+
3535

3636
#######################################
3737
# Build/Push the 'ufal/dspace' image
@@ -43,7 +43,7 @@ jobs:
4343
needs: dspace-dependencies
4444
uses: ./.github/workflows/reusable-docker-build.yml
4545
with:
46-
build_id: dspace
46+
build_id: dspace-prod
4747
image_name: ufal/dspace
4848
dockerfile_path: ./Dockerfile
4949
run_python_version_script: true

‎.github/workflows/issue_opened.yml‎

Whitespace-only changes.

‎.github/workflows/pull_request_opened.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
# Assign the PR to whomever created it. This is useful for visualizing assignments on project boards
2222
# See https://github.com/toshimaru/auto-author-assign
2323
- name: Assign PR to creator
24-
uses: toshimaru/auto-author-assign@v1.6.2
24+
uses: toshimaru/auto-author-assign@v2.1.0

0 commit comments

Comments
 (0)