From f17175bf5038c9d3431c5b440a4d96f7993af46f Mon Sep 17 00:00:00 2001 From: Riduidel Date: Fri, 18 Apr 2014 17:26:47 +0200 Subject: [PATCH] Fixes #171 by rewriting the pom organisation. Building wisdom is now a three-step build : 1 - Go into your wisdom/wisdom-framework folder and "mvn install". It will build wisdom framework base pom. This pom is used by both core and components, and define common dependencies, and so on 2 - Go into your wisdom/core folder and "mvn install". it will build wisdom core (and the in-famous maven plugin) 3 - Then go into wisdom/components subfolder and "mvn install". it will build framework, extensions and documentation-base (in this order) How release work ? Well, exactly the same way, excpeted one also need to change reference to wisdom-framework parent pom in core and components poms before trying to release them. Having no experience of such a splitted release with git, I don't know which form the tags/branchs will take .. However, i think it is by far simpler than current build process. in fact, the only thing missing would be a shortcut in root folder allowing one to call all three maven builds. --- core/akka-system/pom.xml | 2 +- core/application-configuration/pom.xml | 2 +- core/content-manager/pom.xml | 2 +- core/crypto/pom.xml | 2 +- core/pom.xml | 58 +++++++++++++++ core/router/pom.xml | 2 +- core/wisdom-api/pom.xml | 2 +- core/wisdom-base-runtime/pom.xml | 2 +- core/wisdom-engine/pom.xml | 2 +- core/wisdom-ipojo-module/pom.xml | 2 +- core/wisdom-maven-plugin/pom.xml | 2 +- core/wisdom-test/pom.xml | 2 +- documentation-base/documentation/pom.xml | 4 +- documentation-base/pom.xml | 48 +++++++++++++ documentation-base/samples/pom.xml | 4 +- extensions/pom.xml | 48 +++++++++++++ .../wisdom-asciidoc-maven-plugin/pom.xml | 4 +- extensions/wisdom-monitor/pom.xml | 4 +- framework/default-error-handler/pom.xml | 4 +- framework/ehcache-cache-service/pom.xml | 4 +- .../hibernate-validation-service/pom.xml | 4 +- framework/i18n-service/pom.xml | 4 +- framework/pom.xml | 54 ++++++++++++++ framework/resource-controller/pom.xml | 4 +- framework/thymeleaf-template-engine/pom.xml | 4 +- framework/wisdom-runtime/pom.xml | 4 +- wisdom-components/pom.xml | 49 +++++++++++++ pom.xml => wisdom-framework/pom.xml | 72 ------------------- 28 files changed, 290 insertions(+), 105 deletions(-) create mode 100644 core/pom.xml create mode 100644 documentation-base/pom.xml create mode 100644 extensions/pom.xml create mode 100644 framework/pom.xml create mode 100644 wisdom-components/pom.xml rename pom.xml => wisdom-framework/pom.xml (86%) diff --git a/core/akka-system/pom.xml b/core/akka-system/pom.xml index 2b9224eed..37a463bbd 100644 --- a/core/akka-system/pom.xml +++ b/core/akka-system/pom.xml @@ -8,7 +8,7 @@ org.wisdom-framework wisdom-framework 0.5-SNAPSHOT - ../../pom.xml + ../pom.xml akka-system diff --git a/core/application-configuration/pom.xml b/core/application-configuration/pom.xml index 9f1ad516b..2c657be3f 100644 --- a/core/application-configuration/pom.xml +++ b/core/application-configuration/pom.xml @@ -8,7 +8,7 @@ org.wisdom-framework wisdom-framework 0.5-SNAPSHOT - ../../pom.xml + ../pom.xml application-configuration diff --git a/core/content-manager/pom.xml b/core/content-manager/pom.xml index 1cf04e5a8..f7db72915 100644 --- a/core/content-manager/pom.xml +++ b/core/content-manager/pom.xml @@ -8,7 +8,7 @@ org.wisdom-framework wisdom-framework 0.5-SNAPSHOT - ../../pom.xml + ../pom.xml diff --git a/core/crypto/pom.xml b/core/crypto/pom.xml index cf62404d2..440b77a2d 100644 --- a/core/crypto/pom.xml +++ b/core/crypto/pom.xml @@ -8,7 +8,7 @@ org.wisdom-framework wisdom-framework 0.5-SNAPSHOT - ../../pom.xml + ../pom.xml crypto diff --git a/core/pom.xml b/core/pom.xml new file mode 100644 index 000000000..e82ff5c18 --- /dev/null +++ b/core/pom.xml @@ -0,0 +1,58 @@ + + + 4.0.0 + + + org.wisdom-framework + wisdom-framework + 0.5-SNAPSHOT + ../pom.xml + + + org.wisdom-framework + core + 0.5-SNAPSHOT + + pom + + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + + https://github.com/wisdom-framework/wisdom/core/ + scm:git:git@github.com:wisdom-framework/wisdom.git + scm:git:git@github.com:wisdom-framework/wisdom.git + + + 2013 + + + github + https://github.com/wisdom-framework/wisdom/issues + + + + Wisdom Framework + http://wisdom-framework.org + + + + wisdom-api + wisdom-maven-plugin + wisdom-test + wisdom-ipojo-module + + wisdom-engine + application-configuration + content-manager + router + crypto + akka-system + wisdom-base-runtime + + diff --git a/core/router/pom.xml b/core/router/pom.xml index b90bfd6e1..84d78fbe0 100644 --- a/core/router/pom.xml +++ b/core/router/pom.xml @@ -8,7 +8,7 @@ org.wisdom-framework wisdom-framework 0.5-SNAPSHOT - ../../pom.xml + ../pom.xml router diff --git a/core/wisdom-api/pom.xml b/core/wisdom-api/pom.xml index 4c8b8f9f3..df0840aae 100644 --- a/core/wisdom-api/pom.xml +++ b/core/wisdom-api/pom.xml @@ -8,7 +8,7 @@ org.wisdom-framework wisdom-framework 0.5-SNAPSHOT - ../../pom.xml + ../pom.xml wisdom-api diff --git a/core/wisdom-base-runtime/pom.xml b/core/wisdom-base-runtime/pom.xml index bae03f421..a5bb61386 100644 --- a/core/wisdom-base-runtime/pom.xml +++ b/core/wisdom-base-runtime/pom.xml @@ -8,7 +8,7 @@ org.wisdom-framework wisdom-framework 0.5-SNAPSHOT - ../../pom.xml + ../pom.xml wisdom-base-runtime diff --git a/core/wisdom-engine/pom.xml b/core/wisdom-engine/pom.xml index 014109aac..0ea4fb4a0 100644 --- a/core/wisdom-engine/pom.xml +++ b/core/wisdom-engine/pom.xml @@ -8,7 +8,7 @@ org.wisdom-framework wisdom-framework 0.5-SNAPSHOT - ../../pom.xml + ../pom.xml wisdom-engine diff --git a/core/wisdom-ipojo-module/pom.xml b/core/wisdom-ipojo-module/pom.xml index acb742411..04a4013ab 100644 --- a/core/wisdom-ipojo-module/pom.xml +++ b/core/wisdom-ipojo-module/pom.xml @@ -8,7 +8,7 @@ org.wisdom-framework wisdom-framework 0.5-SNAPSHOT - ../../pom.xml + ../pom.xml wisdom-ipojo-module diff --git a/core/wisdom-maven-plugin/pom.xml b/core/wisdom-maven-plugin/pom.xml index 28fdd54e4..ab9c5f4c9 100644 --- a/core/wisdom-maven-plugin/pom.xml +++ b/core/wisdom-maven-plugin/pom.xml @@ -8,7 +8,7 @@ org.wisdom-framework wisdom-framework 0.5-SNAPSHOT - ../../pom.xml + ../pom.xml wisdom-maven-plugin diff --git a/core/wisdom-test/pom.xml b/core/wisdom-test/pom.xml index 5445efe65..70de172b4 100644 --- a/core/wisdom-test/pom.xml +++ b/core/wisdom-test/pom.xml @@ -8,7 +8,7 @@ org.wisdom-framework wisdom-framework 0.5-SNAPSHOT - ../../pom.xml + ../pom.xml wisdom-test diff --git a/documentation-base/documentation/pom.xml b/documentation-base/documentation/pom.xml index 2109571d2..ea5d1cb11 100644 --- a/documentation-base/documentation/pom.xml +++ b/documentation-base/documentation/pom.xml @@ -6,9 +6,9 @@ org.wisdom-framework - wisdom-framework + wisdom-components 0.5-SNAPSHOT - ../../pom.xml + ../pom.xml documentation diff --git a/documentation-base/pom.xml b/documentation-base/pom.xml new file mode 100644 index 000000000..e736615e3 --- /dev/null +++ b/documentation-base/pom.xml @@ -0,0 +1,48 @@ + + + 4.0.0 + + + org.wisdom-framework + wisdom-components + 0.5-SNAPSHOT + ../wisdom-components/pom.xml + + + org.wisdom-framework + documentation-base + 0.5-SNAPSHOT + + pom + + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + + https://github.com/wisdom-framework/wisdom/documentation/ + scm:git:git@github.com:wisdom-framework/wisdom.git + scm:git:git@github.com:wisdom-framework/wisdom.git + + + 2013 + + + github + https://github.com/wisdom-framework/wisdom/issues + + + + Wisdom Framework + http://wisdom-framework.org + + + + documentation + samples + + diff --git a/documentation-base/samples/pom.xml b/documentation-base/samples/pom.xml index 97e591215..5757282b7 100644 --- a/documentation-base/samples/pom.xml +++ b/documentation-base/samples/pom.xml @@ -6,9 +6,9 @@ org.wisdom-framework - wisdom-framework + wisdom-components 0.5-SNAPSHOT - ../../pom.xml + ../pom.xml samples diff --git a/extensions/pom.xml b/extensions/pom.xml new file mode 100644 index 000000000..77dfc959f --- /dev/null +++ b/extensions/pom.xml @@ -0,0 +1,48 @@ + + + 4.0.0 + + + org.wisdom-framework + wisdom-components + 0.5-SNAPSHOT + ../wisdom-components/pom.xml + + + org.wisdom-framework + extensions + 0.5-SNAPSHOT + + pom + + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + + https://github.com/wisdom-framework/wisdom/framework/ + scm:git:git@github.com:wisdom-framework/wisdom.git + scm:git:git@github.com:wisdom-framework/wisdom.git + + + 2013 + + + github + https://github.com/wisdom-framework/wisdom/issues + + + + Wisdom Framework + http://wisdom-framework.org + + + + wisdom-asciidoc-maven-plugin + wisdom-monitor + + diff --git a/extensions/wisdom-asciidoc-maven-plugin/pom.xml b/extensions/wisdom-asciidoc-maven-plugin/pom.xml index 4a1a6c8e4..4e12a8838 100644 --- a/extensions/wisdom-asciidoc-maven-plugin/pom.xml +++ b/extensions/wisdom-asciidoc-maven-plugin/pom.xml @@ -4,9 +4,9 @@ org.wisdom-framework - wisdom-framework + wisdom-components 0.5-SNAPSHOT - ../../pom.xml + ../pom.xml wisdom-asciidoc-maven-plugin diff --git a/extensions/wisdom-monitor/pom.xml b/extensions/wisdom-monitor/pom.xml index cd675ffd9..083822c5b 100644 --- a/extensions/wisdom-monitor/pom.xml +++ b/extensions/wisdom-monitor/pom.xml @@ -26,9 +26,9 @@ org.wisdom-framework - wisdom-framework + wisdom-components 0.5-SNAPSHOT - ../../pom.xml + ../pom.xml wisdom-monitor diff --git a/framework/default-error-handler/pom.xml b/framework/default-error-handler/pom.xml index 0291b7fc3..264dc7ec6 100644 --- a/framework/default-error-handler/pom.xml +++ b/framework/default-error-handler/pom.xml @@ -6,9 +6,9 @@ org.wisdom-framework - wisdom-framework + wisdom-components 0.5-SNAPSHOT - ../../pom.xml + ../pom.xml default-error-handler diff --git a/framework/ehcache-cache-service/pom.xml b/framework/ehcache-cache-service/pom.xml index 28f5eb9b0..dcc001e5b 100644 --- a/framework/ehcache-cache-service/pom.xml +++ b/framework/ehcache-cache-service/pom.xml @@ -6,9 +6,9 @@ org.wisdom-framework - wisdom-framework + wisdom-components 0.5-SNAPSHOT - ../../pom.xml + ../pom.xml ehcache-cache-service diff --git a/framework/hibernate-validation-service/pom.xml b/framework/hibernate-validation-service/pom.xml index 9fb72baa5..cc3336e82 100644 --- a/framework/hibernate-validation-service/pom.xml +++ b/framework/hibernate-validation-service/pom.xml @@ -6,9 +6,9 @@ org.wisdom-framework - wisdom-framework + wisdom-components 0.5-SNAPSHOT - ../../pom.xml + ../pom.xml hibernate-validation-service diff --git a/framework/i18n-service/pom.xml b/framework/i18n-service/pom.xml index 146c4bae6..db6614569 100644 --- a/framework/i18n-service/pom.xml +++ b/framework/i18n-service/pom.xml @@ -6,9 +6,9 @@ org.wisdom-framework - wisdom-framework + wisdom-components 0.5-SNAPSHOT - ../../pom.xml + ../pom.xml i18n-service diff --git a/framework/pom.xml b/framework/pom.xml new file mode 100644 index 000000000..f2de8f1a4 --- /dev/null +++ b/framework/pom.xml @@ -0,0 +1,54 @@ + + + 4.0.0 + + + org.wisdom-framework + wisdom-components + 0.5-SNAPSHOT + ../wisdom-components/pom.xml + + + org.wisdom-framework + framework + 0.5-SNAPSHOT + + pom + + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + + https://github.com/wisdom-framework/wisdom/framework/ + scm:git:git@github.com:wisdom-framework/wisdom.git + scm:git:git@github.com:wisdom-framework/wisdom.git + + + 2013 + + + github + https://github.com/wisdom-framework/wisdom/issues + + + + Wisdom Framework + http://wisdom-framework.org + + + + + resource-controller + i18n-service + thymeleaf-template-engine + default-error-handler + ehcache-cache-service + hibernate-validation-service + wisdom-runtime + + diff --git a/framework/resource-controller/pom.xml b/framework/resource-controller/pom.xml index e9e17870f..b6ecddabf 100644 --- a/framework/resource-controller/pom.xml +++ b/framework/resource-controller/pom.xml @@ -6,9 +6,9 @@ org.wisdom-framework - wisdom-framework + wisdom-components 0.5-SNAPSHOT - ../../pom.xml + ../pom.xml diff --git a/framework/thymeleaf-template-engine/pom.xml b/framework/thymeleaf-template-engine/pom.xml index 9e56f998e..a416cc0ce 100644 --- a/framework/thymeleaf-template-engine/pom.xml +++ b/framework/thymeleaf-template-engine/pom.xml @@ -6,9 +6,9 @@ org.wisdom-framework - wisdom-framework + wisdom-components 0.5-SNAPSHOT - ../../pom.xml + ../pom.xml thymeleaf-template-engine diff --git a/framework/wisdom-runtime/pom.xml b/framework/wisdom-runtime/pom.xml index d679935ab..04d4bbe9b 100644 --- a/framework/wisdom-runtime/pom.xml +++ b/framework/wisdom-runtime/pom.xml @@ -6,9 +6,9 @@ org.wisdom-framework - wisdom-framework + wisdom-components 0.5-SNAPSHOT - ../../pom.xml + ../pom.xml wisdom-runtime diff --git a/wisdom-components/pom.xml b/wisdom-components/pom.xml new file mode 100644 index 000000000..0340ba25d --- /dev/null +++ b/wisdom-components/pom.xml @@ -0,0 +1,49 @@ + + + 4.0.0 + + + org.wisdom-framework + wisdom-framework + 0.5-SNAPSHOT + ../pom.xml + + + org.wisdom-framework + wisdom-components + 0.5-SNAPSHOT + + pom + + + + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + + https://github.com/wisdom-framework/wisdom/framework/ + scm:git:git@github.com:wisdom-framework/wisdom.git + scm:git:git@github.com:wisdom-framework/wisdom.git + + + 2013 + + + github + https://github.com/wisdom-framework/wisdom/issues + + + + Wisdom Framework + http://wisdom-framework.org + + + + ../framework + ../extensions + ../documentation-base + + diff --git a/pom.xml b/wisdom-framework/pom.xml similarity index 86% rename from pom.xml rename to wisdom-framework/pom.xml index 01d3a9773..42e671c9c 100644 --- a/pom.xml +++ b/wisdom-framework/pom.xml @@ -53,78 +53,6 @@ - - - core - - true - 1.8 - - - core/wisdom-api - core/wisdom-maven-plugin - core/wisdom-test - core/wisdom-ipojo-module - - core/wisdom-engine - core/application-configuration - core/content-manager - core/router - core/crypto - core/akka-system - core/wisdom-base-runtime - - - - - framework - - true - 1.8 - - - - framework/resource-controller - framework/i18n-service - framework/thymeleaf-template-engine - framework/default-error-handler - framework/ehcache-cache-service - framework/hibernate-validation-service - framework/wisdom-runtime - - - extensions/wisdom-asciidoc-maven-plugin - extensions/wisdom-monitor - - - documentation/documentation - documentation/samples - - - - - extensions - - true - 1.8 - - - extensions/wisdom-asciidoc-maven-plugin - extensions/wisdom-monitor - - - - - documentation - - true - 1.8 - - - documentation/documentation - documentation/samples - - jdk8