Fix bamboo plan

pom.xml

@@ -45,7 +45,7 @@
         <ant-commons-net.version>1.6.5</ant-commons-net.version>
         <aspectj.version>1.9.9.1</aspectj.version>
         <bdmsl.api.version>4.1.1</bdmsl.api.version>
-        <bouncycastle.version>1.72</bouncycastle.version>
+        <bouncycastle.version>1.70</bouncycastle.version>
         <build.helper.maven.version>1.9.1</build.helper.maven.version>
         <commons-beanutils.version>1.9.4</commons-beanutils.version>
         <commons-collections.version>3.2.2</commons-collections.version>
@@ -354,13 +354,6 @@
                 <groupId>org.springframework.security</groupId>
                 <artifactId>spring-security-cas</artifactId>
                 <version>${spring.security.version}</version>
-                <exclusions>
-                    <!-- current build is optimized for java 1.8: include bouncy castle jdk15to18 -->
-                    <exclusion>
-                        <groupId>org.bouncycastle</groupId>
-                        <artifactId>bcprov-jdk15on</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
@@ -555,16 +548,16 @@
                 <artifactId>spring-modules-jakarta-commons</artifactId>
                 <version>${spring-modules-jakarta-commons.version}</version>
             </dependency>
-            <dependency>
+            <!-- dependency>
                 <groupId>org.bouncycastle</groupId>
-                <artifactId>bcprov-jdk15to18</artifactId>
+                <artifactId>bcprov-jdk15on</artifactId>
                 <version>${bouncycastle.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
-                <artifactId>bcpkix-jdk15to18</artifactId>
+                <artifactId>bcpkix-jdk15on</artifactId>
                 <version>${bouncycastle.version}</version>
-            </dependency>
+            </dependency -->
             <dependency>
                 <groupId>ant</groupId>
                 <artifactId>ant-commons-net</artifactId>

smp-docker/compose/tomcat-mysql-smp-sml/properties/db-scripts/sml-mysql5innodb-data.sql

-insert into bdmsl_configuration(PROPERTY_NAME, PROPERTY_VALUE, description, created_on, last_updated_on) values
+insert into bdmsl_configuration(property, value, description, created_on, last_updated_on) values
 ('useProxy','false','true if a proxy is required to connect to the internet. Possible values: true/false', NOW(), NOW()),
 ('unsecureLoginAllowed','true','true if the use of HTTPS is not required. If the value is set to true, then the user unsecure-http-client is automatically created. Possible values: true/false', NOW(), NOW()),
 ('signResponse','false','true if the responses must be signed. Possible values: true/false', NOW(), NOW()),
@@ -23,7 +23,7 @@ insert into bdmsl_configuration(PROPERTY_NAME, PROPERTY_VALUE, description, crea
 ('configurationDir','/opt/smlconf/','The absolute path to the folder containing all the configuration files (keystore and sig0 key)', NOW(), NOW()),
 ('certificateChangeCronExpression','0 0 2 ? * *','Cron expression for the changeCertificate job. Example: 0 0 2 ? * * (everyday at 2:00 am)', NOW(), NOW()),
 ('authorization.smp.certSubjectRegex','^.*(CN=SMP_|OU=PEPPOL TEST SMP).*$','User with ROOT-CA is granted SMP_ROLE only if its certificates Subject matches configured regexp', NOW(), NOW()),
-('authentication.bluecoat.enabled','true','Enables reverse proxy authentication.', NOW(), NOW()),
+('smp.automation.authentication.external.tls.clientCert.enabled','true','Enables reverse proxy authentication.', NOW(), NOW()),
 ('adminPassword','$2a$10$9RzbkquhBYRkHUoKMTNZhOPJmevTbUKWf549MEiCWUd.1LdblMhBi','BCrypt Hashed password to access admin services', NOW(), NOW()),
 ('mail.smtp.host','smtp.localhost','BCrypt Hashed password to access admin services', NOW(), NOW()),
 ('mail.smtp.port','25','BCrypt Hashed password to access admin services', NOW(), NOW()),

smp-docker/compose/weblogic-oracle/properties/weblogic-init/smp.config.properties

 
-configuration.dir=/data/smp/security
-hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
-datasource.jndi=jdbc/eDeliverySmpDs
-authentication.blueCoat.enabled=true
+smp.security.folder=/data/smp/security
+smp.jdbc.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
+smp.datasource.jndi=jdbc/eDeliverySmpDs
+smp.automation.authentication.external.tls.clientCert.enabled=true
 smp.truststore.password={DEC}{test123}
 smp.keystore.password={DEC}{test123}
-log.folder=./logs/
+smp.log.folder=./logs/

smp-docker/compose/weblogic-oracle14/properties/weblogic-init/smp.config.properties

 
-configuration.dir=/data/smp/security
-hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
-datasource.jndi=jdbc/eDeliverySmpDs
-authentication.blueCoat.enabled=true
+smp.security.folder=/data/smp/security
+smp.jndi.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
+smp.datasource.jndi=jdbc/eDeliverySmpDs
+smp.automation.authentication.external.tls.clientCert.enabled=true
 smp.truststore.password={DEC}{test123}
 smp.keystore.password={DEC}{test123}
-log.folder=./logs/
+smp.log.folder=./logs/

smp-docker/images/oracle/weblogic-14.1.1.0/run/properties/data/config/smp.config.properties

 
-configuration.dir=/data/security
-hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
-datasource.jndi=jdbc/eDeliverySmpDs
-authentication.blueCoat.enabled=true
+smp.security.folder=/data/security
+smp.jdbc.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
+smp.datasource.jndi=jdbc/eDeliverySmpDs
+smp.automation.authentication.external.tls.clientCert.enabled=true
 smp.truststore.password={DEC}{test123}
 smp.keystore.password={DEC}{test123}
-log.folder=./logs/
+smp.log.folder=./logs/

smp-docker/images/tomcat-mysql-smp-sml/Dockerfile

@@ -6,12 +6,12 @@ ARG SMP_LOGICAL_ADDRESS="${SMP_LOGICAL_ADDRESS:-http://localhost:8080/smp/}"
 
 # Set the SMP_VERSION env variable  \
 ENV SMP_HOME=/opt/smp  \
-    MYSQL_DRV_VERSION=5.1.49  \
-    MYSQL_DRV_SHA1=cf76d2e4c9c3782a85c15c87bec5772b34ffd0e5 \
+    MYSQL_DRV_VERSION=8.0.32  \
+    MYSQL_DRV_SHA1=41ec3f8cdaccf6c46a47d7cd628eeb59a926d9d4 \
     TOMCAT_MAJOR=9  \
-    TOMCAT_VERSION=9.0.65 \
-    TOMCAT_NAVITVE_VERSION=1.2.35  \
-    TOMCAT_SHA512=00e1ba9139969e6bf056b7e862a4bfb6a13d62208170d4081e18fa45ffa42f6a1fed6d78931e7f7dd64b7dd746e0cee066592204c277528b7aab5d9f29322bd7 \
+    TOMCAT_VERSION=9.0.73 \
+    TOMCAT_NAVITVE_VERSION=1.2.36  \
+    TOMCAT_SHA512=4deac84d6f8ff147d0060605e85fd2c0bf92b9eb622e426d4acc19d0cd4fc0d46a394e01e5664076a5e4f1c39ae14fc2238ebee53a7779bf086540f6dc4967c8 \
     SMP_DB_SCHEMA=smp  \
     SMP_DB_USER=smp \
     SMP_INIT_PROPERTY_DELIMITER="||"  \
@@ -65,28 +65,32 @@ RUN apt-get update \
 	    libssl-dev \
 	    gcc \
 	    make \
-    && rm -rf /var/lib/apt/lists/*  \
-    && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 \
+    && rm -rf /var/lib/apt/lists/*
+RUN   localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 \
 # set user 
     && addgroup mysql mysql   \
 # download SMP, SMP setup, tomcat mysql driver
     && mkdir -p $SMP_HOME   \
-    && cd $SMP_HOME    \
-    && curl -O  https://repo1.maven.org/maven2/mysql/mysql-connector-java/$MYSQL_DRV_VERSION/mysql-connector-java-$MYSQL_DRV_VERSION.jar    \
-    && sha1sum mysql-connector-java-$MYSQL_DRV_VERSION.jar  | grep $MYSQL_DRV_SHA1    \
-    && curl -o tomcat.zip "https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.zip"    \
+    && cd $SMP_HOME \
+    && curl -o mysql-connector-j.jar https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/$MYSQL_DRV_VERSION/mysql-connector-j-$MYSQL_DRV_VERSION.jar \
+    && sha1sum mysql-connector-j.jar  | grep $MYSQL_DRV_SHA1 \
+    && curl -o tomcat.zip "https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.zip" \
     && sha512sum tomcat.zip | grep $TOMCAT_SHA512    \
-    && unzip tomcat.zip   \
-    && mv mysql-connector-java-$MYSQL_DRV_VERSION.jar $SMP_HOME/apache-tomcat-$TOMCAT_VERSION/lib/    \
+    && unzip tomcat.zip \
+    && mv mysql-connector-j.jar $SMP_HOME/apache-tomcat-$TOMCAT_VERSION/lib/ \
     && rm tomcat.zip   \
     && mkdir -p $SMP_HOME/apache-tomcat-$TOMCAT_VERSION/classes/  \
     && echo "export CLASSPATH=$SMP_HOME/apache-tomcat-$TOMCAT_VERSION/classes" >   $SMP_HOME/apache-tomcat-$TOMCAT_VERSION/bin/setenv.sh  \
 # add sml and smp datasource 
-    && sed -i -e "s/<\/Context>/<Resource name=\"jdbc\/eDeliverySmpDs\" auth=\"Container\" type=\"javax.sql.DataSource\" maxTotal=\"100\" maxIdle=\"30\" maxWaitMillis=\"10000\" username=\"$SMP_DB_USER\" password=\"$SMP_DB_USER_PASSWORD\" driverClassName=\"com.mysql.jdbc.Driver\" url=\"jdbc:mysql:\/\/localhost:3306\/$SMP_DB_SCHEMA?characterEncoding=UTF-8\&amp;useUnicode=true\"\/>\\n<Resource name=\"jdbc\/eDeliverySmlDs\" auth=\"Container\" type=\"javax.sql.DataSource\" maxTotal=\"100\" maxIdle=\"30\" maxWaitMillis=\"10000\" username=\"$SML_DB_USER\" password=\"$SML_DB_USER_PASSWORD\" driverClassName=\"com.mysql.jdbc.Driver\" url=\"jdbc:mysql:\/\/localhost:3306\/$SML_DB_SCHEMA?characterEncoding=UTF-8\&amp;useUnicode=true\"\/><\/Context>/g" "$SMP_HOME/apache-tomcat-$TOMCAT_VERSION/conf/context.xml"  \
-    && sed -i -e "s/<Connector /<Connector URIEncoding=\"UTF-8\" /g" "$SMP_HOME/apache-tomcat-$TOMCAT_VERSION/conf/server.xml"  \
+    && sed -i -e "s/<\/Context>/<Resource name=\"jdbc\/eDeliverySmpDs\" auth=\"Container\" type=\"javax.sql.DataSource\" maxTotal=\"100\" maxIdle=\"30\" maxWaitMillis=\"10000\" username=\"$SMP_DB_USER\" password=\"$SMP_DB_USER_PASSWORD\" driverClassName=\"com.mysql.cj.jdbc.Driver\" url=\"jdbc:mysql:\/\/localhost:3306\/$SMP_DB_SCHEMA?characterEncoding=UTF-8\&amp;useUnicode=true\"\/>\\n<Resource name=\"jdbc\/eDeliverySmlDs\" auth=\"Container\" type=\"javax.sql.DataSource\" maxTotal=\"100\" maxIdle=\"30\" maxWaitMillis=\"10000\" username=\"$SML_DB_USER\" password=\"$SML_DB_USER_PASSWORD\" driverClassName=\"com.mysql.jdbc.Driver\" url=\"jdbc:mysql:\/\/localhost:3306\/$SML_DB_SCHEMA?characterEncoding=UTF-8\&amp;useUnicode=true\"\/><\/Context>/g" "$SMP_HOME/apache-tomcat-$TOMCAT_VERSION/conf/context.xml"  \
+    && sed -i -e "s/<Connector /<Connector URIEncoding=\"UTF-8\" /g" "$SMP_HOME/apache-tomcat-$TOMCAT_VERSION/conf/server.xml"
 # add SMP init configuration
-    && echo "datasource.jndi=java:comp/env/jdbc/eDeliverySmpDs" >  $SMP_HOME/apache-tomcat-$TOMCAT_VERSION/classes/smp.config.properties   \
-    && echo "hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect" >>  $SMP_HOME/apache-tomcat-$TOMCAT_VERSION/classes/smp.config.properties   \
+# echo "smp.datasource.jndi=java:comp/env/jdbc/eDeliverySmpDs" >  $SMP_HOME/apache-tomcat-$TOMCAT_VERSION/classes/smp.config.properties   \
+RUN  echo "smp.jdbc.driver=com.mysql.cj.jdbc.Driver" >  $SMP_HOME/apache-tomcat-$TOMCAT_VERSION/classes/smp.config.properties   \
+  && echo "smp.jdbc.url=jdbc:mysql://localhost:3306/$SMP_DB_SCHEMA?useSSL=false&characterEncoding=UTF-8&useUnicode=true&allowPublicKeyRetrieval=true" >>  $SMP_HOME/apache-tomcat-$TOMCAT_VERSION/classes/smp.config.properties   \
+     && echo "smp.database.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect" >>  $SMP_HOME/apache-tomcat-$TOMCAT_VERSION/classes/smp.config.properties   \
+     && echo "smp.jdbc.user=$SMP_DB_USER" >>  $SMP_HOME/apache-tomcat-$TOMCAT_VERSION/classes/smp.config.properties   \
+     && echo "smp.jdbc.password=$SMP_DB_USER_PASSWORD" >>  $SMP_HOME/apache-tomcat-$TOMCAT_VERSION/classes/smp.config.properties   \
    # add SML init configuration
    && echo "sml.datasource.jndi=java:comp/env/jdbc/eDeliverySmlDs" >  $SMP_HOME/apache-tomcat-$TOMCAT_VERSION/classes/sml.config.properties  \
    && echo "sml.hibernate.dialect=org.hibernate.dialect.MySQLDialect" >>  $SMP_HOME/apache-tomcat-$TOMCAT_VERSION/classes/sml.config.properties  \

smp-docker/images/tomcat-mysql-smp-sml/entrypoint.sh

@@ -90,9 +90,9 @@ init_smp_properties() {
     echo "[INFO] init smp properties:"
 
     { echo "# SMP init parameters"
-      echo "libraries.folder=$SMP_HOME/apache-tomcat-$TOMCAT_VERSION/smp-libs"
+      echo "smp.libraries.folder=$SMP_HOME/apache-tomcat-$TOMCAT_VERSION/smp-libs"
       echo "bdmsl.integration.logical.address=${SMP_LOGICAL_ADDRESS:-http://localhost:8080/smp/}"
-      echo "authentication.blueCoat.enabled=true"
+      echo "smp.automation.authentication.external.tls.clientCert.enabled=true"
       echo "bdmsl.integration.enabled=true"
       echo "bdmsl.integration.physical.address=0.0.0.0"
       echo "bdmsl.participant.multidomain.enabled=false"

smp-docker/images/weblogic-12.2-smp/README.md

@@ -125,9 +125,9 @@ Weblogic database configured based on the file `/u01/init/datasource.properties`
 SMP initial configuration can be provided in file  `/smp.config.properties`
 
     # example of the SMP configuration file (please note the example where SMP uses JNDI datasource!)
-    hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
-    datasource.jndi=jdbc/eDeliverySmpDs
-    configuration.dir=/data/smp/security
-    authentication.blueCoat.enabled=true
-    log.folder=./logs/
+    smp.jdbc.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
+    smp.datasource.jndi=jdbc/eDeliverySmpDs
+    smp.security.folder=/data/smp/security
+    smp.automation.authentication.external.tls.clientCert.enabled=true
+    smp.log.folder=./logs/
     

smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/deploySMPToDomain.sh

@@ -21,11 +21,11 @@ elif [ -f "${INIT_SCRIPTS}/../properties/smp.config.properties" ]; then
   cat "${INIT_SCRIPTS}/../properties/smp.config.properties" > "${SMP_CONFIG_DIR}/config/smp.config.properties"
 else
   cat <<EOT >"${SMP_CONFIG_DIR}/config/smp.config.properties"
-hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
-datasource.jndi=jdbc/eDeliverySmpDs
-authentication.blueCoat.enabled=true
-log.folder=./logs/
-configuration.dir=${SMP_SECURITY_DIR}/
+smp.jdbc.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
+smp.datasource.jndi=jdbc/eDeliverySmpDs
+smp.automation.authentication.external.tls.clientCert.enabled=true
+smp.log.folder=./logs/
+smp.security.folder=${SMP_SECURITY_DIR}/
 EOT
 fi
 

smp-docker/images/weblogic-12.2-smp/properties/init/smp.config.properties

 
-configuration.dir=/data/smp/security
-hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
-datasource.jndi=jdbc/eDeliverySmpDs
-authentication.blueCoat.enabled=true
+smp.security.folder=/data/smp/security
+smp.jdbc.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
+smp.datasource.jndi=jdbc/eDeliverySmpDs
+smp.automation.authentication.external.tls.clientCert.enabled=true
 smp.truststore.password={DEC}{test123}
 smp.keystore.password={DEC}{test123}
-log.folder=./logs/
+smp.log.folder=./logs/

smp-docker/images/weblogic-14.1-smp/README.md

@@ -125,9 +125,9 @@ Weblogic database configured based on the file `/u01/init/datasource.properties`
 SMP initial configuration can be provided in file  `/smp.config.properties`
 
     # example of the SMP configuration file (please note the example where SMP uses JNDI datasource!)
-    hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
-    datasource.jndi=jdbc/eDeliverySmpDs
-    configuration.dir=/data/smp/security
-    authentication.blueCoat.enabled=true
-    log.folder=./logs/
+    smp.jdbc.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
+    smp.datasource.jndi=jdbc/eDeliverySmpDs
+    smp.security.folder=/data/smp/security
+    smp.automation.authentication.external.tls.clientCert.enabled=true
+    smp.log.folder=./logs/
     

smp-docker/images/weblogic-14.1-smp/container-scripts/init-scripts/deploySMPToDomain.sh

@@ -21,11 +21,11 @@ elif [ -f "${INIT_SCRIPTS}/../properties/smp.config.properties" ]; then
   cat "${INIT_SCRIPTS}/../properties/smp.config.properties" > "${SMP_CONFIG_DIR}/config/smp.config.properties"
 else
   cat <<EOT >"${SMP_CONFIG_DIR}/config/smp.config.properties"
-hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
-datasource.jndi=jdbc/eDeliverySmpDs
-authentication.blueCoat.enabled=true
+smp.jdbc.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
+smp.datasource.jndi=jdbc/eDeliverySmpDs
+smp.automation.authentication.external.tls.clientCert.enabled=true
 log.folder=./logs/
-configuration.dir=${SMP_SECURITY_DIR}/
+smp.security.folder=${SMP_SECURITY_DIR}/
 EOT
 fi
 

smp-docker/images/weblogic-14.1-smp/properties/init/smp.config.properties

 
-configuration.dir=/data/smp/security
-hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
-datasource.jndi=jdbc/eDeliverySmpDs
-authentication.blueCoat.enabled=true
+smp.security.folder=/data/smp/security
+smp.jdbc.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
+smp.datasource.jndi=jdbc/eDeliverySmpDs
+smp.automation.authentication.external.tls.clientCert.enabled=true
 smp.truststore.password={DEC}{test123}
 smp.keystore.password={DEC}{test123}
 log.folder=./logs/

smp-examples/smp-spi-example/src/main/resources/logback.xml

@@ -6,12 +6,12 @@
     <property name="consolePattern" value="%d{ISO8601} [%thread] %5p %c{1}:%L - %m%n" scope="global"/>
 
      <appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.folder:-logs}/spi-validation-example-smp.log</file>
+        <file>${smp.log.folder:-logs}/spi-validation-example-smp.log</file>
         <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
         </filter>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!-- rollover daily -->
-            <fileNamePattern>${log.folder:-logs}/spi-validation-example-smp-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>${smp.log.folder:-logs}/spi-validation-example-smp-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
             <!-- each file should be at most 30MB, keep 60 days worth of history, but at most 20GB -->
             <maxFileSize>30MB</maxFileSize>
             <maxHistory>60</maxHistory>
@@ -35,4 +35,4 @@
         <appender-ref ref="file"/>
         <appender-ref ref="stdout"/>
     </root>
-</configuration>
\ No newline at end of file
+</configuration>

smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPServiceGroup10Handler.java

@@ -54,10 +54,7 @@ public class OasisSMPServiceGroup10Handler extends AbstractOasisSMP10Handler {
             LOG.warn("Empty document input stream for service-group [{}]!", identifier);
             return;
         }
-
         ServiceGroup serviceGroup = ServiceGroupConverter.unmarshal(resourceData.getResourceInputStream());
-
-
         // get references
         serviceGroup.setServiceMetadataReferenceCollection(new ServiceMetadataReferenceCollectionType());
         List<ServiceMetadataReferenceType> referenceTypes = buildReferences(identifier);
@@ -65,7 +62,6 @@ public class OasisSMPServiceGroup10Handler extends AbstractOasisSMP10Handler {
 
         try {
             ServiceGroupConverter.marshalToOutputStream(serviceGroup, responseData.getOutputStream());
-            responseData.setContentType("application/xml");
         } catch (JAXBException e) {
             throw new ResourceException(PARSE_ERROR, "Can not marshal extension for service group: [" + identifier + "]. Error: " + ExceptionUtils.getRootCauseMessage(e), e);
 
@@ -114,6 +110,12 @@ public class OasisSMPServiceGroup10Handler extends AbstractOasisSMP10Handler {
         }
         inputStream.mark(Integer.MAX_VALUE - 2);
         ServiceGroup serviceGroup = validateAndParse(resourceData);
+
+        // ServiceMetadataReferenceCollection must be empty because they are automatically generated
+        if (serviceGroup.getServiceMetadataReferenceCollection()!=null
+                && !serviceGroup.getServiceMetadataReferenceCollection().getServiceMetadataReferences().isEmpty() ) {
+            throw new ResourceException(INVALID_PARAMETERS, "ServiceMetadataReferenceCollection must be empty!");
+        }
         // set participant to "lowercase" to match it as is saved in the database
         // this is just for back-compatibility issue!
         serviceGroup.getParticipantIdentifier().setValue(resourceData.getResourceIdentifier().getValue());

smp-server-library/pom.xml

@@ -163,14 +163,14 @@
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-core</artifactId>
         </dependency>
-        <dependency>
+        <!-- dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15to18</artifactId>
+            <artifactId>bcprov-jdk15on</artifactId>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15to18</artifactId>
-        </dependency>
+            <artifactId>bcpkix-jdk15on</artifactId>
+        </dependency -->
 
         <!-- Tests -->
         <dependency>

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/enums/SMPEnvPropertyEnum.java

@@ -16,9 +16,9 @@ public enum SMPEnvPropertyEnum {
 
     DATABASE_JNDI("smp.datasource.jndi",null,"he JNDI name for datasource as example:" +
             "* weblogic datasource JNDI example " +
-            "datasource.jndi=jdbc/eDeliverySmpDs " +
+            "smp.datasource.jndi=jdbc/eDeliverySmpDs " +
             "* tomcat datasource JNDI example" +
-            "datasource.jndi=java:comp/env/jdbc/eDeliverySmpDs"),
+            "smp.datasource.jndi=java:comp/env/jdbc/eDeliverySmpDs"),
     DATABASE_CREATE_DDL("smp.database.create-ddl","false","Auto create/update database objects. The property is effective only when smp.mode.development=true!"),
 
     DATABASE_SHOW_SQL("smp.database.show-sql","false","Print generated sql queries to logs. The property is effective only when smp.mode.development=true!"),

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/enums/SMPPropertyEnum.java

@@ -183,7 +183,7 @@ public enum SMPPropertyEnum {
             OPTIONAL, NOT_ENCRYPTED, NO_RESTART_NEEDED, LIST_STRING
     ),
 
-    EXTERNAL_TLS_AUTHENTICATION_CLIENT_CERT_HEADER_ENABLED("external.tls.clientCert.enabled", "false",
+    EXTERNAL_TLS_AUTHENTICATION_CLIENT_CERT_HEADER_ENABLED("smp.automation.authentication.external.tls.clientCert.enabled", "false",
             "Authentication with external module as: reverse proxy. Authenticated data are send send to application using 'Client-Cert' HTTP header. Do not enable this feature " +
                     "without properly configured reverse-proxy!",
             OPTIONAL, NOT_ENCRYPTED, NO_RESTART_NEEDED, BOOLEAN),

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/SMPKeystoreConfBuilder.java

@@ -113,7 +113,7 @@ public class SMPKeystoreConfBuilder {
                 .folder(outputFolder)
                 .secretToken(trustToken)
                 .subjectChain(subjectChain)
-                .aliasList(subjectChain)
+                .aliasList(aliasList)
                 .testMode(testMode).build();
 
         // store file to database

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/IdentifierService.java

@@ -15,6 +15,7 @@ package eu.europa.ec.edelivery.smp.conversion;
 
 import eu.europa.ec.edelivery.smp.identifiers.Identifier;
 import eu.europa.ec.edelivery.smp.identifiers.IdentifierFormatter;
+import eu.europa.ec.edelivery.smp.identifiers.types.EBCorePartyIdFormatterType;
 import eu.europa.ec.edelivery.smp.identifiers.types.OasisSMPFormatterType;
 import eu.europa.ec.edelivery.smp.logging.SMPLogger;
 import eu.europa.ec.edelivery.smp.logging.SMPLoggerFactory;
@@ -37,7 +38,7 @@ public class IdentifierService {
 
     IdentifierFormatter participantIdentifierFormatter = IdentifierFormatter.Builder
             .create()
-            .addFormatterTypes(new OasisSMPFormatterType())
+            .addFormatterTypes(new EBCorePartyIdFormatterType())
             .build();
     IdentifierFormatter documentIdentifierFormatter = IdentifierFormatter.Builder.create().build();