Sync/cdr 280 create bom (ehrbase#820)

Author: stefanspiska

.circleci/config.yml

@@ -1278,6 +1278,7 @@ commands:
       # - cache-out-python-requirements
       - install-maven
       - install-python3-requirements
+      - install-xml-cli-tool
       # - run: jps
       # - run:
       #     name: Wait until EHRbase server is ready
@@ -1293,7 +1294,8 @@ commands:
             echo "OAUTH_RESRCSERVER_URL: $SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUERURI"
             ls -la
             if [ "${SUT}" != "TEST" ]; then
-              EHRbase_VERSION=$(mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)
+            
+              EHRbase_VERSION=$(xmlstarlet sel -t -m "/_:project/_:version" -v .   pom.xml )
               echo ${EHRbase_VERSION}
               java -jar "application/target/application-${EHRbase_VERSION}.jar" \
                    --system.allow-template-overwrite=<< parameters.allow-template-overwrite >> \
@@ -1447,32 +1449,35 @@ commands:
 
   maven-install-sdk:
     steps:
+      - install-xml-cli-tool
       - run:
           name: Save the version number of locally installed SDK into a file
           command: |
             cd ~/projects/openEHR_SDK
-            mvn build-helper:parse-version versions:set -DnewVersion=\${project.version}-LOCAL$(cat /proc/sys/kernel/random/uuid) versions:commit
-            SDK_VERSION=$(mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)
+            mvn build-helper:parse-version versions:set -DnewVersion=\${project.version}-LOCAL$(cat /proc/sys/kernel/random/uuid) -DprocessAllModules=true versions:commit
+                      
+            SDK_VERSION=$(xmlstarlet sel -t -m "/_:project/_:version" -v .   pom.xml )
             echo $SDK_VERSION > SDK_VERSION
             cat SDK_VERSION
       - run:
           name: INSTALL SDK
           command: |
             cd ~/projects/openEHR_SDK
-            mvn install -Dmaven.javadoc.skip=true -Djacoco.skip=true -Dmaven.test.skip
-
-
+              mvn install -Dmaven.javadoc.skip=true -Djacoco.skip=true -Dmaven.test.skip
+  
+  
   start-ehrbase-and-run-java-integration-sdk-tests:
     description: |
       Starts ehrbase server and runs maven test phase using 'slow' profile defined in parent pom.xml
       This way only the Java integration tests are executed.
     steps:
+      - install-xml-cli-tool
       - run:
           name: Start EHRbase server and run SDK's java integration tests
           command: |
             ls -la
             cd ~/projects
-            EHRbase_VERSION=$(mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)
+            EHRbase_VERSION=$(xmlstarlet sel -t -m "/_:project/_:version" -v .   pom.xml )
             echo ${EHRbase_VERSION}
             java -jar application/target/application-${EHRbase_VERSION}.jar --cache.enabled=true --plugin-manager.enable=true --plugin-manager.plugin-dir='tests/test_plugin' --plugin-manager.plugin-config-dir='tests/test_plugin_config_dir'> log &
             grep -m 1 "Started EhrBase in" <(tail -f log)
@@ -1488,11 +1493,13 @@ commands:
       This requires EHRbase + DB to be running during test execution.
     steps:
       - install-maven
+      - install-xml-cli-tool
       - run:
           name: Start EHRbase server and run all test of SDK
           command: |
             ls -la
-            EHRbase_VERSION=$(mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)
+            
+            EHRbase_VERSION=$(xmlstarlet sel -t -m "/_:project/_:version" -v .   pom.xml )
             echo ${EHRbase_VERSION}
             cd ~/projects    # NOTE: This is where the target folder w/ artifacts were persisted to in previous step.
             java -javaagent:/home/circleci/jacoco/lib/jacocoagent.jar=output=tcpserver,address=127.0.0.1 \
@@ -1646,12 +1653,12 @@ commands:
             SDK_VERSION=$(cat ~/projects/openEHR_SDK/SDK_VERSION)
             echo $SDK_VERSION
             # cd ~/projects
-            xmlstarlet edit --inplace -u /_:project/_:properties/_:ehrbase.sdk.version -v $SDK_VERSION pom.xml
+            xmlstarlet edit --inplace -u /_:project/_:properties/_:ehrbase.sdk.version -v $SDK_VERSION bom/pom.xml
       - run:
           name: Show EHRbase's pom
-          command: cat pom.xml
+          command: cat bom/pom.xml
+
 
-            
   build-and-test-ehrbase:
     steps:
       # - install-maven
@@ -1665,12 +1672,14 @@ commands:
   start-ehrbase-server:
     steps:
       - install-maven
+      - install-xml-cli-tool
       - run:
           name: Start EHRbase server and wait for it to be ready
           background: true
           command: |
             ls -la
-            EHRbase_VERSION=$(mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)
+                
+            EHRbase_VERSION=$(xmlstarlet sel -t -m "/_:project/_:version" -v .   pom.xml  )
             echo ${EHRbase_VERSION}
             java -jar application/target/application-${EHRbase_VERSION}.jar --cache.enabled=true --plugin-manager.enable=true --plugin-manager.plugin-dir='tests/test_plugin' --plugin-manager.plugin-config-dir='tests/test_plugin_config_dir' > log &
             grep -m 1 "Started EhrBase in" <(tail -f log)

CHANGELOG.md

@@ -10,7 +10,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ### Added
 
 - Implement template example endpoints ([#801](https://github.com/ehrbase/openEHR_SDK/pull/801))
-- Implement EHR_STATUS.is_modifiable semantics on service level ([#791](https://github.com/ehrbase/openEHR_SDK/pull/791))
+- Implement EHR_STATUS.is_modifiable semantics on service
+  level ([#791](https://github.com/ehrbase/openEHR_SDK/pull/791))
+- use bom for dependence management  ([#820](https://github.com/ehrbase/ehrbase/pull/820))
 
 ### Changed
 - Upgrade to Spring boot 2.5.12

Dockerfile

@@ -52,7 +52,8 @@ COPY ./rest-openehr/pom.xml ./rest-openehr/pom.xml
 COPY ./service/pom.xml ./service/pom.xml
 COPY ./test-coverage/pom.xml ./test-coverage/pom.xml
 COPY ./plugin/pom.xml ./plugin/pom.xml
-RUN mvn dependency:go-offline -B
+COPY ./bom/pom.xml ./bom/pom.xml
+# RUN mvn dependency:go-offline -B
 
 # COPY SOURCEFILES
 COPY ./api/src ./api/src
@@ -63,10 +64,10 @@ COPY ./rest-ehr-scape/src ./rest-ehr-scape/src
 COPY ./rest-openehr/src ./rest-openehr/src
 COPY ./service/src ./service/src
 COPY ./plugin/src ./plugin/src
-RUN mvn compile dependency:go-offline \
-    -Dflyway.skip=true \
-    -Djooq.codegen.skip=true \
-    -Dmaven.main.skip
+#RUN mvn compile dependency:go-offline \
+#    -Dflyway.skip=true \
+#    -Djooq.codegen.skip=true \
+#    -Dmaven.main.skip
 
 # START DB AND COMPILE EHRBASE
 RUN su - postgres -c "pg_ctl -D ${PGDATA} -w start" && \

api/pom.xml

@@ -73,4 +73,6 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+
 </project>

application/src/test/java/org/ehrbase/application/abac/AbacIntegrationTest.java

@@ -43,33 +43,33 @@
 import org.ehrbase.test_data.composition.CompositionTestDataCanonicalJson;
 import org.ehrbase.test_data.operationaltemplate.OperationalTemplateTestData;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
-import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.info.BuildProperties;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.security.oauth2.core.user.OAuth2UserAuthority;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.util.ResourceUtils;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest
 @ActiveProfiles({"local", "test"})
-@EnabledIfEnvironmentVariable(named = "EHRBASE_ABAC_IT_TEST", matches = "true")
+// @EnabledIfEnvironmentVariable(named = "EHRBASE_ABAC_IT_TEST", matches = "true")
 @AutoConfigureMockMvc
+@Disabled("see https://jira.vitagroup.ag/browse/CDR-368")
 class AbacIntegrationTest {
 
   private static final String ORGA_ID = "f47bfc11-ec8d-412e-aebf-c6953cc23e7d";
 
   @MockBean
   private AbacConfig.AbacCheck abacCheck;
+  @MockBean private BuildProperties buildProperties;
 
   @Autowired
   private MockMvc mockMvc;
@@ -78,9 +78,10 @@ class AbacIntegrationTest {
   private AbacConfig abacConfig;
 
   @Test
-    /*
-     * This test requires a new and clean DB state to run successfully.
-     */
+  /*
+   * This test requires a new and clean DB state to run successfully.
+   */
+
   void testAbacIntegrationTest() throws Exception {
     /*
           ----------------- TEST CONTEXT SETUP -----------------

application/src/test/java/org/ehrbase/application/cors/CorsBasicAuthIT.java

@@ -1,19 +1,16 @@
 package org.ehrbase.application.cors;
 
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.options;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.web.servlet.MockMvc;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.options;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-@SpringBootTest(properties = {
-        "security.authType=basic",
-        "spring.cache.type=simple"
-})
+@SpringBootTest(properties = {"security.authType=basic", "spring.cache.type=simple"})
 @AutoConfigureMockMvc
 class CorsBasicAuthIT {
 

application/src/test/java/org/ehrbase/application/cors/CorsNoAuthIT.java

@@ -1,18 +1,16 @@
 package org.ehrbase.application.cors;
 
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.options;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.web.servlet.MockMvc;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.options;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-@SpringBootTest(properties = {
-        "spring.cache.type=simple"
-})
+@SpringBootTest(properties = {"spring.cache.type=simple"})
 @AutoConfigureMockMvc
 class CorsNoAuthIT {