diff --git a/integration-tests/it-common/src/main/resources/microservice.yaml b/integration-tests/it-common/src/main/resources/microservice.yaml index a48fad25a7b..f7c685502c6 100644 --- a/integration-tests/it-common/src/main/resources/microservice.yaml +++ b/integration-tests/it-common/src/main/resources/microservice.yaml @@ -48,4 +48,20 @@ servicecomb: client: verticle-count: 8 uploads: - directory: target \ No newline at end of file + directory: target + +#########SSL options +ssl.protocols: TLSv1.2 +ssl.authPeer: false +ssl.checkCN.host: false + +#########certificates config +ssl.trustStore: trust.jks +ssl.trustStoreType: JKS +ssl.trustStoreValue: Changeme_123 +ssl.keyStore: server.p12 +ssl.keyStoreType: PKCS12 +ssl.keyStoreValue: Changeme_123 +ssl.crl: revoke.crl +ssl.sslCustomClass: org.apache.servicecomb.it.DemoSSLCustom +ssl.engine: openssl diff --git a/integration-tests/it-producer-deploy-springboot2-servlet/pom.xml b/integration-tests/it-producer-deploy-springboot2-servlet/pom.xml index c96f8630925..192126d775e 100644 --- a/integration-tests/it-producer-deploy-springboot2-servlet/pom.xml +++ b/integration-tests/it-producer-deploy-springboot2-servlet/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb.tests it-producer-deploy-springboot2-servlet Java Chassis::IT::SpringBoot2 Servlet - 1.3.1-SNAPSHOT + 1.3.1 diff --git a/integration-tests/it-producer-deploy-springboot2-standalone/pom.xml b/integration-tests/it-producer-deploy-springboot2-standalone/pom.xml index 46b6a6c590d..06e9dee016f 100644 --- a/integration-tests/it-producer-deploy-springboot2-standalone/pom.xml +++ b/integration-tests/it-producer-deploy-springboot2-standalone/pom.xml @@ -20,7 +20,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 1.3.1-SNAPSHOT + 1.3.1 org.apache.servicecomb.tests it-producer-deploy-springboot2-standalone Java Chassis::IT::SpringBoot2 Standalone diff --git a/integration-tests/it-producer-deploy-springboot2-standalone/src/main/java/org/apache/servicecomb/it/SpringBoot2StandaloneApplication.java b/integration-tests/it-producer-deploy-springboot2-standalone/src/main/java/org/apache/servicecomb/it/SpringBoot2StandaloneApplication.java index 75ce296fd33..7760c685d39 100644 --- a/integration-tests/it-producer-deploy-springboot2-standalone/src/main/java/org/apache/servicecomb/it/SpringBoot2StandaloneApplication.java +++ b/integration-tests/it-producer-deploy-springboot2-standalone/src/main/java/org/apache/servicecomb/it/SpringBoot2StandaloneApplication.java @@ -25,8 +25,12 @@ @EnableServiceComb public class SpringBoot2StandaloneApplication { public static void main(String[] args) { - new CommandReceiver(); + try { + new CommandReceiver(); - SpringApplication.run(SpringBoot2StandaloneApplication.class, args); + SpringApplication.run(SpringBoot2StandaloneApplication.class, args); + } catch (Throwable e) { + e.printStackTrace(); + } } } diff --git a/integration-tests/it-producer/src/main/resources/microservice.yaml b/integration-tests/it-producer/src/main/resources/microservice.yaml index eaec944e57b..bee70b991da 100644 --- a/integration-tests/it-producer/src/main/resources/microservice.yaml +++ b/integration-tests/it-producer/src/main/resources/microservice.yaml @@ -37,3 +37,4 @@ ssl.keyStoreType: PKCS12 ssl.keyStoreValue: Changeme_123 ssl.crl: revoke.crl ssl.sslCustomClass: org.apache.servicecomb.it.DemoSSLCustom +ssl.engine: openssl diff --git a/pom.xml b/pom.xml index 2f5211b4944..dc6cef71b73 100644 --- a/pom.xml +++ b/pom.xml @@ -211,6 +211,8 @@ **/*.md **/*.MD **/target/* + **/*.iml + .github/** **/etc/eclipse-java-google-style.xml **/etc/intellij-java-google-style.xml diff --git a/scripts/build.sh b/scripts/build.sh index 15cb3aa8e7e..98b9b302a10 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -26,7 +26,7 @@ if [ "$1" == "install" ]; then exit 1 fi - mvn clean install -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B -Pdocker -Pdemo-run-release -Pjacoco -Pit -Pcoverage + mvn clean install -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B -Pdocker -Pjacoco -Pit -Pcoverage if [ $? == 0 ]; then echo "${green}Installation Success..${reset}" else