-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updated dependencies and migrated to th2 gradle plugin
0.0.6 (#19)
* Migrated from jaxb-api: `2.3.1` to jakarta.xml.bind-api: `4.0.2`
- Loading branch information
1 parent
2964744
commit f9a7713
Showing
19 changed files
with
167 additions
and
107 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| name: Build and publish dev release Docker image to Github Container Registry ghcr.io and publish dev release jar to sonatype | ||
|
|
||
| on: workflow_dispatch | ||
|
|
||
| jobs: | ||
| build: | ||
| uses: th2-net/.github/.github/workflows/compound-java.yml@main | ||
| with: | ||
| build-target: 'Sonatype,Docker' | ||
| devRelease: true | ||
| createTag: true | ||
| docker-username: ${{ github.actor }} | ||
| secrets: | ||
| docker-password: ${{ secrets.GITHUB_TOKEN }} | ||
| sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }} | ||
| sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} | ||
| sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }} | ||
| sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }} | ||
| nvd-api-key: ${{ secrets.NVD_APIKEY }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| name: Build and publish release Docker image to Github Container Registry ghcr.io and publish release jar to sonatype | ||
|
|
||
| on: workflow_dispatch | ||
|
|
||
| jobs: | ||
| build: | ||
| uses: th2-net/.github/.github/workflows/compound-java.yml@main | ||
| with: | ||
| build-target: 'Sonatype,Docker' | ||
| devRelease: false | ||
| createTag: true | ||
| docker-username: ${{ github.actor }} | ||
| secrets: | ||
| docker-password: ${{ secrets.GITHUB_TOKEN }} | ||
| sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }} | ||
| sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} | ||
| sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }} | ||
| sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }} | ||
| nvd-api-key: ${{ secrets.NVD_APIKEY }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| name: Build and publish Docker image to Github Container Registry ghcr.io and publish snapshot jar to sonatype | ||
|
|
||
| on: | ||
| push: | ||
| branches-ignore: | ||
| - master | ||
| - version-* | ||
| - dependabot** | ||
| paths-ignore: | ||
| - README.md | ||
|
|
||
| jobs: | ||
| build-job: | ||
| uses: th2-net/.github/.github/workflows/compound-java-dev.yml@main | ||
| with: | ||
| build-target: 'Sonatype,Docker' | ||
| docker-username: ${{ github.actor }} | ||
| secrets: | ||
| docker-password: ${{ secrets.GITHUB_TOKEN }} | ||
| sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }} | ||
| sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} | ||
| sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }} | ||
| sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }} | ||
| nvd-api-key: ${{ secrets.NVD_APIKEY }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,77 @@ | ||
| buildscript { | ||
| repositories { | ||
| maven { | ||
| url = "https://s01.oss.sonatype.org/content/repositories/snapshots/" | ||
| } | ||
| } | ||
| dependencies { | ||
| classpath "com.exactpro.th2:th2-gradle-plugin:0.0.1-dev-5915772757-13a28ae-SNAPSHOT" | ||
| } | ||
| plugins { | ||
| id "org.jetbrains.kotlin.jvm" version "1.8.22" | ||
| id "org.jetbrains.kotlin.kapt" version "1.8.22" | ||
| id("java-library") | ||
| id("maven-publish") | ||
|
|
||
| id "com.exactpro.th2.gradle.publish" version "0.0.6" | ||
| id "com.exactpro.th2.gradle.component" version "0.0.6" | ||
|
|
||
| id "me.champeau.jmh" version "0.7.2" | ||
| } | ||
|
|
||
| plugins { | ||
| // for run ./gradlew jmh | ||
| id 'me.champeau.jmh' version '0.6.8' | ||
| group = 'com.exactpro.th2' | ||
| version = release_version | ||
|
|
||
| kotlin { | ||
| jvmToolchain(11) | ||
| } | ||
|
|
||
| apply plugin: "com.exactpro.th2.common-conventions" | ||
| apply plugin: "com.exactpro.th2.docker-conventions" | ||
| repositories { | ||
| mavenCentral() | ||
| maven { | ||
| name 'Sonatype_snapshots' | ||
| url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' | ||
| } | ||
| maven { | ||
| name 'Sonatype_releases' | ||
| url 'https://s01.oss.sonatype.org/content/repositories/releases/' | ||
| } | ||
| mavenLocal() | ||
|
|
||
| apply plugin: 'kotlin-kapt' | ||
| configurations.configureEach { | ||
| resolutionStrategy.cacheChangingModulesFor 0, 'seconds' | ||
| resolutionStrategy.cacheDynamicVersionsFor 0, 'seconds' | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| api platform('com.exactpro.th2:bom:4.5.0') | ||
| implementation "com.exactpro.th2:common:5.10.1-dev" | ||
| implementation "com.exactpro.th2:common-utils:2.2.3-dev" | ||
| implementation "com.exactpro.th2:codec:5.5.0-dev" | ||
| implementation "jakarta.xml.bind:jakarta.xml.bind-api:4.0.2" | ||
|
|
||
|
|
||
| implementation'org.apache.avro:avro:1.11.3' | ||
| implementation('org.apache.commons:commons-compress:1.26.1') { | ||
| because("commons-compress:1.22 transitive dependency of avro:1.11.3 has vulnerabilities") | ||
| } | ||
|
|
||
| implementation "com.exactpro.th2:common:5.7.2-dev" | ||
| implementation "com.exactpro.th2:common-utils:2.2.2-dev" | ||
| implementation "com.exactpro.th2:codec:5.4.1-dev" | ||
| implementation 'javax.xml.bind:jaxb-api:2.3.1' | ||
| implementation 'commons-io:commons-io' | ||
|
|
||
| implementation 'org.apache.avro:avro:1.11.1' | ||
| implementation 'commons-io:commons-io:2.12.0' | ||
| implementation "io.github.microutils:kotlin-logging:3.0.5" | ||
|
|
||
| compileOnly 'com.google.auto.service:auto-service:1.0.1' | ||
| testImplementation 'org.jetbrains.kotlin:kotlin-test-junit5:1.6.21' | ||
| kapt 'com.google.auto.service:auto-service:1.0.1' | ||
| compileOnly 'com.google.auto.service:auto-service:1.1.1' | ||
| kapt 'com.google.auto.service:auto-service:1.1.1' | ||
|
|
||
| jmh 'org.openjdk.jmh:jmh-core:1.36' | ||
| jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.36' | ||
| jmhAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.36' | ||
| jmh 'org.openjdk.jmh:jmh-core:1.37' | ||
| jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.37' | ||
| jmhAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.37' | ||
|
|
||
| testImplementation "org.jetbrains.kotlin:kotlin-test-junit" | ||
| testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2' | ||
| testImplementation 'org.mockito.kotlin:mockito-kotlin:5.3.1' | ||
| testImplementation 'io.strikt:strikt-core:0.34.1' | ||
| } | ||
|
|
||
| application { | ||
| mainClass.set("com.exactpro.th2.codec.MainKt") | ||
| } | ||
|
|
||
| jmh { | ||
| //profilers = ['stack'] // Use profilers to collect additional data. Supported profilers: [cl, comp, gc, stack, perf, perfnorm, perfasm, xperf, xperfasm, hs_cl, hs_comp, hs_gc, hs_rt, hs_thr, async] | ||
| test { | ||
| useJUnitPlatform() | ||
| } | ||
| dependencyLocking { | ||
| lockAllConfigurations() | ||
|
|
||
| dependencyCheck { | ||
| suppressionFile='supressions.xml' | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| release_version=2.4.0 | ||
| app_main_class=com.exactpro.th2.codec.MainKt | ||
| release_version=3.0.0 | ||
| description='th2 codec avro' | ||
| vcs_url=https://github.com/th2-net/th2-codec-avro |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.