From 224b95b5481a91af6576b835559b12dd91dd586f Mon Sep 17 00:00:00 2001 From: adityagajbhiye Date: Mon, 27 Mar 2023 20:42:31 +0530 Subject: [PATCH 1/7] workflow update --- .github/workflows/build.yaml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2cca8069..079f09c3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -25,7 +25,7 @@ name: build on: push: branches: - - main + - support-test-connector-service paths: - './**' tags: @@ -65,13 +65,7 @@ jobs: images: | ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | - type=ref,event=branch - type=ref,event=pr - type=semver,pattern={{version}} - type=semver,pattern={{major}} - type=semver,pattern={{major}}.{{minor}} - flavor: | - latest=true + type=semver,pattern={{version}},value=v1.2.2 - name: Log into registry ${{ env.REGISTRY }} if: github.event_name != 'pull_request' From 0af100cf347ab838a740bb428f5c7fae01b4dedd Mon Sep 17 00:00:00 2001 From: Sachin Argade Date: Mon, 27 Mar 2023 20:42:49 +0530 Subject: [PATCH 2/7] vercode Vulnerability fix --- pom.xml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dffd5254..2b2cc7d4 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,11 @@ + + org.springframework + spring-core + 6.0.7 + org.springframework.boot spring-boot-starter-web @@ -138,7 +143,11 @@ spring-boot-starter-test test - + + net.minidev + json-smart + 2.4.9 + org.flywaydb @@ -208,6 +217,12 @@ org.springframework.security spring-security-oauth2-client + + + net.minidev + json-smart + + com.h2database From 3588837371f74f21b15b882b268e57b1b5c88bd9 Mon Sep 17 00:00:00 2001 From: Sachin Argade Date: Mon, 3 Apr 2023 09:37:30 +0530 Subject: [PATCH 3/7] add missing copyright header --- .../manager/TestConnectorServiceManager.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java b/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java index 32ff3272..379ebb09 100644 --- a/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java +++ b/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java @@ -1,3 +1,23 @@ +/******************************************************************************** + * Copyright (c) 2022, 2023 T-Systems International GmbH + * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation + * + * See the NOTICE file(s) distributed with this work for additional + * information regarding copyright ownership. + * + * This program and the accompanying materials are made available under the + * terms of the Apache License, Version 2.0 which is available at + * https://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * SPDX-License-Identifier: Apache-2.0 + ********************************************************************************/ + package org.eclipse.tractusx.autosetup.manager; import java.util.Map; From e87719793c61812ba4326ee4669aa8c2e4716993 Mon Sep 17 00:00:00 2001 From: adkumar1 Date: Mon, 3 Apr 2023 12:07:48 +0530 Subject: [PATCH 4/7] Update build.yaml --- .github/workflows/build.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 079f09c3..2cca8069 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -25,7 +25,7 @@ name: build on: push: branches: - - support-test-connector-service + - main paths: - './**' tags: @@ -65,7 +65,13 @@ jobs: images: | ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | - type=semver,pattern={{version}},value=v1.2.2 + type=ref,event=branch + type=ref,event=pr + type=semver,pattern={{version}} + type=semver,pattern={{major}} + type=semver,pattern={{major}}.{{minor}} + flavor: | + latest=true - name: Log into registry ${{ env.REGISTRY }} if: github.event_name != 'pull_request' From b94ca76f949696a43c3a2a5f466943939b078ab1 Mon Sep 17 00:00:00 2001 From: adkumar1 Date: Mon, 3 Apr 2023 12:11:56 +0530 Subject: [PATCH 5/7] Update ConnectorTestRequest.java --- .../proxy/ConnectorTestRequest.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestRequest.java b/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestRequest.java index 6f8cd1a0..a8b18727 100644 --- a/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestRequest.java +++ b/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestRequest.java @@ -1,3 +1,23 @@ +/******************************************************************************** + * Copyright (c) 2022, 2023 T-Systems International GmbH + * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation + * + * See the NOTICE file(s) distributed with this work for additional + * information regarding copyright ownership. + * + * This program and the accompanying materials are made available under the + * terms of the Apache License, Version 2.0 which is available at + * https://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * SPDX-License-Identifier: Apache-2.0 + ********************************************************************************/ + package org.eclipse.tractusx.autosetup.testservice.proxy; import lombok.Builder; From 0a1ae92f7a296319838f1650c09f3b0e0f2305f2 Mon Sep 17 00:00:00 2001 From: adkumar1 Date: Mon, 3 Apr 2023 12:12:11 +0530 Subject: [PATCH 6/7] Update ConnectorTestServiceProxy.java --- .../proxy/ConnectorTestServiceProxy.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceProxy.java b/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceProxy.java index 2358c5ac..62fc44ea 100644 --- a/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceProxy.java +++ b/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceProxy.java @@ -1,3 +1,23 @@ +/******************************************************************************** + * Copyright (c) 2022, 2023 T-Systems International GmbH + * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation + * + * See the NOTICE file(s) distributed with this work for additional + * information regarding copyright ownership. + * + * This program and the accompanying materials are made available under the + * terms of the Apache License, Version 2.0 which is available at + * https://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * SPDX-License-Identifier: Apache-2.0 + ********************************************************************************/ + package org.eclipse.tractusx.autosetup.testservice.proxy; import org.springframework.cloud.openfeign.FeignClient; From 134b1c09fe2a148c545b9bd2ba8a532a63bc995c Mon Sep 17 00:00:00 2001 From: adkumar1 Date: Mon, 3 Apr 2023 12:12:26 +0530 Subject: [PATCH 7/7] Update ConnectorTestServiceResponse.java --- .../proxy/ConnectorTestServiceResponse.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceResponse.java b/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceResponse.java index 8c00c7bf..fc6497e9 100644 --- a/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceResponse.java +++ b/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceResponse.java @@ -1,3 +1,23 @@ +/******************************************************************************** + * Copyright (c) 2022, 2023 T-Systems International GmbH + * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation + * + * See the NOTICE file(s) distributed with this work for additional + * information regarding copyright ownership. + * + * This program and the accompanying materials are made available under the + * terms of the Apache License, Version 2.0 which is available at + * https://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * SPDX-License-Identifier: Apache-2.0 + ********************************************************************************/ + package org.eclipse.tractusx.autosetup.testservice.proxy; import lombok.Data;