Skip to content

Commit

Permalink
[TH2-5226] Fixed incorrect java entrypoint problem (#125)
Browse files Browse the repository at this point in the history
  • Loading branch information
Nikita-Smirnov-Exactpro authored Feb 3, 2025
1 parent 1a2b25e commit e8cb0d4
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 10 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build-dev-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 0 additions & 2 deletions .github/workflows/build-sanpshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
6 changes: 3 additions & 3 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 5 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
release_version = 4.7.0
release_version = 4.7.1
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit e8cb0d4

Please sign in to comment.