From 83c31bdc5b52aad53dc4661398e76fab910049f3 Mon Sep 17 00:00:00 2001 From: Joerg Hohwiller Date: Mon, 15 Jan 2018 10:39:28 +0100 Subject: [PATCH 01/17] oasp/oasp4j#551: added new BOM and structure --- {bom => boms/bom}/pom.xml | 136 +++------------------------------ boms/minimal/pom.xml | 157 ++++++++++++++++++++++++++++++++++++++ boms/pom.xml | 20 +++++ pom.xml | 2 +- 4 files changed, 187 insertions(+), 128 deletions(-) rename {bom => boms/bom}/pom.xml (65%) create mode 100644 boms/minimal/pom.xml create mode 100644 boms/pom.xml diff --git a/bom/pom.xml b/boms/bom/pom.xml similarity index 65% rename from bom/pom.xml rename to boms/bom/pom.xml index d8b62dcb9..049d475a6 100644 --- a/bom/pom.xml +++ b/boms/bom/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.oasp.java.dev - oasp4j + oasp4j-boms dev-SNAPSHOT io.oasp.java @@ -26,6 +26,14 @@ + + + io.oasp.java.boms + oasp4j-minimal-bom + ${oasp4j.version} + pom + import + @@ -235,132 +243,6 @@ 1.1.3 - - - io.oasp.java.modules - oasp4j-test - ${project.version} - - - io.oasp.java.modules - oasp4j-logging - ${project.version} - - - io.oasp.java.modules - oasp4j-basic - ${project.version} - - - io.oasp.java.modules - oasp4j-batch - ${project.version} - - - io.oasp.java.modules - oasp4j-beanmapping - ${project.version} - - - io.oasp.java.modules - oasp4j-configuration - ${project.version} - - - io.oasp.java.modules - oasp4j-security - ${project.version} - - - io.oasp.java.modules - oasp4j-service - ${project.version} - - - io.oasp.java.modules - oasp4j-json - ${project.version} - - - io.oasp.java.modules - oasp4j-rest - ${project.version} - - - io.oasp.java.modules - oasp4j-cxf-client - ${project.version} - - - io.oasp.java.modules - oasp4j-cxf-client-rest - ${project.version} - - - io.oasp.java.modules - oasp4j-cxf-client-ws - ${project.version} - - - io.oasp.java.modules - oasp4j-cxf-server - ${project.version} - - - io.oasp.java.modules - oasp4j-cxf-server-rest - ${project.version} - - - io.oasp.java.modules - oasp4j-cxf-server-ws - ${project.version} - - - io.oasp.java.starters - oasp4j-starter-cxf-client - ${project.version} - - - io.oasp.java.starters - oasp4j-starter-cxf-client-rest - ${project.version} - - - io.oasp.java.starters - oasp4j-starter-cxf-client-ws - ${project.version} - - - io.oasp.java.starters - oasp4j-starter-cxf-server - ${project.version} - - - io.oasp.java.starters - oasp4j-starter-cxf-server-rest - ${project.version} - - - io.oasp.java.starters - oasp4j-starter-cxf-server-ws - ${project.version} - - - io.oasp.java.modules - oasp4j-jpa - ${project.version} - - - io.oasp.java.modules - oasp4j-jpa-envers - ${project.version} - - - io.oasp.java.modules - oasp4j-web - ${project.version} - diff --git a/boms/minimal/pom.xml b/boms/minimal/pom.xml new file mode 100644 index 000000000..8771354fa --- /dev/null +++ b/boms/minimal/pom.xml @@ -0,0 +1,157 @@ + + + 4.0.0 + + io.oasp.java.dev + oasp4j + dev-SNAPSHOT + + io.oasp.java.boms + oasp4j-minimal-bom + ${oasp4j.version} + pom + ${project.artifactId} + Dependencies (BOM) of the Open Application Standard Platform for Java (OASP4J) without any thirdparty. + http://oasp.io/oasp4j/ + 2014 + + + UTF-8 + UTF-8 + bom + + + + + + + io.oasp.java.modules + oasp4j-test + ${project.version} + + + io.oasp.java.modules + oasp4j-logging + ${project.version} + + + io.oasp.java.modules + oasp4j-basic + ${project.version} + + + io.oasp.java.modules + oasp4j-batch + ${project.version} + + + io.oasp.java.modules + oasp4j-beanmapping + ${project.version} + + + io.oasp.java.modules + oasp4j-configuration + ${project.version} + + + io.oasp.java.modules + oasp4j-security + ${project.version} + + + io.oasp.java.modules + oasp4j-service + ${project.version} + + + io.oasp.java.modules + oasp4j-json + ${project.version} + + + io.oasp.java.modules + oasp4j-rest + ${project.version} + + + io.oasp.java.modules + oasp4j-cxf-client + ${project.version} + + + io.oasp.java.modules + oasp4j-cxf-client-rest + ${project.version} + + + io.oasp.java.modules + oasp4j-cxf-client-ws + ${project.version} + + + io.oasp.java.modules + oasp4j-cxf-server + ${project.version} + + + io.oasp.java.modules + oasp4j-cxf-server-rest + ${project.version} + + + io.oasp.java.modules + oasp4j-cxf-server-ws + ${project.version} + + + io.oasp.java.modules + oasp4j-jpa + ${project.version} + + + io.oasp.java.modules + oasp4j-jpa-envers + ${project.version} + + + io.oasp.java.modules + oasp4j-web + ${project.version} + + + + io.oasp.java.starters + oasp4j-starter-cxf-client + ${project.version} + + + io.oasp.java.starters + oasp4j-starter-cxf-client-rest + ${project.version} + + + io.oasp.java.starters + oasp4j-starter-cxf-client-ws + ${project.version} + + + io.oasp.java.starters + oasp4j-starter-cxf-server + ${project.version} + + + io.oasp.java.starters + oasp4j-starter-cxf-server-rest + ${project.version} + + + io.oasp.java.starters + oasp4j-starter-cxf-server-ws + ${project.version} + + + + + diff --git a/boms/pom.xml b/boms/pom.xml new file mode 100644 index 000000000..0e731108a --- /dev/null +++ b/boms/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + io.oasp.java.dev + oasp4j + dev-SNAPSHOT + + oasp4j-boms + pom + ${project.artifactId} + Bill of Materials (BOM) for the Open Application Standard Platform for Java (OASP4J). + + + minimal + bom + + + diff --git a/pom.xml b/pom.xml index 4257e3be9..1096154d9 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ 2014 - bom + boms modules starters templates From 42d0978b98d1d1e4986dface89ffa1cc61461f70 Mon Sep 17 00:00:00 2001 From: Joerg Hohwiller Date: Thu, 14 Jun 2018 15:55:08 +0200 Subject: [PATCH 02/17] oasp/oasp4j#551: fixed BOM version interference problem --- boms/bom/pom.xml | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/boms/bom/pom.xml b/boms/bom/pom.xml index 049d475a6..7a93905c8 100644 --- a/boms/bom/pom.xml +++ b/boms/bom/pom.xml @@ -35,14 +35,31 @@ import - net.sf.m-m-m - mmm-util-bom + mmm-util-core + ${mmm.util.version} + + + net.sf.m-m-m + mmm-util-core + ${mmm.util.version} + + + net.sf.m-m-m + mmm-util-validation + ${mmm.util.version} + + + net.sf.m-m-m + mmm-util-search + ${mmm.util.version} + + + net.sf.m-m-m + mmm-util-entity ${mmm.util.version} - pom - import From b5f9707d2ba5023923b0bd2b1ecf370bd2598393 Mon Sep 17 00:00:00 2001 From: Joerg Hohwiller Date: Fri, 15 Jun 2018 13:36:05 +0200 Subject: [PATCH 03/17] oasp/oasp4j#623: workaround for travis bug --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cbbaf9a4b..1868313f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,5 +2,7 @@ language: java dist: precise jdk: - oraclejdk7 -script: mvn install +script: + - mvn install -pl :oasp4j-minimal-bom + - mvn install sudo: false From 61b6f3f6ec7b7890b997b5450b45e15b60e2d86a Mon Sep 17 00:00:00 2001 From: Joerg Hohwiller Date: Fri, 15 Jun 2018 14:19:08 +0200 Subject: [PATCH 04/17] oasp/oasp4j#623: next try to force travis to build the thing --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1868313f2..a285d67bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,8 @@ language: java dist: precise jdk: - oraclejdk7 -script: +before_script: - mvn install -pl :oasp4j-minimal-bom +script: - mvn install sudo: false From fd5be4ed6ba6801c061cd617b28b477307466df4 Mon Sep 17 00:00:00 2001 From: Joerg Hohwiller Date: Fri, 15 Jun 2018 14:32:32 +0200 Subject: [PATCH 05/17] oasp/oasp4j#623: further clueless try to force travis to build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a285d67bd..dd6fe48a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: java -dist: precise +dist: trusty jdk: - oraclejdk7 before_script: From ed78918697594951e54bb86fcac0d49a267d945a Mon Sep 17 00:00:00 2001 From: Joerg Hohwiller Date: Fri, 15 Jun 2018 16:36:00 +0200 Subject: [PATCH 06/17] oasp/oasp4j#623: hopeless try to make travis to build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dd6fe48a5..dea68694c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: java dist: trusty jdk: - - oraclejdk7 + - oraclejdk8 before_script: - mvn install -pl :oasp4j-minimal-bom script: From c29967f197b6d11829d2e3910737b23c25da645c Mon Sep 17 00:00:00 2001 From: Joerg Hohwiller Date: Fri, 15 Jun 2018 16:40:31 +0200 Subject: [PATCH 07/17] oasp/oasp4j#623: travis keeps failing - never give up, never surrender --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dea68694c..2ccf939ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: java dist: trusty jdk: - oraclejdk8 -before_script: +install: - mvn install -pl :oasp4j-minimal-bom script: - mvn install From 43bfb93929e515e381386b551ca16ce12601bb51 Mon Sep 17 00:00:00 2001 From: Joerg Hohwiller Date: Fri, 15 Jun 2018 16:43:46 +0200 Subject: [PATCH 08/17] oasp/oasp4j#623: travis keeps failing - hacking badly --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2ccf939ea..2426f0609 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,10 @@ dist: trusty jdk: - oraclejdk8 install: - - mvn install -pl :oasp4j-minimal-bom + - mvn -N install + - cd boms/minimal + - mvn install + - cd ../.. script: - mvn install sudo: false From 8742ca3ce6500d908bb9490afe1c128f6bac7bed Mon Sep 17 00:00:00 2001 From: Joerg Hohwiller Date: Tue, 19 Jun 2018 10:30:07 +0200 Subject: [PATCH 09/17] oasp/oasp4j#623: back to jdk7 and precise to see if that still works (so we can wait for that upgrade till 3.0.0 is open) --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2426f0609..c373e4c10 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,9 @@ language: java -dist: trusty +dist: precise +#dist: trusty jdk: - - oraclejdk8 + - oraclejdk7 +# - oraclejdk8 install: - mvn -N install - cd boms/minimal From af8c0a1133bf5239bb32a1dc73b9f430f2651628 Mon Sep 17 00:00:00 2001 From: Joerg Hohwiller Date: Tue, 19 Jun 2018 10:36:10 +0200 Subject: [PATCH 10/17] oasp/oasp4j#623: reverting backport to jdk7 as travis insists on raising strange errors. Giving up. --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c373e4c10..2426f0609 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,7 @@ language: java -dist: precise -#dist: trusty +dist: trusty jdk: - - oraclejdk7 -# - oraclejdk8 + - oraclejdk8 install: - mvn -N install - cd boms/minimal From 3ae110fecb152caff8d4184a3bba6393f7696f76 Mon Sep 17 00:00:00 2001 From: Joerg Hohwiller Date: Tue, 19 Jun 2018 16:03:48 +0200 Subject: [PATCH 11/17] oasp/oasp4j#551: improved PR #623 by removing duplicated dependency (copy&paste bug) --- boms/bom/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/boms/bom/pom.xml b/boms/bom/pom.xml index edaccad27..bf223fb2e 100644 --- a/boms/bom/pom.xml +++ b/boms/bom/pom.xml @@ -41,11 +41,6 @@ mmm-util-core ${mmm.util.version} - - net.sf.m-m-m - mmm-util-core - ${mmm.util.version} - net.sf.m-m-m mmm-util-validation From a0dcccaaddcfc3f50cdf64bc948fcf54a5933f07 Mon Sep 17 00:00:00 2001 From: "CORP\\abchande" Date: Thu, 21 Jun 2018 17:03:40 +0530 Subject: [PATCH 12/17] Fixed Fylway 4.2.0 upgrade for restaurant bootified war --- pom.xml | 2 +- samples/core/pom.xml | 1 - samples/pom.xml | 6 ++++++ samples/server/pom.xml | 4 ++++ .../server/src/main/resources/archetype-resources/pom.xml | 2 +- 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 393a627a8..1255d1a89 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 1.7 UTF-8 UTF-8 - 2.6.0-SNAPSHOT + 2.6.1-SNAPSHOT 81 oss 1.5.3.RELEASE diff --git a/samples/core/pom.xml b/samples/core/pom.xml index 3b02e9812..ea906b940 100644 --- a/samples/core/pom.xml +++ b/samples/core/pom.xml @@ -116,7 +116,6 @@ org.flywaydb flyway-core - 4.2.0 diff --git a/samples/pom.xml b/samples/pom.xml index da1ed4cce..1807897c2 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -16,6 +16,7 @@ 81 ${oasp.port.range}81 ${oasp.port.range}43 + 4.2.0 io.oasp.module.test.common.api.category.CategorySystemTest @@ -27,6 +28,11 @@ + + org.flywaydb + flyway-core + ${flyway.version} + org.springframework.boot diff --git a/samples/server/pom.xml b/samples/server/pom.xml index 74bb3b3ac..0b8109225 100644 --- a/samples/server/pom.xml +++ b/samples/server/pom.xml @@ -23,6 +23,10 @@ oasp4j-sample-core ${project.version} + + org.flywaydb + flyway-core + diff --git a/templates/server/src/main/resources/archetype-resources/pom.xml b/templates/server/src/main/resources/archetype-resources/pom.xml index 893092c6e..5a85697b3 100644 --- a/templates/server/src/main/resources/archetype-resources/pom.xml +++ b/templates/server/src/main/resources/archetype-resources/pom.xml @@ -11,7 +11,7 @@ 1.5.3.RELEASE - 2.6.0-SNAPSHOT + 2.6.1-SNAPSHOT 4.2.0 1.7 UTF-8 From 1c0907e35eaba1f7f7e20b2629e8e9083598b6a3 Mon Sep 17 00:00:00 2001 From: Joerg Hohwiller Date: Fri, 22 Jun 2018 11:07:03 +0200 Subject: [PATCH 13/17] oasp/oasp4j#623: fixed parent (and tying to get rid of travis hack) according to review feedback --- .travis.yml | 5 ----- boms/minimal/pom.xml | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2426f0609..006d153fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,11 +2,6 @@ language: java dist: trusty jdk: - oraclejdk8 -install: - - mvn -N install - - cd boms/minimal - - mvn install - - cd ../.. script: - mvn install sudo: false diff --git a/boms/minimal/pom.xml b/boms/minimal/pom.xml index 8771354fa..b8fcd4ae8 100644 --- a/boms/minimal/pom.xml +++ b/boms/minimal/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.oasp.java.dev - oasp4j + oasp4j-boms dev-SNAPSHOT io.oasp.java.boms From 9860cbc9add2bc22b1e6d2dc168ab5c960367503 Mon Sep 17 00:00:00 2001 From: Joerg Hohwiller Date: Wed, 4 Jul 2018 14:30:13 +0200 Subject: [PATCH 14/17] oasp4j/issues#654: properly fix oasp4.version for archetype --- templates/server/pom.xml | 2 +- templates/server/src/main/resources/archetype-resources/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/server/pom.xml b/templates/server/pom.xml index c02c97a83..215e88173 100644 --- a/templates/server/pom.xml +++ b/templates/server/pom.xml @@ -36,7 +36,7 @@ maven-resources-plugin - ^*^ + $[*] false diff --git a/templates/server/src/main/resources/archetype-resources/pom.xml b/templates/server/src/main/resources/archetype-resources/pom.xml index 5a85697b3..e1ccda613 100644 --- a/templates/server/src/main/resources/archetype-resources/pom.xml +++ b/templates/server/src/main/resources/archetype-resources/pom.xml @@ -11,7 +11,7 @@ 1.5.3.RELEASE - 2.6.1-SNAPSHOT + $[oasp4j.version] 4.2.0 1.7 UTF-8 From 0acd779dc2551301a4231a81ee5925b8d0c6a9c1 Mon Sep 17 00:00:00 2001 From: Jorge Dacal Cantos <32701664+Jorge-Dacal@users.noreply.github.com> Date: Tue, 10 Jul 2018 10:23:51 +0200 Subject: [PATCH 15/17] Update LICENSE.txt For more information contact with Devonfw-Core-Team. --- LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.txt b/LICENSE.txt index d64569567..fce5e4c57 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + Copyright 2015-2018 Capgemini SE. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From cdfb39660d894a7ea5ad4892bfeb0e4b0d996f93 Mon Sep 17 00:00:00 2001 From: Jorge Dacal Cantos <32701664+Jorge-Dacal@users.noreply.github.com> Date: Tue, 10 Jul 2018 10:32:01 +0200 Subject: [PATCH 16/17] Update LICENSE.txt For more information contact with Devonfw-Core-Team. --- LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.txt b/LICENSE.txt index d64569567..fce5e4c57 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + Copyright 2015-2018 Capgemini SE. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 9807b3bb4f509e865e3ec5d9f31609b89ec7d144 Mon Sep 17 00:00:00 2001 From: "CORP\\vapadwal" Date: Fri, 13 Jul 2018 17:49:24 +0530 Subject: [PATCH 17/17] Removed Snapshot from version 2.6.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e3d85a318..523c94938 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 1.7 UTF-8 UTF-8 - 2.6.1-SNAPSHOT + 2.6.1 81 oss 1.5.3.RELEASE