diff --git a/.github/workflows/build-dev-release.yml b/.github/workflows/build-dev-release.yml index 83c821e2..5e46ce81 100644 --- a/.github/workflows/build-dev-release.yml +++ b/.github/workflows/build-dev-release.yml @@ -10,8 +10,6 @@ jobs: devRelease: true createTag: true docker-username: ${{ github.actor }} - # FIXME: strict scanner was disabled for 4.6.4 hotfix publishing and must be removed after that - strict-scanner: false secrets: docker-password: ${{ secrets.GITHUB_TOKEN }} nvd-api-key: ${{ secrets.NVD_APIKEY }} diff --git a/.github/workflows/build-sanpshot.yml b/.github/workflows/build-sanpshot.yml index 9454329f..9366a44e 100644 --- a/.github/workflows/build-sanpshot.yml +++ b/.github/workflows/build-sanpshot.yml @@ -15,8 +15,6 @@ jobs: with: build-target: 'Docker' docker-username: ${{ github.actor }} -# FIXME: strict scanner was disabled for 4.6.4 hotfix publishing and must be removed after that - strict-scanner: false secrets: docker-password: ${{ secrets.GITHUB_TOKEN }} nvd-api-key: ${{ secrets.NVD_APIKEY }} \ No newline at end of file diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 23e327e0..a8499198 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -11,15 +11,15 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up JDK 'zulu' '11' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: '11' - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 - name: Build with Gradle run: ./gradlew --info clean integrationTest - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: failure() with: name: integration-test-results diff --git a/README.md b/README.md index e9daf809..259ac7a5 100644 --- a/README.md +++ b/README.md @@ -144,6 +144,9 @@ openshift: ## Release notes +### 4.7.1 ++ Fixed incorrect java entrypoint problem + ### 4.7.0 + Improved clean rubbish from RabbitMQ on start to delete only redundant resources. The `cleanUpOnStart` option has been removed, the clean rubbish function is enabled. diff --git a/build.gradle b/build.gradle index 9e1f2008..7ba56f7d 100644 --- a/build.gradle +++ b/build.gradle @@ -74,8 +74,12 @@ dependencies { detektPlugins libs.detekt.formatting } +application { + mainClass.set('com.exactpro.th2.infraoperator.Th2CrdController') +} + wrapper { - version '8.7' + version '8.11.1' distributionType Wrapper.DistributionType.BIN } diff --git a/gradle.properties b/gradle.properties index 72df96a7..339c44cf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -release_version = 4.7.0 \ No newline at end of file +release_version = 4.7.1 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23a..e2847c82 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME