From 4469421ea6fa243e31edd1b2506af4705e977626 Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Sun, 22 Oct 2023 17:01:36 +0200 Subject: [PATCH 1/6] Use ossrh for deployments. --- pom.xml | 38 +++++++------------------------------- 1 file changed, 7 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index 42ce5e637..0d7014e97 100644 --- a/pom.xml +++ b/pom.xml @@ -308,36 +308,11 @@ - - - etc - true - - - src/main/resources - false - - - org.pitest pitest-maven - ${maven-pitest-plugin.version} - - - org.pitest - pitest-junit5-plugin - ${pitest-junit5-plugin.version} - - - XML,HTML - - *equals - *hashCode - *toString - *Test* @@ -608,13 +583,14 @@ - - maven.jenkins-ci.org - https://repo.jenkins-ci.org/releases/ - - maven.jenkins-ci.org - https://repo.jenkins-ci.org/snapshots/ + ossrh + https://s01.oss.sonatype.org/content/repositories/snapshots + + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + From 3374836fd1f7429f8b294619cf351a311e962c80 Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Sun, 22 Oct 2023 17:06:35 +0200 Subject: [PATCH 2/6] [maven-release-plugin] prepare release v11.12.0 --- pom.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 0d7014e97..262ea3971 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 @@ -8,11 +7,11 @@ edu.hm.hafner codingstyle-pom 3.35.0 - + analysis-model - ${revision}${changelist} + 11.12.0 jar @@ -27,7 +26,7 @@ scm:git:https://github.com/jenkinsci/analysis-model.git scm:git:git@github.com:jenkinsci/analysis-model.git https://github.com/jenkinsci/analysis-model - ${scmTag} + v11.12.0 From 6ef26ec866b9e5b547eaf968560300549a06c7db Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Sun, 22 Oct 2023 17:06:43 +0200 Subject: [PATCH 3/6] [maven-release-plugin] prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 262ea3971..d668ce3d2 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ analysis-model - 11.12.0 + ${revision}${changelist} jar @@ -26,7 +26,7 @@ scm:git:https://github.com/jenkinsci/analysis-model.git scm:git:git@github.com:jenkinsci/analysis-model.git https://github.com/jenkinsci/analysis-model - v11.12.0 + ${scmTag} @@ -53,7 +53,7 @@ HEAD - 11.12.0 + 11.13.0 -SNAPSHOT edu.hm.hafner.analysis.model From a3075849e35d1e544d0fb93f761c0186a74fbbba Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Mon, 23 Oct 2023 09:25:08 +0200 Subject: [PATCH 4/6] Remove disable nexus step. --- SUPPORTED-FORMATS.md | 2 +- doc/dependency-graph.puml | 15 +++++++-------- pom.xml | 30 ------------------------------ 3 files changed, 8 insertions(+), 39 deletions(-) diff --git a/SUPPORTED-FORMATS.md b/SUPPORTED-FORMATS.md index e0a223895..ab0186ec0 100644 --- a/SUPPORTED-FORMATS.md +++ b/SUPPORTED-FORMATS.md @@ -1,4 +1,4 @@ - + # Supported Report Formats The static analysis model supports the following report formats. diff --git a/doc/dependency-graph.puml b/doc/dependency-graph.puml index 2d69a8a75..a4ac17991 100644 --- a/doc/dependency-graph.puml +++ b/doc/dependency-graph.puml @@ -6,12 +6,12 @@ skinparam rectangle { BackgroundColor<> lightBlue BackgroundColor<> lightGray } -rectangle "analysis-model\n\n11.11.0" as edu_hm_hafner_analysis_model_jar -rectangle "jsoup\n\n1.16.1" as org_jsoup_jsoup_jar +rectangle "analysis-model\n\n11.12.0" as edu_hm_hafner_analysis_model_jar +rectangle "jsoup\n\n1.16.2" as org_jsoup_jsoup_jar rectangle "commons-io\n\n2.11.0" as commons_io_commons_io_jar rectangle "commons-digester3\n\n3.2" as org_apache_commons_commons_digester3_jar rectangle "cglib\n\n2.2.2" as cglib_cglib_jar -rectangle "commons-logging\n\n1.1.1" as commons_logging_commons_logging_jar +rectangle "commons-logging\n\n1.2" as commons_logging_commons_logging_jar rectangle "commons-beanutils\n\n1.9.4" as commons_beanutils_commons_beanutils_jar rectangle "commons-collections\n\n3.2.2" as commons_collections_commons_collections_jar rectangle "commons-text\n\n1.10.0" as org_apache_commons_commons_text_jar @@ -29,7 +29,6 @@ rectangle "jcip-annotations\n\n1.0-1" as com_github_stephenc_jcip_jcip_annotatio rectangle "dom4j\n\n2.1.4" as org_dom4j_dom4j_jar rectangle "gson\n\n2.10.1" as com_google_code_gson_gson_jar rectangle "bcel\n\n6.7.0" as org_apache_bcel_bcel_jar -rectangle "commons-lang3\n\n3.13.0" as org_apache_commons_commons_lang3_jar rectangle "pmd-core\n\n6.55.0" as net_sourceforge_pmd_pmd_core_jar rectangle "antlr4-runtime\n\n4.7.2" as org_antlr_antlr4_runtime_jar rectangle "jcommander\n\n1.82" as com_beust_jcommander_jar @@ -39,15 +38,16 @@ rectangle "json-smart\n\n2.5.0" as net_minidev_json_smart_jar rectangle "accessors-smart\n\n2.5.0" as net_minidev_accessors_smart_jar rectangle "slf4j-api\n\n2.0.9" as org_slf4j_slf4j_api_jar rectangle "spotbugs-annotations\n\n4.7.3" as com_github_spotbugs_spotbugs_annotations_jar -rectangle "error_prone_annotations\n\n2.22.0" as com_google_errorprone_error_prone_annotations_jar +rectangle "error_prone_annotations\n\n2.23.0" as com_google_errorprone_error_prone_annotations_jar rectangle "streamex\n\n0.8.2" as one_util_streamex_jar -rectangle "codingstyle\n\n3.24.0" as edu_hm_hafner_codingstyle_jar +rectangle "codingstyle\n\n3.25.0" as edu_hm_hafner_codingstyle_jar +rectangle "commons-lang3\n\n3.13.0" as org_apache_commons_commons_lang3_jar edu_hm_hafner_analysis_model_jar -[#000000]-> org_jsoup_jsoup_jar edu_hm_hafner_analysis_model_jar -[#000000]-> commons_io_commons_io_jar org_apache_commons_commons_digester3_jar -[#000000]-> cglib_cglib_jar org_apache_commons_commons_digester3_jar -[#000000]-> commons_logging_commons_logging_jar edu_hm_hafner_analysis_model_jar -[#000000]-> org_apache_commons_commons_digester3_jar -commons_beanutils_commons_beanutils_jar .[#FF0000].> commons_logging_commons_logging_jar: 1.2 +commons_beanutils_commons_beanutils_jar .[#D3D3D3].> commons_logging_commons_logging_jar commons_beanutils_commons_beanutils_jar -[#000000]-> commons_collections_commons_collections_jar edu_hm_hafner_analysis_model_jar -[#000000]-> commons_beanutils_commons_beanutils_jar edu_hm_hafner_analysis_model_jar -[#000000]-> org_apache_commons_commons_text_jar @@ -68,7 +68,6 @@ com_github_spotbugs_spotbugs_jar -[#000000]-> com_github_stephenc_jcip_jcip_anno com_github_spotbugs_spotbugs_jar -[#000000]-> org_dom4j_dom4j_jar com_github_spotbugs_spotbugs_jar -[#000000]-> com_google_code_gson_gson_jar edu_hm_hafner_analysis_model_jar -[#000000]-> com_github_spotbugs_spotbugs_jar -org_apache_bcel_bcel_jar .[#FF0000].> org_apache_commons_commons_lang3_jar: 3.12.0 edu_hm_hafner_analysis_model_jar -[#000000]-> org_apache_bcel_bcel_jar net_sourceforge_pmd_pmd_core_jar -[#000000]-> org_antlr_antlr4_runtime_jar edu_hm_hafner_analysis_model_jar -[#000000]-> net_sourceforge_pmd_pmd_core_jar diff --git a/pom.xml b/pom.xml index d668ce3d2..3608fb13a 100644 --- a/pom.xml +++ b/pom.xml @@ -422,14 +422,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - false - - true - - org.apache.maven.plugins maven-shade-plugin @@ -559,28 +551,6 @@ - - - repo.jenkins-ci.org - https://repo.jenkins-ci.org/public/ - - - incrementals.jenkins-ci.org - https://repo.jenkins-ci.org/incrementals/ - - - - - - repo.jenkins-ci.org - https://repo.jenkins-ci.org/public/ - - - incrementals.jenkins-ci.org - https://repo.jenkins-ci.org/incrementals/ - - - ossrh From a83e35881ffd863d23b30fcaca670bd8b4e68c9f Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Mon, 23 Oct 2023 09:28:28 +0200 Subject: [PATCH 5/6] [maven-release-plugin] prepare release v11.13.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3608fb13a..27b9f903b 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ analysis-model - ${revision}${changelist} + 11.13.0 jar @@ -26,7 +26,7 @@ scm:git:https://github.com/jenkinsci/analysis-model.git scm:git:git@github.com:jenkinsci/analysis-model.git https://github.com/jenkinsci/analysis-model - ${scmTag} + v11.13.0 From 51b2c515e34357b229a02d143bf079d7f9ba1f85 Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Mon, 23 Oct 2023 09:28:36 +0200 Subject: [PATCH 6/6] [maven-release-plugin] prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 27b9f903b..bcc1ab4cb 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ analysis-model - 11.13.0 + ${revision}${changelist} jar @@ -26,7 +26,7 @@ scm:git:https://github.com/jenkinsci/analysis-model.git scm:git:git@github.com:jenkinsci/analysis-model.git https://github.com/jenkinsci/analysis-model - v11.13.0 + ${scmTag} @@ -53,7 +53,7 @@ HEAD - 11.13.0 + 11.14.0 -SNAPSHOT edu.hm.hafner.analysis.model