From e3027841aa1d1129a7ab3a876eef57838ca9e7dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20H=C3=A9on?= <71774817+michel-heon@users.noreply.github.com> Date: Fri, 4 Jun 2021 10:17:17 -0400 Subject: [PATCH] integrate in a single Maven call the compilation and installation of (#242) Integrate in a single Maven call the compilation and installation of VIVO-Languages and Vitro-Languages in VIVO. --- installer/example-settings.xml | 10 ++++++-- pom.xml | 45 ++++++++++++++++++++-------------- 2 files changed, 35 insertions(+), 20 deletions(-) diff --git a/installer/example-settings.xml b/installer/example-settings.xml index 0007c79c..d9b1a27b 100644 --- a/installer/example-settings.xml +++ b/installer/example-settings.xml @@ -1,5 +1,6 @@ - + @@ -17,5 +18,10 @@ defaults + + + diff --git a/pom.xml b/pom.xml index 0665c5f2..75016fc8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,4 @@ - 4.0.0 @@ -43,11 +41,9 @@ - + scm:git:git@github.com:vivo-project/VIVO.git scm:git:git@github.com:vivo-project/VIVO.git @@ -73,6 +69,16 @@ + i18n + + ../Vitro-languages + ../VIVO-languages + api + webapp + home + + + vitro @@ -335,7 +341,8 @@ - + org.apache.maven.plugins maven-checkstyle-plugin @@ -343,7 +350,8 @@ verify-style - + verify check @@ -352,10 +360,10 @@ - duraspace-checkstyle/checkstyle.xml + duraspace-checkstyle/checkstyle.xml - vitro-checkstyle/checkstyle-suppressions.xml + vitro-checkstyle/checkstyle-suppressions.xml UTF-8 true @@ -475,9 +483,11 @@ test-javadoc - + aggregate - false + false aggregate @@ -501,10 +511,9 @@ - + vivo-dependencies