From 46d18e7cf4e8415c321b0bc33b0b7a0d9c0ced11 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 17:33:21 +0000 Subject: [PATCH 1/5] Bump se.bjurr.violations:violations-lib from 1.156.6 to 1.156.7 Bumps [se.bjurr.violations:violations-lib](https://github.com/tomasbjerre/violations-lib) from 1.156.6 to 1.156.7. - [Changelog](https://github.com/tomasbjerre/violations-lib/blob/master/CHANGELOG.md) - [Commits](https://github.com/tomasbjerre/violations-lib/compare/1.156.6...1.156.7) --- updated-dependencies: - dependency-name: se.bjurr.violations:violations-lib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 635050065..dee26fc48 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ 6.0.4 1.4.0 2.0.9 - 1.156.6 + 1.156.7 1.16.1 20230618 2.5.0 From 8a0a1b1744fa5c4f54cc9e2cd9654f7e31065e95 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 14:08:47 +0000 Subject: [PATCH 2/5] Bump com.github.spotbugs:spotbugs from 4.7.3 to 4.8.0 Bumps [com.github.spotbugs:spotbugs](https://github.com/spotbugs/spotbugs) from 4.7.3 to 4.8.0. - [Release notes](https://github.com/spotbugs/spotbugs/releases) - [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md) - [Commits](https://github.com/spotbugs/spotbugs/compare/4.7.3...4.8.0) --- updated-dependencies: - dependency-name: com.github.spotbugs:spotbugs dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 635050065..dc6e72d46 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ 20230618 2.5.0 6.55.0 - 4.7.3 + 4.8.0 1.7 3.5.1 From 73285a9e71644ed57a6367a4c9dec2cefbe83d00 Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Fri, 13 Oct 2023 12:53:24 +0200 Subject: [PATCH 3/5] Remove dependency to javax.annotation-api. --- .../assertion_class_template.txt | 26 +++++++++++++++++++ .../assertions_entry_point_class_template.txt | 2 +- ..._assertions_entry_point_class_template.txt | 2 +- pom.xml | 2 +- 4 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 etc/assertj-templates/assertion_class_template.txt diff --git a/etc/assertj-templates/assertion_class_template.txt b/etc/assertj-templates/assertion_class_template.txt new file mode 100644 index 000000000..320e3603b --- /dev/null +++ b/etc/assertj-templates/assertion_class_template.txt @@ -0,0 +1,26 @@ +package ${package}; +${imports} +/** + * {@link ${class_to_assert}} specific assertions - Generated by CustomAssertionGenerator. + */ +@edu.hm.hafner.util.Generated(value="assertj-assertions-generator") +public class ${custom_assertion_class} extends AbstractObjectAssert<${custom_assertion_class}, ${class_to_assert}> { + + /** + * Creates a new {@link ${custom_assertion_class}} to make assertions on actual ${class_to_assert}. + * @param actual the ${class_to_assert} we want to make assertions on. + */ + public ${custom_assertion_class}(${class_to_assert} actual) { + super(actual, ${custom_assertion_class}.class); + } + + /** + * An entry point for ${custom_assertion_class} to follow AssertJ standard assertThat() statements.
+ * With a static import, one can write directly: assertThat(my${class_to_assert}) and get specific assertion with code completion. + * @param actual the ${class_to_assert} we want to make assertions on. + * @return a new {@link ${custom_assertion_class}} + */ + @org.assertj.core.util.CheckReturnValue + public static ${custom_assertion_class} assertThat(${class_to_assert} actual) { + return new ${custom_assertion_class}(actual); + } diff --git a/etc/assertj-templates/assertions_entry_point_class_template.txt b/etc/assertj-templates/assertions_entry_point_class_template.txt index f5204a15d..a275e227a 100644 --- a/etc/assertj-templates/assertions_entry_point_class_template.txt +++ b/etc/assertj-templates/assertions_entry_point_class_template.txt @@ -5,7 +5,7 @@ package ${package}; * type-specific assertion objects. */ @edu.umd.cs.findbugs.annotations.SuppressFBWarnings("NM") -@javax.annotation.Generated(value="assertj-assertions-generator") +@edu.hm.hafner.util.Generated(value="assertj-assertions-generator") public class Assertions extends org.assertj.core.api.Assertions { ${all_assertions_entry_points} /** diff --git a/etc/assertj-templates/soft_assertions_entry_point_class_template.txt b/etc/assertj-templates/soft_assertions_entry_point_class_template.txt index c7485e425..68df98692 100644 --- a/etc/assertj-templates/soft_assertions_entry_point_class_template.txt +++ b/etc/assertj-templates/soft_assertions_entry_point_class_template.txt @@ -4,7 +4,7 @@ package ${package}; * Entry point for soft assertions of different data types. */ @edu.umd.cs.findbugs.annotations.SuppressFBWarnings("NM") -@javax.annotation.Generated(value="assertj-assertions-generator") +@edu.hm.hafner.util.Generated(value="assertj-assertions-generator") public class SoftAssertions extends org.assertj.core.api.AutoCloseableSoftAssertions { ${all_assertions_entry_points} } diff --git a/pom.xml b/pom.xml index 635050065..161043757 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ edu.hm.hafner codingstyle-pom - 3.29.0 + 3.32.0 From 773132bf5b833774851eb34ff1c073a74682aa22 Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Fri, 13 Oct 2023 12:53:38 +0200 Subject: [PATCH 4/5] Switch builds environment matrix to Java 17 and 21 and custom Maven. --- .github/workflows/ci.yml | 11 +++++------ LICENSE | 2 +- README.md | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd028ff05..644a32f98 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,11 +14,6 @@ jobs: matrix: platform: [ubuntu-latest, macos-latest, windows-latest] jdk: [17, 21] - include: - - platform: ubuntu-latest - jdk: 11 - - platform: macos-latest - jdk: 11 runs-on: ${{ matrix.platform }} name: on ${{ matrix.platform }} with JDK ${{ matrix.jdk }} @@ -28,10 +23,14 @@ jobs: - name: Set up JDK ${{ matrix.jdk }} uses: actions/setup-java@v3 with: - distribution: 'zulu' + distribution: 'temurin' java-version: '${{ matrix.jdk }}' check-latest: true cache: 'maven' + - name: Set up Maven + uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.9.5 - name: Build with Maven env: BROWSER: chrome-container diff --git a/LICENSE b/LICENSE index 2f5595810..2657e2991 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2007-2022 Dr. Ullrich Hafner +Copyright (c) 2007-2023 Dr. Ullrich Hafner Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index d23c60aab..e2fd6c6c0 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Join the chat at Gitter/Matrix](https://badges.gitter.im/jenkinsci/warnings-plugin.svg)](https://gitter.im/jenkinsci/warnings-plugin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Jenkins](https://ci.jenkins.io/job/Plugins/job/analysis-model/job/master/badge/icon?subject=Jenkins%20CI)](https://ci.jenkins.io/job/Plugins/job/analysis-model/job/master/) -[![CI on all platforms](https://github.com/jenkinsci/analysis-model/workflows/GitHub%20CI/badge.svg?branch=master)](https://github.com/jenkinsci/analysis-model/actions) +[![CI on all platforms](https://github.com/jenkinsci/analysis-model/workflows/GitHub%20CI/badge.svg?branch=main)](https://github.com/jenkinsci/analysis-model/actions) [![codecov](https://codecov.io/gh/jenkinsci/analysis-model/branch/master/graph/badge.svg)](https://codecov.io/gh/jenkinsci/analysis-model) [![CodeQL](https://github.com/jenkinsci/analysis-model/workflows/CodeQL/badge.svg?branch=master)](https://github.com/jenkinsci/analysis-model/actions/workflows/codeql.yml) From f1db4ce8694b44aec94c7c19e89be9fbe3a921e9 Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Fri, 13 Oct 2023 12:58:50 +0200 Subject: [PATCH 5/5] Rename `master` to `main`. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e2fd6c6c0..8e95c5e05 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Static Analysis Model and Parsers Library [![Join the chat at Gitter/Matrix](https://badges.gitter.im/jenkinsci/warnings-plugin.svg)](https://gitter.im/jenkinsci/warnings-plugin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -[![Jenkins](https://ci.jenkins.io/job/Plugins/job/analysis-model/job/master/badge/icon?subject=Jenkins%20CI)](https://ci.jenkins.io/job/Plugins/job/analysis-model/job/master/) +[![Jenkins](https://ci.jenkins.io/job/Plugins/job/analysis-model/job/main/badge/icon?subject=Jenkins%20CI)](https://ci.jenkins.io/job/Plugins/job/analysis-model/job/main/) [![CI on all platforms](https://github.com/jenkinsci/analysis-model/workflows/GitHub%20CI/badge.svg?branch=main)](https://github.com/jenkinsci/analysis-model/actions) [![codecov](https://codecov.io/gh/jenkinsci/analysis-model/branch/master/graph/badge.svg)](https://codecov.io/gh/jenkinsci/analysis-model) [![CodeQL](https://github.com/jenkinsci/analysis-model/workflows/CodeQL/badge.svg?branch=master)](https://github.com/jenkinsci/analysis-model/actions/workflows/codeql.yml)