Skip to content

Fix CVE sqlite postgres libraries #1454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: 5.0.x
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions .semaphore/project.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# This file is managed by ServiceBot plugin - Semaphore. The content in this file is created using a common
# template and configurations in service.yml.
# Modifications in this file will be overwritten by generated content in the nightly run.
# For more information, please refer to the page:
# https://confluentinc.atlassian.net/wiki/spaces/Foundations/pages/2871296194/Add+SemaphoreCI
apiVersion: v1alpha
kind: Project
metadata:
name: kafka-connect-jdbc
description: ""
spec:
visibility: private
repository:
url: [email protected]:confluentinc/kafka-connect-jdbc.git
run_on:
- branches
- pull_requests
pipeline_file: .semaphore/semaphore.yml
integration_type: github_app
status:
pipeline_files:
- path: .semaphore/semaphore.yml
level: pipeline
whitelist:
branches:
- master
- main
- /^\d+\.\d+\.x$/
- /^gh-readonly-queue.*/
custom_permissions: true
debug_permissions:
- empty
- default_branch
- non_default_branch
- pull_request
- forked_pull_request
- tag
attach_permissions:
- default_branch
- non_default_branch
- pull_request
- forked_pull_request
- tag
89 changes: 89 additions & 0 deletions .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
# This file is managed by ServiceBot plugin - Semaphore. The content in this file is created using a common
# template and configurations in service.yml.
# Any modifications made to ths file will be overwritten by the generated content in nightly runs.
# For more information, please refer to the page:
# https://confluentinc.atlassian.net/wiki/spaces/Foundations/pages/2871296194/Add+SemaphoreCI
version: v1.0
name: build-test-release
agent:
machine:
type: s1-prod-ubuntu20-04-amd64-1

fail_fast:
cancel:
when: "true"

execution_time_limit:
hours: 1

queue:
- when: "branch != 'master' and branch !~ '[0-9]+\\.[0-9]+\\.x'"
processing: parallel

global_job_config:
prologue:
commands:
- checkout
- sem-version java 8
- . cache-maven restore

blocks:
- name: Test
dependencies: []
run:
# don't run the tests on non-functional changes...
when: "change_in('/', {exclude: ['/.deployed-versions/', '.github/']})"
task:
jobs:
- name: Test
commands:
- pip install confluent-release-tools -q
- . sem-pint
- sudo apt-get --assume-yes install libncurses5
- mvn -Dcloud -Pjenkins -U -Dmaven.wagon.http.retryHandler.count=10 -Ddependency.check.skip=true --batch-mode --no-transfer-progress clean verify install dependency:analyze validate
- . cve-scan
- . cache-maven store
epilogue:
always:
commands:
- . publish-test-results
- artifact push workflow target/test-results

- name: Release
dependencies: ["Test"]
run:
when: "branch = 'master' or branch =~ '[0-9]+\\.[0-9]+\\.x'"
task:
jobs:
- name: Release
commands:
- mvn -Dcloud -Pjenkins -U -Dmaven.wagon.http.retryHandler.count=10 -Ddependency.check.skip=true --batch-mode -DaltDeploymentRepository=confluent-codeartifact-internal::default::https://confluent-519856050701.d.codeartifact.us-west-2.amazonaws.com/maven/maven-snapshots/
-DrepositoryId=confluent-codeartifact-internal deploy -DskipTests

- name: Release Notes
dependencies: []
run:
when: "branch =~ '[0-9]+\\.[0-9]+\\.x'"
task:
jobs:
- name: Generate Release Notes
commands:
- git clone --branch master --single-branch [email protected]:confluentinc/connect-releases.git
- ./connect-releases/tasks/release-connect-plugins/generate-connect-changelogs.sh
after_pipeline:
task:
agent:
machine:
type: s1-prod-ubuntu20-04-arm64-0
jobs:
- name: Metrics
commands:
- emit-ci-metrics -p -a test-results
- name: Publish Test Results
commands:
- test-results gen-pipeline-report
- name: SonarQube
commands:
- checkout
- sem-version java 11
- emit-sonarqube-data -a test-results
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
<derby.version>10.14.2.0</derby.version>
<commons-io.version>2.4</commons-io.version>
<kafka.connect.maven.plugin.version>0.11.1</kafka.connect.maven.plugin.version>
<sqlite-jdbc.version>3.25.2</sqlite-jdbc.version>
<postgresql.version>42.4.3</postgresql.version>
<sqlite-jdbc.version>3.41.2.2</sqlite-jdbc.version>
<postgresql.version>42.4.4</postgresql.version>
<jtds.driver.version>1.3.1</jtds.driver.version>
<licenses.name>Apache License 2.0</licenses.name>
<licenses.version>${project.version}</licenses.version>
Expand Down
15 changes: 15 additions & 0 deletions service.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: kafka-connect-jdbc
lang: java
lang_version: 8
git:
enable: true
codeowners:
enable: true
semaphore:
enable: true
pipeline_type: cp
trivy_scan: true
extra_deploy_args: "-Dcloud -Pjenkins"
extra_build_args: "-Dcloud -Pjenkins"
run_pint_merge: true
generate_connect_changelogs: true
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ protected CachedConnectionProvider connectionProvider(
// Close with stopping will be invoked when the connector is stopped
mockCachedConnectionProvider.close(true);
PowerMock.expectLastCall().atLeastOnce();
mockCachedConnectionProvider.close();
PowerMock.expectLastCall().anyTimes();

PowerMock.replayAll();

Expand Down