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

Jump to bottom

Update radar commons [Joris] #378

Draft
wants to merge 4 commits into
base: dev
Choose a base branch
from
Draft

Update radar commons [Joris] #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83f84b0
Update to radar-commons 0.16.0
blootsvoets Mar 30, 2023
ae0ac9c
Use coroutines
blootsvoets Mar 30, 2023
2ef512b
Update docker file
blootsvoets Mar 30, 2023
8a8e62e
Do not require shcmea registry to return non-empty subjects
blootsvoets Apr 13, 2023
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: 1 addition & 6 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
java-sdk/**/build
**/.idea
java-sdk/.gradle
java-sdk/**/out
java-sdk/**/src/test
.idea/
.git
doc
java-sdk/config
19 changes: 9 additions & 10 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
# EditorConfig is awesome: http://EditorConfig.org
# EditorConfig is awesome: https://EditorConfig.org

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true
charset = utf-8
indent_style = space
indent_size = 2
indent_size = 4
trim_trailing_whitespace = true

[*.{yml,yaml,json}]
indent_size = 2

# Markdown
[*.md]
trim_trailing_whitespace = false

# Gradle
[*.gradle]
indent_size = 4

# Java
[*.{java,kt,kts}]
indent_size = 4
continuation_indent_size = 8
[*.{kt,kts}]
ktlint_standard_no-wildcard-imports = disabled
9 changes: 5 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
FROM --platform=$BUILDPLATFORM gradle:7.5-jdk17 as builder
FROM --platform=$BUILDPLATFORM gradle:8.0-jdk17 as builder

RUN mkdir -p /code/java-sdk
WORKDIR /code/java-sdk
ENV GRADLE_USER_HOME=/code/.gradlecache \
GRADLE_OPTS=-Djdk.lang.Process.launchMechanism=vfork
GRADLE_OPTS="-Djdk.lang.Process.launchMechanism=vfork -Dorg.gradle.vfs.watch=false"

COPY java-sdk/*.gradle.kts java-sdk/gradle.properties /code/java-sdk/
COPY java-sdk/buildSrc /code/java-sdk/buildSrc
COPY java-sdk/radar-schemas-commons/build.gradle.kts /code/java-sdk/radar-schemas-commons/
COPY java-sdk/radar-schemas-core/build.gradle.kts /code/java-sdk/radar-schemas-core/
COPY java-sdk/radar-schemas-registration/build.gradle.kts /code/java-sdk/radar-schemas-registration/
COPY java-sdk/radar-schemas-tools/build.gradle.kts /code/java-sdk/radar-schemas-tools/
COPY java-sdk/radar-catalog-server/build.gradle.kts /code/java-sdk/radar-catalog-server/
RUN gradle downloadDependencies copyDependencies startScripts --no-watch-fs
RUN gradle downloadDependencies copyDependencies startScripts

COPY commons /code/commons
COPY specifications /code/specifications
Expand All @@ -22,7 +23,7 @@ COPY java-sdk/radar-schemas-registration/src /code/java-sdk/radar-schemas-regist
COPY java-sdk/radar-schemas-tools/src /code/java-sdk/radar-schemas-tools/src
COPY java-sdk/radar-catalog-server/src /code/java-sdk/radar-catalog-server/src

RUN gradle jar --no-watch-fs
RUN gradle jar

FROM eclipse-temurin:17-jre

Expand Down
7 changes: 7 additions & 0 deletions java-sdk/.dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
build/
src/test/
src/generated/
out/
.gradle/
.idea/
config/
Loading