diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cecfc0e..2cd143b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,8 +30,8 @@ jobs: strategy: fail-fast: true steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 + - uses: actions/checkout@v7 + - uses: actions/setup-java@v6 with: # zulu ships a macOS aarch64 build of JDK 8, temurin does not distribution: zulu @@ -45,8 +45,8 @@ jobs: strategy: fail-fast: true steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 + - uses: actions/checkout@v7 + - uses: actions/setup-java@v6 with: distribution: zulu java-version: 8 diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index 8205159..e0c5728 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -37,23 +37,23 @@ jobs: TAG: ${{ github.sha }} steps: - name: Checkout source codes - uses: actions/checkout@v2 + uses: actions/checkout@v7 - name: Cache local Maven repository - uses: actions/cache@v4 + uses: actions/cache@v6 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - name: Log in to the Container registry - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0 + uses: docker/login-action@81c6f93d4bc991e510b342a00b419b3bb4efc5c6 # v4.7.0 with: registry: ${{ env.HUB }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Set up QEMU - uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0 + uses: docker/setup-qemu-action@99012661954931238ded8c8b007157a8430204e1 # v4.4.0 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0 + uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4.4.1 - name: Build and push docker images run: make build.mock-collector docker.push diff --git a/pom.xml b/pom.xml index 7f32622..4df21cb 100644 --- a/pom.xml +++ b/pom.xml @@ -44,13 +44,13 @@ UTF-8 4.13.1 - 20.0 + 33.7.2-jre 2.8.9 1.42.1 1.18.30 - 1.31 + 2.0 1.7.25 - 2.17.1 + 2.25.5 4.1.42.Final 9.4.2.v20170220 2.0.26.Final diff --git a/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/Data.java b/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/Data.java index c8776c5..0459abe 100644 --- a/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/Data.java +++ b/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/Data.java @@ -19,6 +19,8 @@ import java.io.FileNotFoundException; import org.apache.skywalking.plugin.test.agent.tool.validator.exception.IllegalDataFileException; +import org.yaml.snakeyaml.DumperOptions; +import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.Constructor; @@ -44,11 +46,11 @@ public static Data loadData(File file) { } public static Data loadData(InputStream inputStream) { - Constructor constructor = new Constructor(DataForRead.class); + Constructor constructor = new Constructor(DataForRead.class, new LoaderOptions()); TypeDescription configDescription = new TypeDescription(DataForRead.class); configDescription.putListPropertyType("data", DataForRead.class); - Representer representer = new Representer(); + Representer representer = new Representer(new DumperOptions()); representer.getPropertyUtils().setSkipMissingProperties(true); Yaml yaml = new Yaml(constructor, representer); return yaml.loadAs(inputStream, DataForRead.class);