From fc0f77ab8ce0591ab2d5a8f9132860133e4c5f1d Mon Sep 17 00:00:00 2001
From: Joze RIHTARSIC <joze.RIHTARSIC@ext.ec.europa.eu>
Date: Tue, 31 May 2022 08:27:06 +0200
Subject: [PATCH] deploy root, api and spi modules to nexus and update
README.md
---
README.md | 40 +++++++++++++-------------------------
pom.xml | 4 +---
smp-angular/pom.xml | 2 ++
smp-docker/pom.xml | 4 ++++
smp-server-library/pom.xml | 5 ++++-
smp-soapui-tests/pom.xml | 4 ++--
smp-webapp/pom.xml | 12 +-----------
7 files changed, 27 insertions(+), 44 deletions(-)
diff --git a/README.md b/README.md
index 7ede578ed..95fd60362 100644
--- a/README.md
+++ b/README.md
@@ -5,41 +5,27 @@
[https://webgate.ec.europa.eu/CITnet/bamboo/browse/EDELIVERY-SMPDEV]
## Building SMP
-SMP requires Maven 3.0 and Java 1.7.
+SMP requires Maven 3.6+ and Java 1.8.
-Integration tests included into build process require access to DB. By default it is a local instance of MySQL with preconfigured schema:
-[https://ec.europa.eu/cefdigital/code/projects/EDELIVERY/repos/smp/browse/smp-server-library/database]
-
-Any remote DB with preconfigured schema might be used as well. Sample build command:
-
- mvn clean install \
- -Djdbc.driver=oracle.jdbc.OracleDriver \
- -Djdbc.url=jdbc:oracle:thin:<HOST_AND_PORT_AND_SERVICENAME> \
- -Djdbc.user=<USERNAME> \
- -Djdbc.password=<PASSWORD> \
- -Dtarget-database=Oracle \
- -Djdbc.read-connections.max=10
## Source code history
This is a continuation of CIPA SMP Joinup repository, which was migrated here to GIT on 07.12.2016:
[https://joinup.ec.europa.eu/svn/cipaedelivery/trunk]
-## To run with SoapUI code coverage (from Bamboo, etc)
+## Build SMP
Step 1:
-mvn clean install -Prun-soapui -Pdeploy-war
- -Djdbc.driver=oracle.jdbc.OracleDriver
- -Djdbc.url=jdbc:oracle:thin:<HOST_AND_PORT_AND_SERVICENAME>
- -Djdbc.user=<USERNAME>
- "-Djdbc.password=<PASSWORD>"
- -Dtarget-database=Oracle
- -DjacocoRemotePort=65000
- -DjacocoRemoteAddress=localhost
- "-Durl=http://localhost:7001/smp"
- -DdeployWarFolder=/home/edelivery/oracle/middleware/domains/bdmsl/autodeploy/
+mvn clean install
-Step 2:
-
-mvn sonar:sonar
+## Execute integartion tests
+By default integrations tests are executes on H2 database.
+Any remote DB with preconfigured schema might be used as well. Sample build command:
+ mvn clean install \
+ -Djdbc.driver=oracle.jdbc.OracleDriver \
+ -Djdbc.url=jdbc:oracle:thin:<HOST_AND_PORT_AND_SERVICENAME> \
+ -Djdbc.user=<USERNAME> \
+ -Djdbc.password=<PASSWORD> \
+ -Dtarget-database=Oracle \
+ -Djdbc.read-connections.max=10
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4837e4c85..66fc31954 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,8 +35,6 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <!-- Only selected modules are deployed -->
- <maven.deploy.skip>true</maven.deploy.skip>
<edelivery.ssl-auth.version>1.10-SNAPSHOT</edelivery.ssl-auth.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -694,7 +692,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>6.5.3</version>
+ <version>7.1.0</version>
<inherited>false</inherited>
<configuration>
<skipProvidedScope>true</skipProvidedScope>
diff --git a/smp-angular/pom.xml b/smp-angular/pom.xml
index db066b9f2..200256348 100644
--- a/smp-angular/pom.xml
+++ b/smp-angular/pom.xml
@@ -15,6 +15,8 @@
<name>SMP Angular UI</name>
<properties>
+ <!-- Only selected modules are deployed -->
+ <maven.deploy.skip>false</maven.deploy.skip>
<frontend-maven-plugin.version>1.9.1</frontend-maven-plugin.version>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<node.version>v14.18.0</node.version>
diff --git a/smp-docker/pom.xml b/smp-docker/pom.xml
index af648f92f..3c4fe5dcf 100644
--- a/smp-docker/pom.xml
+++ b/smp-docker/pom.xml
@@ -11,6 +11,10 @@
<version>4.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
+ <properties>
+ <!-- Only selected modules are deployed -->
+ <maven.deploy.skip>false</maven.deploy.skip>
+ </properties>
<artifactId>smp-docker</artifactId>
<packaging>jar</packaging>
<name>SMP Docker</name>
diff --git a/smp-server-library/pom.xml b/smp-server-library/pom.xml
index 0006fd33f..e81d62cc4 100644
--- a/smp-server-library/pom.xml
+++ b/smp-server-library/pom.xml
@@ -21,7 +21,10 @@
</parent>
<artifactId>smp-server-library</artifactId>
<name>smp-server-library</name>
-
+ <properties>
+ <!-- Only selected modules are deployed -->
+ <maven.deploy.skip>false</maven.deploy.skip>
+ </properties>
<dependencies>
<dependency>
<groupId>eu.europa.ec.edelivery</groupId>
diff --git a/smp-soapui-tests/pom.xml b/smp-soapui-tests/pom.xml
index de2637244..373f871dc 100644
--- a/smp-soapui-tests/pom.xml
+++ b/smp-soapui-tests/pom.xml
@@ -13,12 +13,12 @@
<description>Interation tests suit for SMP</description>
<properties>
- <!-- url>http://localhost:7001/smp</url -->
+ <!-- Only selected modules are deployed -->
+ <maven.deploy.skip>false</maven.deploy.skip>
<url>http://localhost:8080/smp</url>
<SMPAdminUser></SMPAdminUser>
<SMPAdminPassword></SMPAdminPassword>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
</properties>
<profiles>
diff --git a/smp-webapp/pom.xml b/smp-webapp/pom.xml
index 50879cc6a..d5a6203b0 100644
--- a/smp-webapp/pom.xml
+++ b/smp-webapp/pom.xml
@@ -16,17 +16,7 @@
<maven.deploy.skip>false</maven.deploy.skip>
<buildtimestamp>${maven.build.timestamp}</buildtimestamp>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss'Z'</maven.build.timestamp.format>
-
-
-
- <!-- database - - >
- <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
- <jdbc.url>jdbc:mysql://localhost/smpdbdev</jdbc.url>
- <jdbc.user>smpdev</jdbc.user>
- <jdbc.password>****</jdbc.password>
- <target-database>MySQL</target-database>
- <jdbc.read-connections.max>10</jdbc.read-connections.max>
- -->
+ <!-- integration tests execution-->
<jdbc.driver>org.h2.Driver</jdbc.driver>
<jdbc.url>jdbc:h2:file:./target/myDb;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=TRUE;AUTO_SERVER=TRUE</jdbc.url>
<jdbc.user>smp</jdbc.user>
--
GitLab