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.

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

suggestion update the codemeta metadata block to add some more structure for machine actionability #11084

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
140 commits
Select commit Hold shift + click to select a range
91ddec7
added endpoint as config parameter
Aug 17, 2018
6d8310e
merged cleaning of unused imports and endcustom endpoint configuration
Dec 10, 2018
bc09b08
added custom dir for branding pics
Jan 11, 2019
536351a
Merge pull request #16 from TIK-NFL/custom_pics
aseeland Jan 14, 2019
709b367
Generating of One-Time-URL for uploading big data directly to S3-stro…
May 20, 2019
396059a
Endpoint for bigDataUpload ready
May 24, 2019
af1622b
logs for debugging removed
May 27, 2019
e55ec43
OneTimeUrls will be deleted after 90 min
May 28, 2019
b7f0dbb
Quartz scheduler for deleting expired urls
May 31, 2019
712ea83
Endpoint for S3 to notify when data is uploaded
Jul 1, 2019
a215aac
Bug fixes; now everything should work
Aug 2, 2019
2abcbfa
Merge pull request #17 from isabellakutger/s3url
aseeland Aug 14, 2019
c9a260b
merged tag v4.15.1; used upstream custom s3 config
Aug 14, 2019
89e5a1f
merged s3url branch from isabella
Aug 14, 2019
2ab1479
Revert "added custom dir for branding pics"
Aug 15, 2019
0dc4435
replaced logo and text properties of cc0 to ccby; CC0 is NOT changed …
aseeland Aug 15, 2019
1d5a83b
Get direct S3 upload endpoints
aseeland Aug 15, 2019
16479fe
Getting CC BY license instead of CC0 as default
aseeland Aug 15, 2019
c515b80
:fix: exporting and importing metadata showed/allowed CC0. Now CC0 th…
aseeland Oct 17, 2019
3b42a99
merged v4.17 into branch; fixed conflicts in bundles.property and lic…
aseeland Oct 17, 2019
574d472
merged improvement of cc by branch; fixed conflict in datasets.java (…
aseeland Oct 17, 2019
98bc180
added the advice to prefix a dataverse identifier with the instituti…
aseeland Oct 17, 2019
ac97071
Merge branch 'institutional_namespace' into staging
aseeland Oct 17, 2019
bb2027d
Merge tag 'v4.20' into cc_by_waiver
Apr 15, 2020
63073ff
merge conflict with v4.20
doigl Apr 15, 2020
6c29c1f
preparation for update
Apr 21, 2020
179433b
reverted changes from object_storage branch by creating a diff and ap…
Apr 21, 2020
b330799
CC BY instead of CC 0 in testExportDDI
doigl Apr 27, 2020
ef9ca41
Merge tag 'v5.2' into cc_by_waiver
doigl Nov 24, 2020
5e017bc
Merge tag 'v5.2' into institutional_namespace
doigl Nov 24, 2020
f2a0f66
merged again v4.20 tag to get upstream history back
Feb 26, 2021
6c30418
Merge tag 'v5.4.1' into cc_by_waiver
Apr 26, 2021
fb211cf
Merge tag 'v5.4.1' into institutional_namespace
Apr 26, 2021
ddf5da8
merged tag v5.4.1 from upstream; solved conflict in .gitignore
Apr 29, 2021
85025f1
add utf-8 encoding to bibtex export
aseeland Apr 30, 2021
77410f9
Merge branch 'bibtex_export_fix' into update_v5.4.1
aseeland Apr 30, 2021
c646792
Merge tag 'v5.5' into update_v5.5
aseeland Jun 10, 2021
2feb4db
Merge pull request #18 from TIK-NFL/update_v5.5
aseeland Jul 28, 2021
7519b88
Added Primary Data Handling file format
aseeland Jan 31, 2022
26e41f1
Merge tag 'v5.9' into institutional_namespace
aseeland Jan 31, 2022
19da2a4
Merge tag 'v5.9' into cc_by_waiver
aseeland Jan 31, 2022
6379fd2
Merge branch 'cc_by_waiver' into update_v5.9
aseeland Jan 31, 2022
e3ffae9
Merge branch 'our_mime_types' into update_v5.9
aseeland Jan 31, 2022
e07ba47
Added prefix to overwrite MIME type detection
aseeland Feb 15, 2022
510e14c
Merge branch 'overwrite_mimetype' into update_v5.9
aseeland Feb 15, 2022
247ab07
Merge pull request #19 from TIK-NFL/update_v5.9
dpx9fR Feb 16, 2022
dca5e4e
Added link to more information to vocabularies in metadata form
aseeland Oct 1, 2022
b319f82
added type attr for ordered lists; added style attr for images for re…
aseeland Oct 1, 2022
f32eabf
Change publication lock message to inform about FoKUS review
aseeland Oct 10, 2022
e87bb42
Revert "CC BY instead of CC 0 in testExportDDI"
aseeland Oct 10, 2022
d4163c6
Revert ":fix: exporting and importing metadata showed/allowed CC0. No…
aseeland Oct 10, 2022
6ca1aad
Revert "replaced logo and text properties of cc0 to ccby; CC0 is NOT …
aseeland Oct 10, 2022
fcbc9fc
reverted parts of commit 19da2e4 (merge commit v5.9) that solved conf…
aseeland Oct 10, 2022
dfcab22
Merge tag 'v5.12' into institutional_namespace
aseeland Oct 10, 2022
c071730
Merge tag 'v5.12' into our_mime_types
aseeland Oct 10, 2022
a32ab21
Merge tag 'v5.12' into customize_ui
aseeland Oct 10, 2022
d9cbcb6
Merge tag 'v5.12' into relaxed_markup-checker
aseeland Oct 10, 2022
9df2180
Merge tag 'v5.12' into overwrite_mimetype
aseeland Oct 10, 2022
bd52cb1
Merge tag 'v5.12' into update_v5.12
aseeland Oct 10, 2022
a60fadb
Merge branch 'relaxed_markup-checker' into update_v5.12
aseeland Oct 10, 2022
bf22988
add link to publication checklist also for 1st level review message
aseeland Dec 23, 2022
f3dcd56
Merge tag 'v5.12.1' into customize_ui
aseeland Dec 23, 2022
bc5bb27
local test of idp switch
aseeland Dec 23, 2022
5cee686
Merge tag 'v5.12.1' into overwrite_mimetype
aseeland Dec 23, 2022
d723d2c
Merge tag 'v5.12.1' into relaxed_markup-checker
aseeland Dec 23, 2022
1215dd6
Merge tag 'v5.12.1' into our_mime_types
aseeland Dec 23, 2022
a9d777d
Merge tag 'v5.12.1' into institutional_namespace
aseeland Dec 23, 2022
edb3754
Merge branch 'customize_ui' into update_v5.12.1
aseeland Dec 23, 2022
3521e16
Merge branch 'our_mime_types' into update_v5.12.1
aseeland Dec 23, 2022
a17cea7
Merge branch 'staging' into update_v5.12.1
aseeland Jun 2, 2023
6254833
Merge pull request #20 from TIK-NFL/update_v5.12.1
aseeland Jun 2, 2023
389da18
Merge tag 'v5.13' into institutional_namespace
bjosel Jun 15, 2023
2a1c3a0
Rebase to v5.13
bjosel Jun 15, 2023
c9a21a9
Rebase to v5.13
bjosel Jun 15, 2023
a928538
Rebase to v5.13
bjosel Jun 15, 2023
b03a31f
Rebase to v5.13
bjosel Jun 15, 2023
4731cd9
rollback the external system workflow
ffritze Nov 10, 2023
5c8376f
utf-8 support added
bjosel Nov 28, 2023
060eccc
7z=application/x-7z-compressed
bjosel Nov 28, 2023
c822731
/*
bjosel Nov 28, 2023
05539ea
Update Bundle.properties
bjosel Nov 28, 2023
5c54316
Merge with all FoKUS patches
bjosel Nov 28, 2023
f5d1299
Merge pull request #10178 from IQSS/develop
landreev Dec 12, 2023
9c0ba27
Added beta previewers to Bundle properties
bjosel Dec 18, 2023
95e2b79
Revert to dynamic 404 page style
bjosel Dec 19, 2023
df557fb
properties for metadata schemes added.
bjosel Jan 5, 2024
d0ca2fa
Update to v6.0
bjosel Jan 5, 2024
e3969f7
Fixed properties files
bjosel Jan 15, 2024
e8325d5
rollback the external system workflow
ffritze Nov 10, 2023
3a68fcd
Removed license checker
bjosel Jan 15, 2024
08ebc6c
Added Rollback patch and potential fix for blocked refresh when pubfl…
bjosel Jan 16, 2024
de7090c
Merge branch 'update_v6.1' into institutional_namespace
bjosel Jan 17, 2024
5585114
Merge branch 'update_v6.1' into workflow_rollback
bjosel Jan 17, 2024
7a5e618
Merge branch 'update_v6.1' into our_mime_types
bjosel Jan 17, 2024
5e16bc5
Merge branch 'update_v6.1' into relaxed_markup-checker
bjosel Jan 17, 2024
aaaff36
Merge branch 'update_v6.1' into customize_ui
bjosel Jan 17, 2024
02cc039
Sync with dataverse v6.1
bjosel Jan 17, 2024
2abf777
Merge branch 'v6.0_upstream' into overwrite_mimetype
bjosel Jan 17, 2024
3f1df5d
Sync to upstream version 6.1
bjosel Jan 17, 2024
c3e0997
Fix to display customized help page.
bjosel Jan 17, 2024
eecdeec
Add externaltools to prevent error messages in log.
bjosel Jan 17, 2024
e052adc
Revert "Add externaltools to prevent error messages in log."
bjosel Jan 17, 2024
cd123b1
delete white space
bjosel Mar 13, 2024
a218417
Merge pull request #10453 from IQSS/develop
landreev Apr 1, 2024
626cb70
revert to upstream
bjosel Apr 3, 2024
c020dcb
Merge branch 'v6.2_upstream' into customize_ui
bjosel Apr 3, 2024
fe76fc5
Merge branch 'v6.2_upstream' into institutional_namespace
bjosel Apr 3, 2024
74e7d26
Merge branch 'v6.2_upstream' into our_mime_types
bjosel Apr 3, 2024
43eac02
Merge branch 'v6.2_upstream' into workflow_rollback
bjosel Apr 3, 2024
65e8986
Merge branch 'v6.2_upstream' into relaxed_markup-checker
bjosel Apr 3, 2024
6e274e6
Merge branch 'v6.2_upstream' into develop
bjosel Apr 5, 2024
3c2d297
Merge branch 'fix_export_version' into develop
bjosel Apr 5, 2024
556869d
Merge branch 'v6.1_upstream' into overwrite_mimetype
bjosel Apr 11, 2024
36c1cac
Refactor mime-type patch
bjosel Apr 11, 2024
b4c4e95
Merge branch 'v6.2_upstream' into overwrite_mimetype
bjosel Apr 11, 2024
1b30aca
Merge branch 'overwrite_mimetype' into develop
bjosel Apr 15, 2024
c36637b
Merge branch 'update_v6.2' into staging
bjosel Apr 26, 2024
8c99a74
Merge pull request #10664 from IQSS/develop
pdurbin Jul 3, 2024
38d8881
Merge branch 'v6.3_upstream' into institutional_namespace
bjosel Jul 5, 2024
378751e
Merge branch 'v6.3_upstream' into our_mime_types
bjosel Jul 5, 2024
cd4023c
Merge branch 'v6.3_upstream' into workflow_rollback
bjosel Jul 5, 2024
7c3f6e3
Merge branch 'v6.3_upstream' into overwrite_mimetype
bjosel Jul 5, 2024
f978592
Merge branch 'v6.3_upstream' into relaxed_markup-checker
bjosel Jul 5, 2024
9fe4639
Merge branch 'v6.3_upstream' into customize_ui
bjosel Jul 5, 2024
b7123a5
Initial commit for feature branch properties
bjosel Jul 15, 2024
d62eb50
Merge branch 'properties' into update_v6.3
bjosel Jul 15, 2024
d3149b2
Merge branch 'our_mime_types' into update_v6.3
bjosel Jul 15, 2024
14990b9
Merge branch 'workflow_rollback' into update_v6.3
bjosel Jul 15, 2024
b736a23
Merge branch 'overwrite_mimetype' into update_v6.3
bjosel Jul 16, 2024
136beee
Merge branch 'relaxed_markup-checker' into update_v6.3
bjosel Jul 16, 2024
54f7878
Merge branch 'customize_ui' into update_v6.3
bjosel Jul 16, 2024
bb927f5
Changed descriptions
bjosel Jul 31, 2024
a58c6b1
Description of topicClassification corrected
bjosel Jul 31, 2024
88937eb
Properties adapted to tsv
bjosel Aug 1, 2024
9465360
Sync to version on staging and production
bjosel Aug 1, 2024
61dfcd8
Merge confict solved
bjosel Aug 1, 2024
cf245f7
Fixes in properties
bjosel Aug 1, 2024
34a7a6e
Add PR 10797, 10820 from upstream.
bjosel Sep 12, 2024
31f5a11
Update v6.4 (#21)
bjosel Nov 19, 2024
175d598
added subfields and controlled vocabularies for memoryRequirements an…
doigl Dec 11, 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
7 changes: 5 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Thank you for contributing to the Dataverse Project through the creation of a bu
WARNING: If this is a security issue it should be reported privately to [email protected]

More information on bug issues and contributions can be found in the "Contributing to Dataverse" page:
https://github.com/IQSS/dataverse/blob/develop/CONTRIBUTING.md#bug-reportsissues
https://guides.dataverse.org/en/latest/contributor/index.html

Please fill out as much of the template as you can.
Start below this comment section.
Expand Down Expand Up @@ -44,7 +44,6 @@ Start below this comment section.
**Any related open or closed issues to this bug report?**



**Screenshots:**

No matter the issue, screenshots are always welcome.
Expand All @@ -53,3 +52,7 @@ To add a screenshot, please use one of the following formats and/or methods desc

* https://help.github.com/en/articles/file-attachments-on-issues-and-pull-requests
*


**Are you thinking about creating a pull request for this issue?**
Help is always welcome, is this bug something you or your organization plan to fix?
7 changes: 5 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Feature request
about: Suggest an idea or new feature for the Dataverse software!
title: 'Feature Request/Idea:'
title: 'Feature Request:'
labels: 'Type: Feature'
assignees: ''

Expand All @@ -11,7 +11,7 @@ assignees: ''
Thank you for contributing to the Dataverse Project through the creation of a feature request!

More information on ideas/feature requests and contributions can be found in the "Contributing to Dataverse" page:
https://github.com/IQSS/dataverse/blob/develop/CONTRIBUTING.md#ideasfeature-requests
https://guides.dataverse.org/en/latest/contributor/index.html

Please fill out as much of the template as you can.
Start below this comment section.
Expand All @@ -34,3 +34,6 @@ Start below this comment section.


**Any open or closed issues related to this feature request?**

**Are you thinking about creating a pull request for this feature?**
Help is always welcome, is this feature something you or your organization plan to implement?
40 changes: 40 additions & 0 deletions .github/ISSUE_TEMPLATE/idea_proposal.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
---
name: Idea proposal
about: Propose a new idea for discussion to improve the Dataverse software!
title: 'Suggestion:'
labels: 'Type: Suggestion'
assignees: ''

---

<!--
Thank you for contributing to the Dataverse Project through the creation of a feature request!

More information on ideas/feature requests and contributions can be found in the "Contributing to Dataverse" page:
https://guides.dataverse.org/en/latest/contributor/index.html

Please fill out as much of the template as you can.
Start below this comment section.
-->

**Overview of the Suggestion**


**What kind of user is the suggestion intended for?**
(Example users roles: API User, Curator, Depositor, Guest, Superuser, Sysadmin)


**What inspired this idea?**


**What existing behavior do you want changed?**


**Any brand new behavior do you want to add to Dataverse?**


**Any open or closed issues related to this suggestion?**


**Are you thinking about creating a pull request for this issue?**
Help is always welcome, is this idea something you or your organization plan to implement?
37 changes: 37 additions & 0 deletions .github/actions/setup-maven/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
---
name: "Setup Maven and Caches"
description: "Determine Java version and setup Maven, including necessary caches."
inputs:
git-reference:
description: 'The git reference (branch/tag) to check out'
required: false
default: '${{ github.ref }}'
pom-paths:
description: "List of paths to Maven POM(s) for cache dependency setup"
required: false
default: 'pom.xml'
runs:
using: composite
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
ref: ${{ inputs.git-reference }}
- name: Determine Java version by reading the Maven property
shell: bash
run: |
echo "JAVA_VERSION=$(grep '<target.java.version>' ${GITHUB_WORKSPACE}/modules/dataverse-parent/pom.xml | cut -f2 -d'>' | cut -f1 -d'<')" | tee -a ${GITHUB_ENV}
- name: Set up JDK ${{ env.JAVA_VERSION }}
id: setup-java
uses: actions/setup-java@v4
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: 'temurin'
cache: 'maven'
cache-dependency-path: ${{ inputs.pom-paths }}
- name: Download common cache on branch cache miss
if: ${{ steps.setup-java.outputs.cache-hit != 'true' }}
uses: actions/cache/restore@v4
with:
key: dataverse-maven-cache
path: ~/.m2/repository
32 changes: 32 additions & 0 deletions .github/workflows/check_property_files.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: "Properties Check"
on:
pull_request:
paths:
- "src/**/*.properties"
- "scripts/api/data/metadatablocks/*"
jobs:
duplicate_keys:
name: Duplicate Keys
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Run duplicates detection script
shell: bash
run: tests/check_duplicate_properties.sh

metadata_blocks_properties:
name: Metadata Blocks Properties
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Setup GraalVM + Native Image
uses: graalvm/setup-graalvm@v1
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
java-version: '21'
distribution: 'graalvm-community'
- name: Setup JBang
uses: jbangdev/setup-jbang@main
- name: Run metadata block properties verification script
shell: bash
run: tests/verify_mdb_properties.sh
41 changes: 27 additions & 14 deletions .github/workflows/container_app_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ on:
# We are deliberately *not* running on push events here to avoid double runs.
# Instead, push events will trigger from the base image and maven unit tests via workflow_call.
workflow_call:
inputs:
base-image-ref:
type: string
description: "Reference of the base image to build on in full qualified form [<registry>/]<namespace>/<repo>:<tag>"
required: false
default: "gdcc/base:unstable"
pull_request:
branches:
- develop
Expand All @@ -16,7 +22,6 @@ on:

env:
IMAGE_TAG: unstable
BASE_IMAGE_TAG: unstable
REGISTRY: "" # Empty means default to Docker Hub
PLATFORMS: "linux/amd64,linux/arm64"
MASTER_BRANCH_TAG: alpha
Expand All @@ -33,20 +38,24 @@ jobs:
if: ${{ github.repository_owner == 'IQSS' }}

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Set up JDK
uses: actions/setup-java@v3
- name: Checkout and Setup Maven
uses: IQSS/dataverse/.github/actions/setup-maven@develop
with:
java-version: "17"
distribution: temurin
cache: maven
pom-paths: |
pom.xml
modules/container-configbaker/pom.xml
modules/dataverse-parent/pom.xml

# TODO: Add a filter step here, that avoids building the image if this is a PR and there are other files touched than declared above.
# Use https://github.com/dorny/paths-filter to solve this. This will ensure we do not run this twice if this workflow
# will be triggered by the other workflows already (base image or java changes)
# To become a part of #10618.

- name: Build app and configbaker container image with local architecture and submodules (profile will skip tests)
run: >
mvn -B -f modules/dataverse-parent
-P ct -pl edu.harvard.iq:dataverse -am
$( [[ -n "${{ inputs.base-image-ref }}" ]] && echo "-Dbase.image=${{ inputs.base-image-ref }}" )
install

# TODO: add smoke / integration testing here (add "-Pct -DskipIntegrationTests=false")
Expand Down Expand Up @@ -106,11 +115,13 @@ jobs:
if: needs.check-secrets.outputs.available == 'true' &&
( github.event_name != 'push' || ( github.event_name == 'push' && contains(fromJSON('["develop", "master"]'), github.ref_name)))
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- name: Checkout and Setup Maven
uses: IQSS/dataverse/.github/actions/setup-maven@develop
with:
java-version: "17"
distribution: temurin
pom-paths: |
pom.xml
modules/container-configbaker/pom.xml
modules/dataverse-parent/pom.xml

# Depending on context, we push to different targets. Login accordingly.
- if: github.event_name != 'pull_request'
Expand Down Expand Up @@ -146,11 +157,13 @@ jobs:
run: >
mvn -B -f modules/dataverse-parent
-P ct -pl edu.harvard.iq:dataverse -am
$( [[ -n "${{ inputs.base-image-ref }}" ]] && echo "-Dbase.image=${{ inputs.base-image-ref }}" )
install
- name: Deploy multi-arch application and configbaker container image
run: >
mvn
-Dapp.image.tag=${{ env.IMAGE_TAG }} -Dbase.image.tag=${{ env.BASE_IMAGE_TAG }}
-Dapp.image.tag=${{ env.IMAGE_TAG }}
$( [[ -n "${{ inputs.base-image-ref }}" ]] && echo "-Dbase.image=${{ inputs.base-image-ref }}" )
${{ env.REGISTRY }} -Ddocker.platforms=${{ env.PLATFORMS }}
-P ct deploy

Expand Down
Loading