Skip to content

Commit

Permalink
Merge branch 'release/1.0.0.0-RC1'
Browse files Browse the repository at this point in the history
* release/1.0.0.0-RC1:
  1.0.0.0-RC1
  update to dsf 1.1.0, remove other processes
  adds zip example bundle
  start development cycle 0.4.0
  • Loading branch information
wetret committed Aug 31, 2023
2 parents 045648e + 5c6a5ff commit 3e96133
Show file tree
Hide file tree
Showing 285 changed files with 4,361 additions and 958,869 deletions.
13 changes: 9 additions & 4 deletions .github/workflows/maven-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,16 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v1
- uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 11
distribution: 'temurin'
java-version: 17
- uses: s4u/maven-settings-action@v2.8.0
with:
servers: |
[ {"id": "github-mii", "username": "${{ github.actor }}", "password": "${{ secrets.GITHUB_TOKEN }}"}]
- name: Build with Maven
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/maven-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,16 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v1
- uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 11
distribution: 'temurin'
java-version: 17
- uses: s4u/maven-settings-action@v2.8.0
with:
servers: |
[ {"id": "github-mii", "username": "${{ github.actor }}", "password": "${{ secrets.GITHUB_TOKEN }}"}]
- name: Publish with Maven
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
31 changes: 0 additions & 31 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,3 @@
**/*.iml

**/dependency-reduced-pom.xml

###
# test data generator ignores
###
mii-dsf-processes-test-data-generator/cert/**/*.pem
mii-dsf-processes-test-data-generator/cert/**/*.csr
mii-dsf-processes-test-data-generator/cert/**/*.p12
mii-dsf-processes-test-data-generator/cert/thumbprints.txt

mii-dsf-processes-test-data-generator/bundle/*.xml

mii-dsf-processes-test-data-generator/config/*.properties

mii-dsf-processes-test-data-generator/rsa/*.pem

###
# docker test setup ignores
###
mii-dsf-processes-docker-test-setup/**/bpe/log/*.log
mii-dsf-processes-docker-test-setup/**/bpe/log/*.log.gz
mii-dsf-processes-docker-test-setup/**/bpe/last_event/time.file
mii-dsf-processes-docker-test-setup/**/bpe/plugin/*.jar
mii-dsf-processes-docker-test-setup/**/bpe/process/*.jar
mii-dsf-processes-docker-test-setup/**/bpe/process/**/*.jar

mii-dsf-processes-docker-test-setup/**/fhir/conf/bundle.xml
mii-dsf-processes-docker-test-setup/**/fhir/log/*.log
mii-dsf-processes-docker-test-setup/**/fhir/log/*.log.gz

mii-dsf-processes-docker-test-setup/secrets/*.pem
mii-dsf-processes-docker-test-setup/.env
49 changes: 12 additions & 37 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,50 +1,25 @@
# MII DSF Processes
# MII Process Data Transfer

[![Java CI Build with Maven](https://github.com/medizininformatik-initiative/mii-dsf-processes/actions/workflows/maven-build.yml/badge.svg)](https://github.com/medizininformatik-initiative/mii-dsf-processes/actions/workflows/maven-build.yml)
In this repository you will find the process to transfer data-sets of an approved data usage project from a DIC to a DMS.

Business processes for the Medical Informatics Initiative as plugins for the [HiGHmed Data Sharing Framework][1].

The [Projectathon Data Transfer process](https://github.com/medizininformatik-initiative/mii-dsf-processes/tree/main/mii-dsf-process-projectathon-data-transfer)
is greatly influenced by the [NUM-CODEX AP1 Data Transfer process](https://github.com/num-codex/codex-processes-ap1) and
reuses some of its code.
## Development
Branching follows the git-flow model, for the latest development version see branch [develop](https://github.com/medizininformatik-initiative/mii-process-data-transfer/tree/develop).

## Build

Prerequisite: Java 11, Maven >= 3.6
Prerequisite: Java 17, Maven >= 3.6

Add the Github Package Registry server to your Maven `.m2/settings.xml`. Instructions on how to generate the `USERNAME`
and `TOKEN` can be found in the HiGHmed DSF Wiki page with the
name [Using the Github Maven Package Registry](https://github.com/highmed/highmed-dsf/wiki/Using-the-Github-Maven-Package-Registry)
. The token need at least the `read:packages` scope.
To use this repository in your code, add the Github Package Registry server to your Maven `.m2/settings.xml`. Instructions on how to generate the `USERNAME` and `TOKEN` can be found in the GitHub documentation [Managing your personal access tokens](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens). The token needs at least the `read:packages` scope.

```xml

<servers>
<server>
<id>highmed-dsf</id>
<username>USERNAME</username>
<password>TOKEN</password>
</server>
<server>
<id>github-mii</id>
<username>USERNAME</username>
<password>TOKEN</password>
</server>
</servers>
```

Build the project from the root directory of this repository by executing the following command.

```sh
mvn clean package
```

## License

Copyright 2022 Medical Informatics Initiative

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License.

[1]: <https://github.com/highmed/highmed-dsf>
All code is published under the [Apache-2.0 License](LICENSE).
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<profiles version="20">
<profile kind="CodeFormatterProfile" name="highmed_dsf" version="20">
<profile kind="CodeFormatterProfile" name="dsf" version="20">
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
Expand Down
Loading

0 comments on commit 3e96133

Please sign in to comment.