Skip to content

Commit 75d0e90

Browse files
committed
Revert "Merge branch '11670-notification-of-moved-datasets' of https://github.com/IQSS/dataverse into 11670-notification-of-moved-datasets"
This reverts commit 5a603fd, reversing changes made to f74130c.
1 parent 3f8dfd0 commit 75d0e90

78 files changed

Lines changed: 320 additions & 2088 deletions

File tree

Some content is hidden

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

.github/actions/setup-maven/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ runs:
2323
echo "JAVA_VERSION=$(grep '<target.java.version>' ${GITHUB_WORKSPACE}/modules/dataverse-parent/pom.xml | cut -f2 -d'>' | cut -f1 -d'<')" | tee -a ${GITHUB_ENV}
2424
- name: Set up JDK ${{ env.JAVA_VERSION }}
2525
id: setup-java
26-
uses: actions/setup-java@v5
26+
uses: actions/setup-java@v4
2727
with:
2828
java-version: ${{ env.JAVA_VERSION }}
2929
distribution: 'temurin'

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171

7272
# Initializes the CodeQL tools for scanning.
7373
- name: Initialize CodeQL
74-
uses: github/codeql-action/init@v4
74+
uses: github/codeql-action/init@v3
7575
with:
7676
languages: ${{ matrix.language }}
7777
build-mode: ${{ matrix.build-mode }}
@@ -99,6 +99,6 @@ jobs:
9999
exit 1
100100
101101
- name: Perform CodeQL Analysis
102-
uses: github/codeql-action/analyze@v4
102+
uses: github/codeql-action/analyze@v3
103103
with:
104104
category: "/language:${{matrix.language}}"

.github/workflows/container_app_pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- uses: actions/checkout@v5
2424
with:
2525
ref: 'refs/pull/${{ github.event.client_payload.pull_request.number }}/merge'
26-
- uses: actions/setup-java@v5
26+
- uses: actions/setup-java@v4
2727
with:
2828
java-version: "17"
2929
distribution: 'adopt'
@@ -86,7 +86,7 @@ jobs:
8686
:ship: [See on GHCR](https://github.com/orgs/gdcc/packages/container). Use by referencing with full name as printed above, mind the registry name.
8787
8888
# Leave a note when things have gone sideways
89-
- uses: peter-evans/create-or-update-comment@v5
89+
- uses: peter-evans/create-or-update-comment@v4
9090
if: ${{ failure() }}
9191
with:
9292
issue-number: ${{ github.event.client_payload.pull_request.number }}

.github/workflows/container_maintenance.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ jobs:
218218
cat "./modules/container-base/README.md"
219219
- name: Push description to DockerHub for base image
220220
if: ${{ ! inputs.dry_run && ! inputs.damp_run && toJSON(needs.base-image.outputs.rebuilt_images) != '[]' }}
221-
uses: peter-evans/dockerhub-description@v5
221+
uses: peter-evans/dockerhub-description@v4
222222
with:
223223
username: ${{ secrets.DOCKERHUB_USERNAME }}
224224
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -243,7 +243,7 @@ jobs:
243243
cat "./src/main/docker/README.md"
244244
- name: Push description to DockerHub for application image
245245
if: ${{ ! inputs.dry_run && ! inputs.damp_run && toJSON(needs.application-image.outputs.rebuilt_images) != '[]' }}
246-
uses: peter-evans/dockerhub-description@v5
246+
uses: peter-evans/dockerhub-description@v4
247247
with:
248248
username: ${{ secrets.DOCKERHUB_USERNAME }}
249249
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -268,7 +268,7 @@ jobs:
268268
cat "./modules/container-configbaker/README.md"
269269
- name: Push description to DockerHub for config baker image
270270
if: ${{ ! inputs.dry_run && ! inputs.damp_run && toJSON(needs.configbaker-image.outputs.rebuilt_images) != '[]' }}
271-
uses: peter-evans/dockerhub-description@v5
271+
uses: peter-evans/dockerhub-description@v4
272272
with:
273273
username: ${{ secrets.DOCKERHUB_USERNAME }}
274274
password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/deploy_beta_testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v5
1818

19-
- uses: actions/setup-java@v5
19+
- uses: actions/setup-java@v4
2020
with:
2121
distribution: 'zulu'
2222
java-version: '17'

.github/workflows/maven_cache_management.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Determine Java version from Parent POM
3737
run: echo "JAVA_VERSION=$(grep '<target.java.version>' modules/dataverse-parent/pom.xml | cut -f2 -d'>' | cut -f1 -d'<')" >> ${GITHUB_ENV}
3838
- name: Set up JDK ${{ env.JAVA_VERSION }}
39-
uses: actions/setup-java@v5
39+
uses: actions/setup-java@v4
4040
with:
4141
java-version: ${{ env.JAVA_VERSION }}
4242
distribution: temurin

.github/workflows/maven_unit_test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
# Basic setup chores
4040
- uses: actions/checkout@v5
4141
- name: Set up JDK ${{ matrix.jdk }}
42-
uses: actions/setup-java@v5
42+
uses: actions/setup-java@v4
4343
with:
4444
java-version: ${{ matrix.jdk }}
4545
distribution: temurin
@@ -105,7 +105,7 @@ jobs:
105105
# Basic setup chores
106106
- uses: actions/checkout@v5
107107
- name: Set up JDK ${{ matrix.jdk }}
108-
uses: actions/setup-java@v5
108+
uses: actions/setup-java@v4
109109
with:
110110
java-version: ${{ matrix.jdk }}
111111
distribution: temurin
@@ -138,7 +138,7 @@ jobs:
138138
# TODO: As part of #10618 change to setup-maven custom action
139139
# Basic setup chores
140140
- uses: actions/checkout@v5
141-
- uses: actions/setup-java@v5
141+
- uses: actions/setup-java@v4
142142
with:
143143
java-version: '17'
144144
distribution: temurin

.github/workflows/spi_release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ jobs:
3838
if: github.event_name == 'pull_request' && needs.check-secrets.outputs.available == 'true'
3939
steps:
4040
- uses: actions/checkout@v5
41-
- uses: actions/setup-java@v5
41+
- uses: actions/setup-java@v4
4242
with:
4343
java-version: '17'
4444
distribution: 'adopt'
45-
server-id: central
45+
server-id: ossrh
4646
server-username: MAVEN_USERNAME
4747
server-password: MAVEN_PASSWORD
4848
- uses: actions/cache@v4
@@ -64,7 +64,7 @@ jobs:
6464
if: github.event_name == 'push' && needs.check-secrets.outputs.available == 'true'
6565
steps:
6666
- uses: actions/checkout@v5
67-
- uses: actions/setup-java@v5
67+
- uses: actions/setup-java@v4
6868
with:
6969
java-version: '17'
7070
distribution: 'adopt'
@@ -76,11 +76,11 @@ jobs:
7676

7777
# Running setup-java again overwrites the settings.xml - IT'S MANDATORY TO DO THIS SECOND SETUP!!!
7878
- name: Set up Maven Central Repository
79-
uses: actions/setup-java@v5
79+
uses: actions/setup-java@v4
8080
with:
8181
java-version: '17'
8282
distribution: 'adopt'
83-
server-id: central
83+
server-id: ossrh
8484
server-username: MAVEN_USERNAME
8585
server-password: MAVEN_PASSWORD
8686
gpg-private-key: ${{ secrets.DATAVERSEBOT_GPG_KEY }}

conf/keycloak/builtin-users-spi/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
</build>
101101

102102
<properties>
103-
<keycloak.version>26.3.4</keycloak.version>
103+
<keycloak.version>26.3.2</keycloak.version>
104104
<java.version>17</java.version>
105105
<jakarta.persistence.version>3.2.0</jakarta.persistence.version>
106106
<mindrot.jbcrypt.version>0.4</mindrot.jbcrypt.version>

conf/mdc/counter_weekly.sh

Lines changed: 0 additions & 92 deletions
This file was deleted.

0 commit comments

Comments
 (0)