mirror of https://github.com/usbharu/Hideout.git
Merge branch 'refs/heads/develop' into feature/owl
# Conflicts: # gradle.properties # gradle/wrapper/gradle-wrapper.jar # hideout-core/build.gradle.kts # hideout-worker/gradle/wrapper/gradle-wrapper.properties # hideout-worker/gradlew # hideout-worker/gradlew.bat # owl/owl-broker/owl-broker-mongodb/build.gradle.kts
This commit is contained in:
commit
9d53444edd
|
@ -18,16 +18,16 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Gradle Wrapper Cache
|
- name: Gradle Wrapper Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: ~/.gradle/wrapper
|
path: ~/.gradle/wrapper
|
||||||
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
|
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
|
||||||
|
|
||||||
- name: Dependencies Cache
|
- name: Dependencies Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
~/.gradle/cache/jars-*
|
~/.gradle/cache/jars-*
|
||||||
|
@ -37,7 +37,7 @@ jobs:
|
||||||
restore-keys: gradle-dependencies-
|
restore-keys: gradle-dependencies-
|
||||||
|
|
||||||
- name: Cache
|
- name: Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
~/.gradle/caches/build-cache-*
|
~/.gradle/caches/build-cache-*
|
||||||
|
@ -47,19 +47,19 @@ jobs:
|
||||||
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
|
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
|
||||||
|
|
||||||
- name: Build Cache
|
- name: Build Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
build
|
build
|
||||||
key: gradle-build-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('**/*.kt') }}-${{ github.sha }}
|
key: gradle-build-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('**/*.kt') }}-${{ github.sha }}
|
||||||
|
|
||||||
- name: Set up JDK 21
|
- name: Set up JDK 21
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
java-version: '21'
|
java-version: '21'
|
||||||
distribution: 'temurin'
|
distribution: 'temurin'
|
||||||
- name: Build
|
- name: Build
|
||||||
uses: gradle/gradle-build-action@v2.8.1
|
uses: gradle/gradle-build-action@v3.3.2
|
||||||
with:
|
with:
|
||||||
arguments: testClasses
|
arguments: testClasses
|
||||||
|
|
||||||
|
@ -69,16 +69,16 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Gradle Wrapper Cache
|
- name: Gradle Wrapper Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: ~/.gradle/wrapper
|
path: ~/.gradle/wrapper
|
||||||
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
|
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
|
||||||
|
|
||||||
- name: Dependencies Cache
|
- name: Dependencies Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
~/.gradle/cache/jars-*
|
~/.gradle/cache/jars-*
|
||||||
|
@ -88,7 +88,7 @@ jobs:
|
||||||
restore-keys: gradle-dependencies-
|
restore-keys: gradle-dependencies-
|
||||||
|
|
||||||
- name: Cache
|
- name: Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
~/.gradle/caches/build-cache-*
|
~/.gradle/caches/build-cache-*
|
||||||
|
@ -98,26 +98,26 @@ jobs:
|
||||||
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
|
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
|
||||||
|
|
||||||
- name: Build Cache
|
- name: Build Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
build
|
build
|
||||||
key: gradle-build-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('src') }}-${{ github.sha }}
|
key: gradle-build-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('src') }}-${{ github.sha }}
|
||||||
|
|
||||||
- name: Set up JDK 21
|
- name: Set up JDK 21
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
java-version: '21'
|
java-version: '21'
|
||||||
distribution: 'temurin'
|
distribution: 'temurin'
|
||||||
|
|
||||||
- name: Unit Test
|
- name: Unit Test
|
||||||
uses: gradle/gradle-build-action@v2.8.1
|
uses: gradle/gradle-build-action@v3.3.2
|
||||||
with:
|
with:
|
||||||
arguments: test
|
arguments: test
|
||||||
|
|
||||||
- name: Save Test Report
|
- name: Save Test Report
|
||||||
if: always()
|
if: always()
|
||||||
uses: actions/cache/save@v3
|
uses: actions/cache/save@v4
|
||||||
with:
|
with:
|
||||||
path: build/test-results
|
path: build/test-results
|
||||||
key: unit-test-report-${{ github.sha }}
|
key: unit-test-report-${{ github.sha }}
|
||||||
|
@ -128,16 +128,16 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Gradle Wrapper Cache
|
- name: Gradle Wrapper Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: ~/.gradle/wrapper
|
path: ~/.gradle/wrapper
|
||||||
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
|
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
|
||||||
|
|
||||||
- name: Dependencies Cache
|
- name: Dependencies Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
~/.gradle/cache/jars-*
|
~/.gradle/cache/jars-*
|
||||||
|
@ -147,7 +147,7 @@ jobs:
|
||||||
restore-keys: gradle-dependencies-
|
restore-keys: gradle-dependencies-
|
||||||
|
|
||||||
- name: Cache
|
- name: Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
~/.gradle/caches/build-cache-*
|
~/.gradle/caches/build-cache-*
|
||||||
|
@ -157,14 +157,14 @@ jobs:
|
||||||
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
|
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
|
||||||
|
|
||||||
- name: Build Cache
|
- name: Build Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
build
|
build
|
||||||
key: gradle-build-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('src') }}-${{ github.sha }}
|
key: gradle-build-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('src') }}-${{ github.sha }}
|
||||||
|
|
||||||
- name: Set up JDK 21
|
- name: Set up JDK 21
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
java-version: '21'
|
java-version: '21'
|
||||||
distribution: 'temurin'
|
distribution: 'temurin'
|
||||||
|
@ -175,13 +175,13 @@ jobs:
|
||||||
mongodb-version: latest
|
mongodb-version: latest
|
||||||
|
|
||||||
- name: Unit Test
|
- name: Unit Test
|
||||||
uses: gradle/gradle-build-action@v2.8.1
|
uses: gradle/gradle-build-action@v3.3.2
|
||||||
with:
|
with:
|
||||||
arguments: integrationTest
|
arguments: integrationTest
|
||||||
|
|
||||||
- name: Save Test Report
|
- name: Save Test Report
|
||||||
if: always()
|
if: always()
|
||||||
uses: actions/cache/save@v3
|
uses: actions/cache/save@v4
|
||||||
with:
|
with:
|
||||||
path: build/test-results
|
path: build/test-results
|
||||||
key: integration-test-report-${{ github.sha }}
|
key: integration-test-report-${{ github.sha }}
|
||||||
|
@ -192,16 +192,16 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Gradle Wrapper Cache
|
- name: Gradle Wrapper Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: ~/.gradle/wrapper
|
path: ~/.gradle/wrapper
|
||||||
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
|
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
|
||||||
|
|
||||||
- name: Dependencies Cache
|
- name: Dependencies Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
~/.gradle/cache/jars-*
|
~/.gradle/cache/jars-*
|
||||||
|
@ -211,7 +211,7 @@ jobs:
|
||||||
restore-keys: gradle-dependencies-
|
restore-keys: gradle-dependencies-
|
||||||
|
|
||||||
- name: Cache
|
- name: Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
~/.gradle/caches/build-cache-*
|
~/.gradle/caches/build-cache-*
|
||||||
|
@ -221,20 +221,20 @@ jobs:
|
||||||
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
|
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
|
||||||
|
|
||||||
- name: Build Cache
|
- name: Build Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
build
|
build
|
||||||
key: gradle-build-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('src') }}-${{ github.sha }}
|
key: gradle-build-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('src') }}-${{ github.sha }}
|
||||||
|
|
||||||
- name: Set up JDK 21
|
- name: Set up JDK 21
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
java-version: '21'
|
java-version: '21'
|
||||||
distribution: 'temurin'
|
distribution: 'temurin'
|
||||||
|
|
||||||
- name: Run Kover
|
- name: Run Kover
|
||||||
uses: gradle/gradle-build-action@v2.8.1
|
uses: gradle/gradle-build-action@v3.3.2
|
||||||
with:
|
with:
|
||||||
arguments: koverXmlReport -x integrationTest -x e2eTest --rerun-tasks
|
arguments: koverXmlReport -x integrationTest -x e2eTest --rerun-tasks
|
||||||
|
|
||||||
|
@ -259,25 +259,25 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Restore Test Report
|
- name: Restore Test Report
|
||||||
uses: actions/cache/restore@v3
|
uses: actions/cache/restore@v4
|
||||||
with:
|
with:
|
||||||
path: build/test-results
|
path: build/test-results
|
||||||
key: unit-test-report-${{ github.sha }}
|
key: unit-test-report-${{ github.sha }}
|
||||||
|
|
||||||
- name: Restore Test Report
|
- name: Restore Test Report
|
||||||
uses: actions/cache/restore@v3
|
uses: actions/cache/restore@v4
|
||||||
with:
|
with:
|
||||||
path: build/test-results
|
path: build/test-results
|
||||||
key: integration-test-report-${{ github.sha }}
|
key: integration-test-report-${{ github.sha }}
|
||||||
|
|
||||||
- name: Restore Test Report
|
- name: Restore Test Report
|
||||||
uses: actions/cache/restore@v3
|
uses: actions/cache/restore@v4
|
||||||
with:
|
with:
|
||||||
path: build/test-results
|
path: build/test-results
|
||||||
key: e2e-test-report-${{ github.sha }}
|
key: e2e-test-report-${{ github.sha }}
|
||||||
|
|
||||||
- name: JUnit Test Report
|
- name: JUnit Test Report
|
||||||
uses: mikepenz/action-junit-report@v2
|
uses: mikepenz/action-junit-report@v4
|
||||||
with:
|
with:
|
||||||
report_paths: '**/TEST-*.xml'
|
report_paths: '**/TEST-*.xml'
|
||||||
|
|
||||||
|
@ -287,16 +287,16 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Gradle Wrapper Cache
|
- name: Gradle Wrapper Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: ~/.gradle/wrapper
|
path: ~/.gradle/wrapper
|
||||||
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
|
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
|
||||||
|
|
||||||
- name: Dependencies Cache
|
- name: Dependencies Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
~/.gradle/cache/jars-*
|
~/.gradle/cache/jars-*
|
||||||
|
@ -306,7 +306,7 @@ jobs:
|
||||||
restore-keys: gradle-dependencies-
|
restore-keys: gradle-dependencies-
|
||||||
|
|
||||||
- name: Cache
|
- name: Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
~/.gradle/caches/build-cache-*
|
~/.gradle/caches/build-cache-*
|
||||||
|
@ -316,14 +316,14 @@ jobs:
|
||||||
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
|
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
|
||||||
|
|
||||||
- name: Build Cache
|
- name: Build Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
build
|
build
|
||||||
key: gradle-build-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('src') }}-${{ github.sha }}
|
key: gradle-build-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('src') }}-${{ github.sha }}
|
||||||
|
|
||||||
- name: Set up JDK 21
|
- name: Set up JDK 21
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
java-version: '21'
|
java-version: '21'
|
||||||
distribution: 'temurin'
|
distribution: 'temurin'
|
||||||
|
@ -345,16 +345,16 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Gradle Wrapper Cache
|
- name: Gradle Wrapper Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: ~/.gradle/wrapper
|
path: ~/.gradle/wrapper
|
||||||
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
|
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
|
||||||
|
|
||||||
- name: Dependencies Cache
|
- name: Dependencies Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
~/.gradle/cache/jars-*
|
~/.gradle/cache/jars-*
|
||||||
|
@ -364,7 +364,7 @@ jobs:
|
||||||
restore-keys: gradle-dependencies-
|
restore-keys: gradle-dependencies-
|
||||||
|
|
||||||
- name: Cache
|
- name: Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
~/.gradle/caches/build-cache-*
|
~/.gradle/caches/build-cache-*
|
||||||
|
@ -374,14 +374,14 @@ jobs:
|
||||||
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
|
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
|
||||||
|
|
||||||
- name: Build Cache
|
- name: Build Cache
|
||||||
uses: actions/cache@v3.3.3
|
uses: actions/cache@v4.0.2
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
build
|
build
|
||||||
key: gradle-build-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('src') }}-${{ github.sha }}
|
key: gradle-build-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('src') }}-${{ github.sha }}
|
||||||
|
|
||||||
- name: Set up JDK 21
|
- name: Set up JDK 21
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
java-version: '21'
|
java-version: '21'
|
||||||
distribution: 'temurin'
|
distribution: 'temurin'
|
||||||
|
@ -393,20 +393,20 @@ jobs:
|
||||||
|
|
||||||
- name: setup-chrome
|
- name: setup-chrome
|
||||||
id: setup-chrome
|
id: setup-chrome
|
||||||
uses: browser-actions/setup-chrome@v1.4.0
|
uses: browser-actions/setup-chrome@v1.6.1
|
||||||
|
|
||||||
- name: Add Path
|
- name: Add Path
|
||||||
run: echo ${{ steps.setup-chrome.outputs.chrome-path }} >> $GITHUB_PATH
|
run: echo ${{ steps.setup-chrome.outputs.chrome-path }} >> $GITHUB_PATH
|
||||||
|
|
||||||
- name: E2E Test
|
- name: E2E Test
|
||||||
uses: gradle/gradle-build-action@v2.8.1
|
uses: gradle/gradle-build-action@v3.3.2
|
||||||
with:
|
with:
|
||||||
arguments: e2eTest
|
arguments: e2eTest
|
||||||
|
|
||||||
|
|
||||||
- name: Save Test Report
|
- name: Save Test Report
|
||||||
if: always()
|
if: always()
|
||||||
uses: actions/cache/save@v3
|
uses: actions/cache/save@v4
|
||||||
with:
|
with:
|
||||||
path: build/test-results
|
path: build/test-results
|
||||||
key: e2e-test-report-${{ github.sha }}
|
key: e2e-test-report-${{ github.sha }}
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
org.gradle.parallel=true
|
||||||
|
org.gradle.configureondemand=true
|
||||||
|
org.gradle.caching=true
|
||||||
|
org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC
|
|
@ -241,16 +241,16 @@ dependencies {
|
||||||
testImplementation("io.ktor:ktor-client-mock:$ktor_version")
|
testImplementation("io.ktor:ktor-client-mock:$ktor_version")
|
||||||
testImplementation("com.h2database:h2:$h2_version")
|
testImplementation("com.h2database:h2:$h2_version")
|
||||||
|
|
||||||
testImplementation("org.mockito.kotlin:mockito-kotlin:5.2.1")
|
testImplementation("org.mockito.kotlin:mockito-kotlin:5.3.1")
|
||||||
testImplementation("org.mockito:mockito-inline:5.2.0")
|
testImplementation("org.mockito:mockito-inline:5.2.0")
|
||||||
testImplementation("nl.jqno.equalsverifier:equalsverifier:3.15.6")
|
testImplementation("nl.jqno.equalsverifier:equalsverifier:3.16.1")
|
||||||
testImplementation("com.jparams:to-string-verifier:1.4.8")
|
testImplementation("com.jparams:to-string-verifier:1.4.8")
|
||||||
|
|
||||||
intTestImplementation("org.springframework.boot:spring-boot-starter-test")
|
intTestImplementation("org.springframework.boot:spring-boot-starter-test")
|
||||||
intTestImplementation("org.springframework.security:spring-security-test")
|
intTestImplementation("org.springframework.security:spring-security-test")
|
||||||
intTestImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
|
intTestImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
|
||||||
intTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version")
|
intTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version")
|
||||||
intTestImplementation("org.mockito.kotlin:mockito-kotlin:5.2.1")
|
intTestImplementation("org.mockito.kotlin:mockito-kotlin:5.3.1")
|
||||||
intTestImplementation("com.h2database:h2:$h2_version")
|
intTestImplementation("com.h2database:h2:$h2_version")
|
||||||
|
|
||||||
e2eTestImplementation("org.springframework.boot:spring-boot-starter-test")
|
e2eTestImplementation("org.springframework.boot:spring-boot-starter-test")
|
||||||
|
|
|
@ -2,5 +2,8 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
|
||||||
|
networkTimeout=10000
|
||||||
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm") version "1.9.23"
|
kotlin("jvm") version "1.9.24"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Binary file not shown.
|
@ -1,6 +1,7 @@
|
||||||
#Sun Feb 18 23:33:24 JST 2024
|
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
|
||||||
|
networkTimeout=10000
|
||||||
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
|
@ -55,7 +55,7 @@
|
||||||
# Darwin, MinGW, and NonStop.
|
# Darwin, MinGW, and NonStop.
|
||||||
#
|
#
|
||||||
# (3) This script is generated from the Groovy template
|
# (3) This script is generated from the Groovy template
|
||||||
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
# within the Gradle project.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
|
@ -80,13 +80,11 @@ do
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
# This is normally unused
|
||||||
|
# shellcheck disable=SC2034
|
||||||
APP_NAME="Gradle"
|
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
|
@ -133,22 +131,29 @@ location of your Java installation."
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
JAVACMD=java
|
JAVACMD=java
|
||||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
if ! command -v java >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# Increase the maximum file descriptors if we can.
|
||||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
max*)
|
max*)
|
||||||
|
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||||
|
# shellcheck disable=SC2039,SC3045
|
||||||
MAX_FD=$( ulimit -H -n ) ||
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
warn "Could not query maximum file descriptor limit"
|
warn "Could not query maximum file descriptor limit"
|
||||||
esac
|
esac
|
||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
'' | soft) :;; #(
|
'' | soft) :;; #(
|
||||||
*)
|
*)
|
||||||
|
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||||
|
# shellcheck disable=SC2039,SC3045
|
||||||
ulimit -n "$MAX_FD" ||
|
ulimit -n "$MAX_FD" ||
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
esac
|
esac
|
||||||
|
@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Collect all arguments for the java command;
|
|
||||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
# shell script including quotes and variable substitutions, so put them in
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
# double quotes to make sure that they get re-expanded; and
|
|
||||||
# * put everything else in single quotes, so that it's not re-expanded.
|
# Collect all arguments for the java command:
|
||||||
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
|
# and any embedded shellness will be escaped.
|
||||||
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
|
# treated as '${Hostname}' itself on the command line.
|
||||||
|
|
||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
|
@ -205,6 +214,12 @@ set -- \
|
||||||
org.gradle.wrapper.GradleWrapperMain \
|
org.gradle.wrapper.GradleWrapperMain \
|
||||||
"$@"
|
"$@"
|
||||||
|
|
||||||
|
# Stop when "xargs" is not available.
|
||||||
|
if ! command -v xargs >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "xargs is not available"
|
||||||
|
fi
|
||||||
|
|
||||||
# Use "xargs" to parse quoted args.
|
# Use "xargs" to parse quoted args.
|
||||||
#
|
#
|
||||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||||
|
|
|
@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
|
||||||
|
|
||||||
set DIRNAME=%~dp0
|
set DIRNAME=%~dp0
|
||||||
if "%DIRNAME%"=="" set DIRNAME=.
|
if "%DIRNAME%"=="" set DIRNAME=.
|
||||||
|
@rem This is normally unused
|
||||||
set APP_BASE_NAME=%~n0
|
set APP_BASE_NAME=%~n0
|
||||||
set APP_HOME=%DIRNAME%
|
set APP_HOME=%DIRNAME%
|
||||||
|
|
||||||
|
@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
|
||||||
|
|
||||||
set JAVA_EXE=java.exe
|
set JAVA_EXE=java.exe
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if "%ERRORLEVEL%" == "0" goto execute
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
|
@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
|
@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||||
|
|
||||||
:end
|
:end
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem End local scope for the variables with windows NT shell
|
||||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
if %ERRORLEVEL% equ 0 goto mainEnd
|
||||||
|
|
||||||
:fail
|
:fail
|
||||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||||
rem the _cmd.exe /c_ return code!
|
rem the _cmd.exe /c_ return code!
|
||||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
set EXIT_CODE=%ERRORLEVEL%
|
||||||
exit /b 1
|
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
||||||
|
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
||||||
|
exit /b %EXIT_CODE%
|
||||||
|
|
||||||
:mainEnd
|
:mainEnd
|
||||||
if "%OS%"=="Windows_NT" endlocal
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
|
|
@ -18,9 +18,9 @@ repositories {
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation("io.grpc:grpc-kotlin-stub:1.4.1")
|
implementation("io.grpc:grpc-kotlin-stub:1.4.1")
|
||||||
implementation("io.grpc:grpc-protobuf:1.61.1")
|
implementation("io.grpc:grpc-protobuf:1.63.0")
|
||||||
implementation("com.google.protobuf:protobuf-kotlin:3.25.3")
|
implementation("com.google.protobuf:protobuf-kotlin:4.26.1")
|
||||||
implementation("io.grpc:grpc-netty:1.61.1")
|
implementation("io.grpc:grpc-netty:1.63.0")
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
|
||||||
implementation(project(":owl-common"))
|
implementation(project(":owl-common"))
|
||||||
implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.1")
|
implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.1")
|
||||||
|
@ -40,11 +40,11 @@ kotlin {
|
||||||
|
|
||||||
protobuf {
|
protobuf {
|
||||||
protoc {
|
protoc {
|
||||||
artifact = "com.google.protobuf:protoc:3.25.3"
|
artifact = "com.google.protobuf:protoc:4.26.1"
|
||||||
}
|
}
|
||||||
plugins {
|
plugins {
|
||||||
create("grpc") {
|
create("grpc") {
|
||||||
artifact = "io.grpc:protoc-gen-grpc-java:1.61.1"
|
artifact = "io.grpc:protoc-gen-grpc-java:1.63.0"
|
||||||
}
|
}
|
||||||
create("grpckt") {
|
create("grpckt") {
|
||||||
artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar"
|
artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar"
|
||||||
|
|
|
@ -16,7 +16,7 @@ repositories {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation("org.mongodb:mongodb-driver-kotlin-coroutine:5.0.0")
|
implementation("org.mongodb:mongodb-driver-kotlin-coroutine:5.1.0")
|
||||||
implementation(project(":owl-broker"))
|
implementation(project(":owl-broker"))
|
||||||
implementation(project(":owl-common"))
|
implementation(project(":owl-common"))
|
||||||
implementation(platform("io.insert-koin:koin-bom:3.5.6"))
|
implementation(platform("io.insert-koin:koin-bom:3.5.6"))
|
||||||
|
|
|
@ -13,9 +13,9 @@ repositories {
|
||||||
dependencies {
|
dependencies {
|
||||||
testImplementation("org.jetbrains.kotlin:kotlin-test")
|
testImplementation("org.jetbrains.kotlin:kotlin-test")
|
||||||
implementation("io.grpc:grpc-kotlin-stub:1.4.1")
|
implementation("io.grpc:grpc-kotlin-stub:1.4.1")
|
||||||
implementation("io.grpc:grpc-protobuf:1.61.1")
|
implementation("io.grpc:grpc-protobuf:1.63.0")
|
||||||
implementation("com.google.protobuf:protobuf-kotlin:3.25.3")
|
implementation("com.google.protobuf:protobuf-kotlin:4.26.1")
|
||||||
implementation("io.grpc:grpc-netty:1.61.1")
|
implementation("io.grpc:grpc-netty:1.63.0")
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
|
||||||
implementation(project(":owl-common"))
|
implementation(project(":owl-common"))
|
||||||
protobuf(files(project(":owl-broker").dependencyProject.projectDir.toString() + "/src/main/proto"))
|
protobuf(files(project(":owl-broker").dependencyProject.projectDir.toString() + "/src/main/proto"))
|
||||||
|
@ -30,11 +30,11 @@ kotlin {
|
||||||
|
|
||||||
protobuf {
|
protobuf {
|
||||||
protoc {
|
protoc {
|
||||||
artifact = "com.google.protobuf:protoc:3.25.3"
|
artifact = "com.google.protobuf:protoc:4.26.1"
|
||||||
}
|
}
|
||||||
plugins {
|
plugins {
|
||||||
create("grpc") {
|
create("grpc") {
|
||||||
artifact = "io.grpc:protoc-gen-grpc-java:1.61.1"
|
artifact = "io.grpc:protoc-gen-grpc-java:1.63.0"
|
||||||
}
|
}
|
||||||
create("grpckt") {
|
create("grpckt") {
|
||||||
artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar"
|
artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar"
|
||||||
|
|
|
@ -14,9 +14,9 @@ dependencies {
|
||||||
testImplementation("org.jetbrains.kotlin:kotlin-test")
|
testImplementation("org.jetbrains.kotlin:kotlin-test")
|
||||||
api(project(":owl-producer:owl-producer-api"))
|
api(project(":owl-producer:owl-producer-api"))
|
||||||
implementation("io.grpc:grpc-kotlin-stub:1.4.1")
|
implementation("io.grpc:grpc-kotlin-stub:1.4.1")
|
||||||
implementation("io.grpc:grpc-protobuf:1.61.1")
|
implementation("io.grpc:grpc-protobuf:1.63.0")
|
||||||
implementation("com.google.protobuf:protobuf-kotlin:3.25.3")
|
implementation("com.google.protobuf:protobuf-kotlin:4.26.1")
|
||||||
implementation("io.grpc:grpc-netty:1.61.1")
|
implementation("io.grpc:grpc-netty:1.63.0")
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
|
||||||
implementation(project(":owl-common"))
|
implementation(project(":owl-common"))
|
||||||
protobuf(files(project(":owl-broker").dependencyProject.projectDir.toString() + "/src/main/proto"))
|
protobuf(files(project(":owl-broker").dependencyProject.projectDir.toString() + "/src/main/proto"))
|
||||||
|
@ -31,11 +31,11 @@ kotlin {
|
||||||
|
|
||||||
protobuf {
|
protobuf {
|
||||||
protoc {
|
protoc {
|
||||||
artifact = "com.google.protobuf:protoc:3.25.3"
|
artifact = "com.google.protobuf:protoc:4.26.1"
|
||||||
}
|
}
|
||||||
plugins {
|
plugins {
|
||||||
create("grpc") {
|
create("grpc") {
|
||||||
artifact = "io.grpc:protoc-gen-grpc-java:1.61.1"
|
artifact = "io.grpc:protoc-gen-grpc-java:1.63.0"
|
||||||
}
|
}
|
||||||
create("grpckt") {
|
create("grpckt") {
|
||||||
artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar"
|
artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
plugins {
|
plugins {
|
||||||
id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
|
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
|
||||||
}
|
}
|
||||||
dependencyResolutionManagement {
|
dependencyResolutionManagement {
|
||||||
repositories {
|
repositories {
|
||||||
|
|
Loading…
Reference in New Issue