Merge remote-tracking branch 'origin/master' into TS-1574

.github/workflows/dev-docker-publish.yml

@@ -10,39 +10,10 @@ on:
       - README.md
 
 jobs:
-  build:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-# Prepare custom build version
-    - name: Get branch name
-      id: branch
-      run: echo ::set-output name=branch_name::${GITHUB_REF#refs/*/}
-    - name: Get release_version
-      id: ver
-      uses: christian-draeger/[email protected]
-      with:
-        path: gradle.properties
-        property: release_version
-    - name: Build custom release version
-      id: release_ver
-      run: echo ::set-output name=value::"${{ steps.ver.outputs.value }}-${{ steps.branch.outputs.branch_name }}-${{ github.run_id }}"
-    - name: Show custom release version
-      run: echo ${{ steps.release_ver.outputs.value }}
-# Build and publish image
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
-    - uses: docker/login-action@v1
-      with:
-        registry: ghcr.io
-        username: ${{ github.repository_owner }}
-        password: ${{ secrets.CR_PAT }}
-    - run: echo "::set-output name=REPOSITORY_NAME::$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')"
-      id: meta
-    - name: Build and push
-      id: docker_build
-      uses: docker/build-push-action@v2
-      with:
-        push: true
-        tags: ghcr.io/${{ github.repository }}:${{ steps.release_ver.outputs.value }}
-        labels: com.exactpro.th2.${{ steps.meta.outputs.REPOSITORY_NAME }}=${{ steps.ver.outputs.value }}
+  build-job:
+    uses: th2-net/.github/.github/workflows/compound-java-dev.yml@main
+    with:
+      build-target: 'Docker'
+      docker-username: ${{ github.actor }}
+    secrets:
+      docker-password: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/docker-publish.yml

@@ -3,33 +3,17 @@ name: Build and publish Docker distributions to Github Container Registry ghcr.i
 on:
   push:
     branches:
-    - master
-    - version-*
+      - master
+      - version-*
+    paths:
+      - gradle.properties
+#    - package_info.json
 
 jobs:
-  build:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
-    - uses: docker/login-action@v1
-      with:
-        registry: ghcr.io
-        username: ${{ github.repository_owner }}
-        password: ${{ secrets.CR_PAT }}
-    - run: echo "::set-output name=REPOSITORY_NAME::$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')"
-      id: meta
-    - name: Read version from gradle.properties
-      id: read_property
-      uses: christian-draeger/[email protected]
-      with:
-        path: ./gradle.properties
-        property: release_version
-    - name: Build and push
-      id: docker_build
-      uses: docker/build-push-action@v2
-      with:
-        push: true
-        tags: ghcr.io/${{ github.repository }}:${{ steps.read_property.outputs.value }}
-        labels: com.exactpro.th2.${{ steps.meta.outputs.REPOSITORY_NAME }}=${{ steps.read_property.outputs.value }}
+  build-job:
+    uses: th2-net/.github/.github/workflows/compound-java.yml@main
+    with:
+      build-target: 'Docker'
+      docker-username: ${{ github.actor }}
+    secrets:
+      docker-password: ${{ secrets.GITHUB_TOKEN }}

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 variables:
-  APP_NAME: "th2-conn"
+  APP_NAME: "th2-conn-sailfish"
 
 include:
   - project: "vivarium/th2/pipelines"

README.md

@@ -1,4 +1,4 @@
-# Connect (3.11.0)
+# Connect (3.11.1)
 
 The "Connect" component is responsible for the communication with a target system.
 This component implements the logic of the interaction protocol, receiving and sending messages from and to the system, respectively.
@@ -121,11 +121,17 @@ spec:
 
 ## Release notes
 
+### 3.11.1
++ Updated `sailfish-core` version from `3.3.54` to `3.3.132`
+
 ### 3.11.0
 
 + Added `maxMessageFlushTime` option
-+ Dependencies with vulnerabilities were updated:
-  + Sailfish updated from `3.2.1741` to `3.3.13`
+
++ Updated `sailfish-core` version from `3.2.1741` to `3.3.54`
++ Updated `common` from `3.33.0` to `3.44.0`
++ Updated `kotlin` form `1.5.30` to `1.6.21`
++ Renamed project to `conn-sailfish`
 
 ### 3.10.2
 

build.gradle

@@ -2,26 +2,39 @@ plugins {
     id 'com.palantir.docker' version '0.25.0'
     id 'org.jetbrains.kotlin.jvm' version '1.6.21'
     id 'application'
+    id "org.owasp.dependencycheck" version "7.4.4"
+}
+
+dependencyCheck {
+    format='HTML'
 }
 
 ext {
-    sharedDir                       = file("${project.rootDir}/shared")
-    sailfishVersion                 = '3.3.13'
+    sailfishVersion = '3.3.132'
+}
+
+ext.excludeSailfish = { rcd ->
+    rcd.excludeModule("com.exactpro.sf", "sailfish-core")
+    rcd.excludeModule("com.exactpro.sf", "sailfish-common")
+    rcd.excludeModule("com.exactpro.sf", "sailfish-rest-api-client")
+    rcd.excludeModule("com.exactpro.sf", "service-http")
 }
 
 group = 'com.exactpro.th2'
 version = release_version
 
 repositories {
     maven {
-        name 'MavenLocal'
-        url sharedDir
+        name 'Sonatype_snapshots'
+        url 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
+        content {
+            excludeSailfish(it)
+        }
     }
-
     // ignoreGradleMetadataRedirection is used for sonatype because
     // Sailfish dependencies have constrains that interfere with our BOM
-    // so we exclude Gradle metadata for this repositories
-
+    // so we exclude Gradle metadata for this repositories.
+    // We've checked these versions - they are compatible and safe to use
     maven {
         name 'Sonatype_snapshots'
         url 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
@@ -34,18 +47,20 @@ repositories {
     maven {
         name 'Sonatype_releases'
         url 'https://s01.oss.sonatype.org/content/repositories/releases/'
-        metadataSources {
-            mavenPom()
-            artifact()
-            ignoreGradleMetadataRedirection()
+        content {
+            excludeSailfish(it)
         }
     }
-    mavenCentral {
+    maven {
+        name 'Sonatype_releases'
+        url 'https://s01.oss.sonatype.org/content/repositories/releases/'
         metadataSources {
             mavenPom()
             artifact()
+            ignoreGradleMetadataRedirection()
         }
     }
+    mavenCentral()
     mavenLocal()
 
     configurations.all {
@@ -80,22 +95,17 @@ compileTestKotlin {
 }
 
 dependencies {
-    api platform('com.exactpro.th2:bom:4.0.1')
+    api platform('com.exactpro.th2:bom:4.1.0')
 
-    implementation 'com.exactpro.th2:common:3.42.0-dev-3174619150-SNAPSHOT'
-    implementation 'com.exactpro.th2:sailfish-utils:3.13.0-dev-3204703314-SNAPSHOT'
-
-    implementation "org.slf4j:slf4j-api"
+    implementation 'com.exactpro.th2:common:3.44.0'
+    implementation 'com.exactpro.th2:sailfish-utils:3.14.0'
 
     implementation group: 'io.reactivex.rxjava3', name: 'rxjava', version: '3.0.4'
 
     implementation 'io.prometheus:simpleclient'
 
     implementation("com.exactpro.sf:sailfish-core:${sailfishVersion}")
 
-    testImplementation('org.apache.logging.log4j:log4j-slf4j-impl') {
-        because('logging in testing')
-    }
     testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0'
 }
 

gradle.properties

@@ -1 +1 @@
-release_version=3.11.0
+release_version = 3.11.1

settings.gradle

@@ -1 +1 @@
-rootProject.name = 'conn'
+rootProject.name = 'conn-sailfish'