From 4087fd86a202321492e4ccfc24f29f3d06a74715 Mon Sep 17 00:00:00 2001 From: Markus Heberling Date: Mon, 7 Aug 2023 11:20:55 +0200 Subject: [PATCH 1/6] Use Maven 3.6.3 as minimal version --- pom.xml | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index bd9dbbf..295c85c 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,15 @@ HEAD + + ${mavenVersion} + + + + 3.6.3 + 3.9.0 + + @@ -30,7 +39,7 @@ maven-plugin-plugin - 3.2 + ${mavenPluginToolsVersion} assertj @@ -131,17 +140,19 @@ org.apache.maven maven-plugin-api - 2.2.1 + ${mavenVersion} + provided org.apache.maven - maven-project - 2.2.1 + maven-core + ${mavenVersion} + provided org.apache.maven.plugin-tools maven-plugin-annotations - 3.2 + ${mavenPluginToolsVersion} provided From 0db4feb92ca77dd992047f54062b947a201adc40 Mon Sep 17 00:00:00 2001 From: Markus Heberling Date: Mon, 7 Aug 2023 12:22:38 +0200 Subject: [PATCH 2/6] Update assertj-parent to 3.24.2 --- pom.xml | 4 ++-- .../org/assertj/maven/AssertJAssertionsGeneratorMojo.java | 4 ++-- src/main/java/org/assertj/maven/NoLog.java | 4 ++-- src/main/java/org/assertj/maven/Templates.java | 4 ++-- .../org/assertj/maven/generator/AssertionsGenerator.java | 4 ++-- .../assertj/maven/generator/AssertionsGeneratorReport.java | 4 ++-- .../assertj/maven/AssertJAssertionsGeneratorMojoTest.java | 6 +++--- src/test/java/org/assertj/maven/PackagePrivate.java | 4 ++-- src/test/java/org/assertj/maven/TemplatesTest.java | 4 ++-- src/test/java/org/assertj/maven/test/All.java | 4 ++-- src/test/java/org/assertj/maven/test/Employee.java | 4 ++-- src/test/java/org/assertj/maven/test/MyAssert.java | 4 ++-- src/test/java/org/assertj/maven/test/MyAssertions.java | 4 ++-- src/test/java/org/assertj/maven/test/Player.java | 4 ++-- src/test/java/org/assertj/maven/test/name/Name.java | 4 ++-- src/test/java/org/assertj/maven/test/name/NameService.java | 4 ++-- src/test/java/org/assertj/maven/test2/adress/Address.java | 4 ++-- 17 files changed, 35 insertions(+), 35 deletions(-) diff --git a/pom.xml b/pom.xml index 295c85c..e3f8637 100644 --- a/pom.xml +++ b/pom.xml @@ -7,8 +7,8 @@ org.assertj - assertj-parent-pom - 2.1.6 + assertj-parent + 3.24.2 diff --git a/src/main/java/org/assertj/maven/AssertJAssertionsGeneratorMojo.java b/src/main/java/org/assertj/maven/AssertJAssertionsGeneratorMojo.java index f066861..e54d2dd 100644 --- a/src/main/java/org/assertj/maven/AssertJAssertionsGeneratorMojo.java +++ b/src/main/java/org/assertj/maven/AssertJAssertionsGeneratorMojo.java @@ -1,4 +1,4 @@ -/** +/* * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * @@ -8,7 +8,7 @@ * 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. * - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2023 the original author or authors. */ package org.assertj.maven; diff --git a/src/main/java/org/assertj/maven/NoLog.java b/src/main/java/org/assertj/maven/NoLog.java index 3343cf4..8e62828 100644 --- a/src/main/java/org/assertj/maven/NoLog.java +++ b/src/main/java/org/assertj/maven/NoLog.java @@ -1,4 +1,4 @@ -/** +/* * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * @@ -8,7 +8,7 @@ * 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. * - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2023 the original author or authors. */ package org.assertj.maven; diff --git a/src/main/java/org/assertj/maven/Templates.java b/src/main/java/org/assertj/maven/Templates.java index 35ef42c..b09b59b 100644 --- a/src/main/java/org/assertj/maven/Templates.java +++ b/src/main/java/org/assertj/maven/Templates.java @@ -1,4 +1,4 @@ -/** +/* * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * @@ -8,7 +8,7 @@ * 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. * - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2023 the original author or authors. */ package org.assertj.maven; diff --git a/src/main/java/org/assertj/maven/generator/AssertionsGenerator.java b/src/main/java/org/assertj/maven/generator/AssertionsGenerator.java index a4902de..175df6c 100644 --- a/src/main/java/org/assertj/maven/generator/AssertionsGenerator.java +++ b/src/main/java/org/assertj/maven/generator/AssertionsGenerator.java @@ -1,4 +1,4 @@ -/** +/* * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * @@ -8,7 +8,7 @@ * 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. * - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2023 the original author or authors. */ package org.assertj.maven.generator; diff --git a/src/main/java/org/assertj/maven/generator/AssertionsGeneratorReport.java b/src/main/java/org/assertj/maven/generator/AssertionsGeneratorReport.java index a4ae871..1f1dc53 100644 --- a/src/main/java/org/assertj/maven/generator/AssertionsGeneratorReport.java +++ b/src/main/java/org/assertj/maven/generator/AssertionsGeneratorReport.java @@ -1,4 +1,4 @@ -/** +/* * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * @@ -8,7 +8,7 @@ * 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. * - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2023 the original author or authors. */ package org.assertj.maven.generator; diff --git a/src/test/java/org/assertj/maven/AssertJAssertionsGeneratorMojoTest.java b/src/test/java/org/assertj/maven/AssertJAssertionsGeneratorMojoTest.java index 41a7afc..3104e96 100644 --- a/src/test/java/org/assertj/maven/AssertJAssertionsGeneratorMojoTest.java +++ b/src/test/java/org/assertj/maven/AssertJAssertionsGeneratorMojoTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * @@ -8,7 +8,7 @@ * 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. * - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2023 the original author or authors. */ package org.assertj.maven; @@ -19,7 +19,7 @@ import static org.assertj.core.util.Files.newFile; import static org.assertj.core.util.Lists.newArrayList; import static org.assertj.maven.AssertJAssertionsGeneratorMojo.shouldHaveNonEmptyPackagesOrClasses; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/src/test/java/org/assertj/maven/PackagePrivate.java b/src/test/java/org/assertj/maven/PackagePrivate.java index 93fbeeb..222fc07 100644 --- a/src/test/java/org/assertj/maven/PackagePrivate.java +++ b/src/test/java/org/assertj/maven/PackagePrivate.java @@ -1,4 +1,4 @@ -/** +/* * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * @@ -8,7 +8,7 @@ * 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. * - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2023 the original author or authors. */ package org.assertj.maven; diff --git a/src/test/java/org/assertj/maven/TemplatesTest.java b/src/test/java/org/assertj/maven/TemplatesTest.java index 3f3a209..c18313c 100644 --- a/src/test/java/org/assertj/maven/TemplatesTest.java +++ b/src/test/java/org/assertj/maven/TemplatesTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * @@ -8,7 +8,7 @@ * 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. * - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2023 the original author or authors. */ package org.assertj.maven; diff --git a/src/test/java/org/assertj/maven/test/All.java b/src/test/java/org/assertj/maven/test/All.java index b4866b6..a23fae3 100644 --- a/src/test/java/org/assertj/maven/test/All.java +++ b/src/test/java/org/assertj/maven/test/All.java @@ -1,4 +1,4 @@ -/** +/* * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * @@ -8,7 +8,7 @@ * 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. * - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2023 the original author or authors. */ package org.assertj.maven.test; diff --git a/src/test/java/org/assertj/maven/test/Employee.java b/src/test/java/org/assertj/maven/test/Employee.java index 850b837..f3a160b 100644 --- a/src/test/java/org/assertj/maven/test/Employee.java +++ b/src/test/java/org/assertj/maven/test/Employee.java @@ -1,4 +1,4 @@ -/** +/* * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * @@ -8,7 +8,7 @@ * 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. * - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2023 the original author or authors. */ package org.assertj.maven.test; diff --git a/src/test/java/org/assertj/maven/test/MyAssert.java b/src/test/java/org/assertj/maven/test/MyAssert.java index 58c2957..3080903 100644 --- a/src/test/java/org/assertj/maven/test/MyAssert.java +++ b/src/test/java/org/assertj/maven/test/MyAssert.java @@ -1,4 +1,4 @@ -/** +/* * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * @@ -8,7 +8,7 @@ * 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. * - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2023 the original author or authors. */ package org.assertj.maven.test; diff --git a/src/test/java/org/assertj/maven/test/MyAssertions.java b/src/test/java/org/assertj/maven/test/MyAssertions.java index 0e6e1c0..d1e603a 100644 --- a/src/test/java/org/assertj/maven/test/MyAssertions.java +++ b/src/test/java/org/assertj/maven/test/MyAssertions.java @@ -1,4 +1,4 @@ -/** +/* * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * @@ -8,7 +8,7 @@ * 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. * - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2023 the original author or authors. */ package org.assertj.maven.test; diff --git a/src/test/java/org/assertj/maven/test/Player.java b/src/test/java/org/assertj/maven/test/Player.java index 9cd3d3c..b511eb1 100644 --- a/src/test/java/org/assertj/maven/test/Player.java +++ b/src/test/java/org/assertj/maven/test/Player.java @@ -1,4 +1,4 @@ -/** +/* * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * @@ -8,7 +8,7 @@ * 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. * - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2023 the original author or authors. */ package org.assertj.maven.test; diff --git a/src/test/java/org/assertj/maven/test/name/Name.java b/src/test/java/org/assertj/maven/test/name/Name.java index 9829558..67d47a8 100644 --- a/src/test/java/org/assertj/maven/test/name/Name.java +++ b/src/test/java/org/assertj/maven/test/name/Name.java @@ -1,4 +1,4 @@ -/** +/* * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * @@ -8,7 +8,7 @@ * 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. * - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2023 the original author or authors. */ package org.assertj.maven.test.name; diff --git a/src/test/java/org/assertj/maven/test/name/NameService.java b/src/test/java/org/assertj/maven/test/name/NameService.java index 5854f60..99969fe 100644 --- a/src/test/java/org/assertj/maven/test/name/NameService.java +++ b/src/test/java/org/assertj/maven/test/name/NameService.java @@ -1,4 +1,4 @@ -/** +/* * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * @@ -8,7 +8,7 @@ * 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. * - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2023 the original author or authors. */ package org.assertj.maven.test.name; diff --git a/src/test/java/org/assertj/maven/test2/adress/Address.java b/src/test/java/org/assertj/maven/test2/adress/Address.java index 017bd99..c983456 100644 --- a/src/test/java/org/assertj/maven/test2/adress/Address.java +++ b/src/test/java/org/assertj/maven/test2/adress/Address.java @@ -1,4 +1,4 @@ -/** +/* * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * @@ -8,7 +8,7 @@ * 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. * - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2023 the original author or authors. */ package org.assertj.maven.test2.adress; From 22801c0f3e32c4fdae845574c73874b3aadc1032 Mon Sep 17 00:00:00 2001 From: Markus Heberling Date: Mon, 7 Aug 2023 11:46:03 +0200 Subject: [PATCH 3/6] Exclude generated Mojo from code coverage --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index e3f8637..8c70df6 100644 --- a/pom.xml +++ b/pom.xml @@ -68,6 +68,7 @@ org/assertj/maven/HelpMojo.class org/assertj/maven/NoLog.class + org/assertj/assertj_assertions_generator_maven_plugin/HelpMojo.class From 6e5ec4c793f3766dfd9d926aaa1f67f697506aab Mon Sep 17 00:00:00 2001 From: Markus Heberling Date: Mon, 7 Aug 2023 12:30:54 +0200 Subject: [PATCH 4/6] Update assertj-core to 3.24.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8c70df6..9a96c60 100644 --- a/pom.xml +++ b/pom.xml @@ -124,7 +124,7 @@ org.assertj assertj-core - [2.0.0, 2.99.0] + 3.24.2 commons-collections From dc72f4da8770ce9a5fe8a68de873c6ce43143bca Mon Sep 17 00:00:00 2001 From: Markus Heberling Date: Mon, 7 Aug 2023 12:31:09 +0200 Subject: [PATCH 5/6] update assertj-assertions-generator to 2.2.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a96c60..1edc203 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ org.assertj assertj-assertions-generator - 2.2.0 + 2.2.1 org.assertj From b62aee6f9c956fd2be6ea262915eae5e89db90cf Mon Sep 17 00:00:00 2001 From: Markus Heberling Date: Mon, 7 Aug 2023 13:02:45 +0200 Subject: [PATCH 6/6] Support jitpack builds - build with java 11 on jitpack - set groupId - set version --- jitpack.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 jitpack.yml diff --git a/jitpack.yml b/jitpack.yml new file mode 100644 index 0000000..2b0376c --- /dev/null +++ b/jitpack.yml @@ -0,0 +1,8 @@ +jdk: + - openjdk11 + +before_install: + # Fix the group id + - find . -name "pom.xml" | xargs sed -i "s/<\/parent>/<\/parent>${GROUP}<\/groupId>/g" + # Fix the version + - mvn versions:set -DnewVersion=${VERSION}