From c282db0951cec3ccdbf65e8307dcffb2af8e6a93 Mon Sep 17 00:00:00 2001 From: Osmund <21172332+osmundf@users.noreply.github.com> Date: Fri, 27 Sep 2019 20:52:27 +0200 Subject: [PATCH 01/10] Preparation for release v1.2.1. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ea37471..a70a3f8 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ app.zoftwhere.mutable mutable-library - 1.2.0 + 1.2.1-SNAPSHOT From 759b4534429f33d1316e816aa2c17cd9a4d4e08b Mon Sep 17 00:00:00 2001 From: Osmund <21172332+osmundf@users.noreply.github.com> Date: Fri, 27 Sep 2019 20:58:28 +0200 Subject: [PATCH 02/10] Include module-info.java in source artifact. --- pom.xml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/pom.xml b/pom.xml index a70a3f8..3b9f829 100644 --- a/pom.xml +++ b/pom.xml @@ -228,6 +228,35 @@ org.apache.maven.plugins maven-javadoc-plugin ${maven-javadoc-plugin.version} + + + main-javadoc + package + + jar + + + true + + module-info.java + + + + + test-javadoc + none + + test-jar + + + false + + + + + true + true + @@ -280,6 +309,26 @@ ${maven-deploy-plugin.version} + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + + + main-jpms + prepare-package + + add-source + + + + ${project.basedir}/main-jpms + + + + + + org.moditect moditect-maven-plugin From 2bf220bcc41ee08492ffd1dd124e281e0fd7408e Mon Sep 17 00:00:00 2001 From: Osmund <21172332+osmundf@users.noreply.github.com> Date: Fri, 27 Sep 2019 21:00:28 +0200 Subject: [PATCH 03/10] Fixed JavaDoc plugin warning. --- pom.xml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 3b9f829..f1fbbea 100644 --- a/pom.xml +++ b/pom.xml @@ -90,6 +90,9 @@ default-compile none + + ${maven.compiler.test-jdk} + main-compile @@ -97,6 +100,16 @@ compile + + ${maven.compiler.test-jdk} + + + + main-compile-jdk8 + none + + compile + ${maven.compiler.main-jdk} ${maven.compiler.main-jdk} @@ -118,13 +131,11 @@ - ${maven.compiler.test-jdk} - ${maven.compiler.test-jdk} + true + true -Xlint:all,-processing,-cast,-serial,-try - true - true From 448898ba8b5d87ffb8db5c666c8613bf5e258642 Mon Sep 17 00:00:00 2001 From: Osmund <21172332+osmundf@users.noreply.github.com> Date: Fri, 27 Sep 2019 21:00:53 +0200 Subject: [PATCH 04/10] Fixed test-resources phase. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f1fbbea..fce2aad 100644 --- a/pom.xml +++ b/pom.xml @@ -161,7 +161,7 @@ test-resources - process-resources + process-test-resources testResources From cd8beb6249a9304287c109df8b668cb4a69dc4ae Mon Sep 17 00:00:00 2001 From: Osmund <21172332+osmundf@users.noreply.github.com> Date: Fri, 27 Sep 2019 21:01:40 +0200 Subject: [PATCH 05/10] Added Surefire plugin workaround (known issue). --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index fce2aad..f34930b 100644 --- a/pom.xml +++ b/pom.xml @@ -177,6 +177,10 @@ maven-surefire-plugin ${maven-surefire-plugin.version} + + 0 + false + false false From fce0264b70df9719152eadc0d6548635bc2414fb Mon Sep 17 00:00:00 2001 From: Osmund <21172332+osmundf@users.noreply.github.com> Date: Fri, 27 Sep 2019 21:02:17 +0200 Subject: [PATCH 06/10] Updated archived files in production jar artifact. --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index f34930b..1bc572f 100644 --- a/pom.xml +++ b/pom.xml @@ -227,6 +227,7 @@ + false false @@ -234,6 +235,12 @@ + ${project.artifactId} + ${project.groupId} + ${project.version} + ${project.artifactId} + ${project.groupId} + ${project.version} From 82c225b85111a8a6668715d283160a1a6fb69371 Mon Sep 17 00:00:00 2001 From: Osmund <21172332+osmundf@users.noreply.github.com> Date: Fri, 27 Sep 2019 21:03:10 +0200 Subject: [PATCH 07/10] Updated package and install phases. --- pom.xml | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 1bc572f..a4491dc 100644 --- a/pom.xml +++ b/pom.xml @@ -215,7 +215,7 @@ test-jar - package + none test-jar @@ -286,13 +286,6 @@ maven-source-plugin ${maven-source-plugin.version} - - none - - - default-source - none - main-source package @@ -305,7 +298,7 @@ test-source - package + none test-jar @@ -315,7 +308,6 @@ - true @@ -323,6 +315,25 @@ org.apache.maven.plugins maven-install-plugin ${maven-install-plugin.version} + + + main-install + none + + install-file + + + ${project.basedir}/pom.xml + ${project.groupId} + ${project.artifactId} + ${project.version} + ${project.build.directory}/${project.build.finalName}.jar + jar + ${project.build.directory}/${project.build.finalName}-sources.jar + ${project.build.directory}/${project.build.finalName}-javadoc.jar + + + @@ -357,7 +368,7 @@ 1.0.0.Beta2 - add-module-info + main-jpms package add-module-info @@ -373,5 +384,4 @@ - \ No newline at end of file From a0f8a0638f38f72f4e90a8233db8b88a1c6e33d4 Mon Sep 17 00:00:00 2001 From: Osmund <21172332+osmundf@users.noreply.github.com> Date: Fri, 27 Sep 2019 21:03:47 +0200 Subject: [PATCH 08/10] Read me --- readme.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 085d66f..cc6afa9 100644 --- a/readme.md +++ b/readme.md @@ -12,9 +12,15 @@ The ZoftWhere Mutable Library provides mutable classes for scopes where final ar ## Compiling and Installing the Library -The source code can be compiled with Java language version 8. It has been tested with Oracle JDK8, JDK11 and JDK12. +The source code can be compiled with Java language version 8. It has been tested with Oracle JDK8, JDK11 and JDK12. The test sources are compiled against JDK 11. -The project is Maven based, so executing the ```mvn install``` should install the library to the local repository. It has been tested with Apache Maven v3.6.1 +The project is Maven based, so executing the ```mvn install``` should install the library to the local repository (Requires at least JDK11). It has been tested with Apache Maven v3.6.1. + +If the project needs to be installed against JDK8, it can be accomplished by calling the following Maven command: + +``` shell script +mvn clean compiler:compile@main-compile-jdk8 jar:jar@main-jar build-helper:add-source@main-jpms source:jar@main-sources javadoc:jar@main-javadoc moditect:add-module-info@main-jpms install:install-file@main-install +``` ## Examples From 78d84932d277479b84aedf88628bbeb4f3072c60 Mon Sep 17 00:00:00 2001 From: Osmund <21172332+osmundf@users.noreply.github.com> Date: Fri, 27 Sep 2019 21:05:37 +0200 Subject: [PATCH 09/10] Latest release notes --- main-github/latest-release-notes.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 main-github/latest-release-notes.md diff --git a/main-github/latest-release-notes.md b/main-github/latest-release-notes.md new file mode 100644 index 0000000..cb22edd --- /dev/null +++ b/main-github/latest-release-notes.md @@ -0,0 +1,7 @@ +Release Notes v1.2.1 + +- Maven POM updated to module-info.java in source artifact. +- Maven POM updated to fix/remove maven-javadoc-plugin not creating package-list. +- Maven POM updated for known issue with maven-surefire-plugin; exceptions occurring when module-info.java file is in the path and/or reuseForks is false. +- Updated archived artifact entries in production jar file (including fields in manifest file). +- Updated read me with correct Maven execution for creating/installing artifacts to local repository. \ No newline at end of file From 7b5c9adc99a36cd43844eb79b7b9e86771e01489 Mon Sep 17 00:00:00 2001 From: Osmund <21172332+osmundf@users.noreply.github.com> Date: Fri, 27 Sep 2019 21:06:25 +0200 Subject: [PATCH 10/10] Release 1.2.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a4491dc..dd66866 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ app.zoftwhere.mutable mutable-library - 1.2.1-SNAPSHOT + 1.2.1