From 9234b50c1deae0954e6310c3309f4ee3ee3f0ffd Mon Sep 17 00:00:00 2001 From: michel-heon Date: Wed, 22 Feb 2023 14:51:47 +0000 Subject: [PATCH 01/20] Adding the variable display --- api/pom.xml | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index a012494474..234a5d9cfc 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-api - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT jar org.vivoweb vitro-project - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT .. @@ -21,6 +21,32 @@ + + org.apache.maven.plugins + maven-antrun-plugin + 1.1 + + + validate + + run + + + + ################################################################### + Displaying value of 'VIVO build' property + ################################################################### + [vitro-version] ${vitro-version} + [vivo-version] ${vivo-version} + [vivo-dir] ${vivo-dir} + [project.version] ${project.version} + ################################################################### + ################################################################### + + + + + org.apache.maven.plugins maven-surefire-plugin @@ -73,7 +99,7 @@ org.vivoweb vitro-dependencies - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT pom From 50d05959eb8993ee4903fd8173539c05a4c4d675 Mon Sep 17 00:00:00 2001 From: michel-heon Date: Wed, 22 Feb 2023 15:09:29 +0000 Subject: [PATCH 02/20] Change project.version to 1.14.1-SNAPSHOT --- dependencies/pom.xml | 4 ++-- home/pom.xml | 4 ++-- installer/home/pom.xml | 4 ++-- installer/pom.xml | 2 +- installer/webapp/pom.xml | 4 ++-- pom.xml | 2 +- webapp/pom.xml | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 6813fec387..4c52e909ee 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-dependencies - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT pom org.vivoweb vitro-project - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT .. diff --git a/home/pom.xml b/home/pom.xml index 94498c38ce..bf49eaab8d 100644 --- a/home/pom.xml +++ b/home/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-home - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT pom org.vivoweb vitro-project - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT .. diff --git a/installer/home/pom.xml b/installer/home/pom.xml index 6f3e82a96a..317ead5082 100644 --- a/installer/home/pom.xml +++ b/installer/home/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-installer-home - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT pom org.vivoweb vitro-installer - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT .. diff --git a/installer/pom.xml b/installer/pom.xml index 159b64fab6..a2a9af6504 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -7,7 +7,7 @@ org.vivoweb vitro-installer - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT pom Vitro Installer diff --git a/installer/webapp/pom.xml b/installer/webapp/pom.xml index 3b6adb57ae..e12a622673 100644 --- a/installer/webapp/pom.xml +++ b/installer/webapp/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-installer-webapp - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT war org.vivoweb vitro-installer - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 88f178f935..53d4d51667 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.vivoweb vitro-project - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT pom Vitro diff --git a/webapp/pom.xml b/webapp/pom.xml index 763355106c..60a065f06d 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-webapp - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT war org.vivoweb vitro-project - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT .. @@ -41,7 +41,7 @@ org.vivoweb vitro-api - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT From 3a434233289e2c3cd7f21eeeaed2928e28ee9ebd Mon Sep 17 00:00:00 2001 From: michel-heon Date: Wed, 22 Feb 2023 16:52:27 +0000 Subject: [PATCH 03/20] Adding an echo mechanism for properties --- api/pom.xml | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 234a5d9cfc..5ab6ccd3a2 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -24,30 +24,34 @@ org.apache.maven.plugins maven-antrun-plugin - 1.1 + 3.1.0 + echo-properties validate run - - ################################################################### - Displaying value of 'VIVO build' property - ################################################################### - [vitro-version] ${vitro-version} - [vivo-version] ${vivo-version} - [vivo-dir] ${vivo-dir} - [project.version] ${project.version} - ################################################################### - ################################################################### - + false + + + + + + + + + + + + + + - - + org.apache.maven.plugins maven-surefire-plugin From 59fa16624fd320c55d8fbf8a54b95ebb71265a3f Mon Sep 17 00:00:00 2001 From: michel-heon Date: Wed, 22 Feb 2023 19:04:14 +0000 Subject: [PATCH 04/20] This code segment is compatible with Java 11 and not compatible with java 8. It will abort the compilation if the Java context is version 8 --- .../compilation/IsNotCompatibleWithJava8.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 api/src/test/java/compilation/IsNotCompatibleWithJava8.java diff --git a/api/src/test/java/compilation/IsNotCompatibleWithJava8.java b/api/src/test/java/compilation/IsNotCompatibleWithJava8.java new file mode 100644 index 0000000000..052939ecec --- /dev/null +++ b/api/src/test/java/compilation/IsNotCompatibleWithJava8.java @@ -0,0 +1,15 @@ +package compilation; + +import static org.junit.Assert.*; + +import org.junit.Test; + +public class IsNotCompatibleWithJava8 { + + @Test + public void test() { + String value = "This code is compiled in Java 11"; + System.out.println(value.isBlank()); + } + +} From def38906666fcfdc4e81ba89718b46710a1143d4 Mon Sep 17 00:00:00 2001 From: michel-heon Date: Wed, 22 Feb 2023 19:04:31 +0000 Subject: [PATCH 05/20] "" --- api/src/test/java/compilation/IsNotCompatibleWithJava8.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/api/src/test/java/compilation/IsNotCompatibleWithJava8.java b/api/src/test/java/compilation/IsNotCompatibleWithJava8.java index 052939ecec..1321c6c275 100644 --- a/api/src/test/java/compilation/IsNotCompatibleWithJava8.java +++ b/api/src/test/java/compilation/IsNotCompatibleWithJava8.java @@ -5,7 +5,9 @@ import org.junit.Test; public class IsNotCompatibleWithJava8 { - +/* + * This code segment is compatible with Java 11 and not compatible with java 8. It will abort the compilation if the Java context is version 8 + */ @Test public void test() { String value = "This code is compiled in Java 11"; From 7896a331abf1e07859ece329eacd3118fc1efe8a Mon Sep 17 00:00:00 2001 From: michel-heon Date: Wed, 22 Feb 2023 19:15:57 +0000 Subject: [PATCH 06/20] Replacing JAVA_RELEASE JAVA_RELEASE by JAVA_RELEASE in top pom file --- api/pom.xml | 1 + installer/pom.xml | 2 -- pom.xml | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 5ab6ccd3a2..7089c24874 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -45,6 +45,7 @@ + diff --git a/installer/pom.xml b/installer/pom.xml index a2a9af6504..340bf6ae53 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -23,8 +23,6 @@ maven-compiler-plugin - 1.8 - 1.8 UTF-8 diff --git a/pom.xml b/pom.xml index 53d4d51667..2861ce7c72 100644 --- a/pom.xml +++ b/pom.xml @@ -61,6 +61,7 @@ false / UTF-8 + 11 @@ -255,8 +256,6 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 UTF-8 -XDcompilePolicy=simple From 9fc52e784641c965cfe906c33968f3776fc0d1e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20H=C3=A9on?= <71774817+michel-heon@users.noreply.github.com> Date: Sat, 25 Feb 2023 05:46:25 -0500 Subject: [PATCH 07/20] Update pom.xml return to 1.13.1 --- api/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 7089c24874..b39a9070d3 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -13,7 +13,7 @@ org.vivoweb vitro-project - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT .. @@ -104,7 +104,7 @@ org.vivoweb vitro-dependencies - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT pom From 1c7dde207bed071582fa15c996ae4fb3e002fe75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20H=C3=A9on?= <71774817+michel-heon@users.noreply.github.com> Date: Sat, 25 Feb 2023 05:47:14 -0500 Subject: [PATCH 08/20] Update pom.xml Return to 1.13.1 --- dependencies/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 4c52e909ee..6813fec387 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-dependencies - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT pom org.vivoweb vitro-project - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT .. From 8ebc5311e9ebabb62e3f17d2d1585be0076bda83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20H=C3=A9on?= <71774817+michel-heon@users.noreply.github.com> Date: Sat, 25 Feb 2023 05:47:55 -0500 Subject: [PATCH 09/20] Update pom.xml Return to 1.13.1 --- installer/home/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/installer/home/pom.xml b/installer/home/pom.xml index 317ead5082..6f3e82a96a 100644 --- a/installer/home/pom.xml +++ b/installer/home/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-installer-home - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT pom org.vivoweb vitro-installer - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT .. From 85d558e615c96a3e849cc82b3a7d4d3b77d151fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20H=C3=A9on?= <71774817+michel-heon@users.noreply.github.com> Date: Sat, 25 Feb 2023 05:48:53 -0500 Subject: [PATCH 10/20] Update pom.xml Return 1.13.1 --- installer/webapp/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/installer/webapp/pom.xml b/installer/webapp/pom.xml index e12a622673..5f612ee409 100644 --- a/installer/webapp/pom.xml +++ b/installer/webapp/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-installer-webapp - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT war org.vivoweb vitro-installer - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT .. @@ -91,7 +91,7 @@ unpack - +Return ${project.groupId} ${project.artifactId} From 46a514972776bb224fd6bbb7bf1ce597b5d336a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20H=C3=A9on?= <71774817+michel-heon@users.noreply.github.com> Date: Sat, 25 Feb 2023 05:50:10 -0500 Subject: [PATCH 11/20] Update pom.xml Return 1.13.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2861ce7c72..524a3d80cf 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.vivoweb vitro-project - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT pom Vitro From ef11d691a6d53580b05fdb55dec79abcab67fa5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20H=C3=A9on?= <71774817+michel-heon@users.noreply.github.com> Date: Sat, 25 Feb 2023 05:51:14 -0500 Subject: [PATCH 12/20] Update pom.xml Return 1.13.1 --- webapp/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webapp/pom.xml b/webapp/pom.xml index 60a065f06d..763355106c 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-webapp - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT war org.vivoweb vitro-project - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT .. @@ -41,7 +41,7 @@ org.vivoweb vitro-api - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT From 271978b21e2b2d3efa6f8af2519f68af8b16d449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20H=C3=A9on?= <71774817+michel-heon@users.noreply.github.com> Date: Sat, 25 Feb 2023 05:52:25 -0500 Subject: [PATCH 13/20] Update pom.xml --- installer/webapp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/webapp/pom.xml b/installer/webapp/pom.xml index 5f612ee409..d1fcbb902a 100644 --- a/installer/webapp/pom.xml +++ b/installer/webapp/pom.xml @@ -91,7 +91,7 @@ unpack -Return + ${project.groupId} ${project.artifactId} From 1c2564dcc71a616feae21f1ef347bad847fc6ab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20H=C3=A9on?= <71774817+michel-heon@users.noreply.github.com> Date: Sat, 25 Feb 2023 05:54:17 -0500 Subject: [PATCH 14/20] Update pom.xml --- installer/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/pom.xml b/installer/pom.xml index 340bf6ae53..6feefb2609 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -7,7 +7,7 @@ org.vivoweb vitro-installer - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT pom Vitro Installer From 42f31dda47d5d40f1eea9e07d88dc3ce03f7fbda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20H=C3=A9on?= <71774817+michel-heon@users.noreply.github.com> Date: Sat, 25 Feb 2023 05:55:02 -0500 Subject: [PATCH 15/20] Update pom.xml --- home/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/pom.xml b/home/pom.xml index bf49eaab8d..94498c38ce 100644 --- a/home/pom.xml +++ b/home/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-home - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT pom org.vivoweb vitro-project - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT .. From 27725b089132dacd41d8b2f4d6305c0a6c4bd728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20H=C3=A9on?= <71774817+michel-heon@users.noreply.github.com> Date: Sat, 25 Feb 2023 05:56:16 -0500 Subject: [PATCH 16/20] Update pom.xml --- api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/pom.xml b/api/pom.xml index b39a9070d3..8ae0c95cbb 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -7,7 +7,7 @@ org.vivoweb vitro-api - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT jar From dbd162e49c5e6e2b10bdaf838537f6e9a11aac80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20H=C3=A9on?= <71774817+michel-heon@users.noreply.github.com> Date: Sat, 25 Feb 2023 05:56:53 -0500 Subject: [PATCH 17/20] Update pom.xml --- api/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/pom.xml b/api/pom.xml index 8ae0c95cbb..1cc319ca34 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -52,7 +52,8 @@ - + + org.apache.maven.plugins maven-surefire-plugin From 3d5b754e0ec70e37b286d834b594a26cc5b1457d Mon Sep 17 00:00:00 2001 From: michel-heon Date: Mon, 27 Feb 2023 17:13:59 +0000 Subject: [PATCH 18/20] Updated enforcer-version to (3.2.1) to be compatible with VIVO pom's - fixed message printing bugs on previous version --- installer/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/installer/pom.xml b/installer/pom.xml index 6feefb2609..c1a756d63d 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -74,7 +74,7 @@ maven-enforcer-plugin - 1.4.1 + 3.2.1 org.apache.maven.plugins @@ -246,4 +246,4 @@ - + \ No newline at end of file From 56d2f835d4582396ea5a1672ed114d93cd14c8ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20H=C3=A9on?= <71774817+michel-heon@users.noreply.github.com> Date: Thu, 2 Mar 2023 06:06:53 -0500 Subject: [PATCH 19/20] Update pom.xml --- installer/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/pom.xml b/installer/pom.xml index c1a756d63d..790f71479f 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -246,4 +246,4 @@ - \ No newline at end of file + From c0e5c8d680af9af4c6299cb16ff389ff0f23dfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20H=C3=A9on?= <71774817+michel-heon@users.noreply.github.com> Date: Thu, 2 Mar 2023 06:27:21 -0500 Subject: [PATCH 20/20] Update api/pom.xml No comment Co-authored-by: Dragan Ivanovic --- api/pom.xml | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 1cc319ca34..a012494474 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,38 +21,6 @@ - - org.apache.maven.plugins - maven-antrun-plugin - 3.1.0 - - - echo-properties - validate - - run - - - false - - - - - - - - - - - - - - - - - - - org.apache.maven.plugins maven-surefire-plugin