Skip to content

release 1.3.1 #2028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liubao68 merged 1 commit into from
Oct 28, 2020
Merged

release 1.3.1 #2028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion integration-tests/it-common/src/main/resources/microservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,20 @@ servicecomb:
client:
verticle-count: 8
uploads:
directory: target
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
2 changes: 1 addition & 1 deletion integration-tests/it-producer-deploy-springboot2-servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>it-producer-deploy-springboot2-servlet</artifactId>
<name>Java Chassis::IT::SpringBoot2 Servlet</name>
<version>1.3.1-SNAPSHOT</version>
<version>1.3.1</version>

<dependencyManagement>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/it-producer-deploy-springboot2-standalone/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<version>1.3.1-SNAPSHOT</version>
<version>1.3.1</version>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>it-producer-deploy-springboot2-standalone</artifactId>
<name>Java Chassis::IT::SpringBoot2 Standalone</name>
Expand Down
8 changes: 6 additions & 2 deletions ...-standalone/src/main/java/org/apache/servicecomb/it/SpringBoot2StandaloneApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
}
1 change: 1 addition & 0 deletions integration-tests/it-producer/src/main/resources/microservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,8 @@
<exclude>**/*.md</exclude>
<excldue>**/*.MD</excldue>
<exclude>**/target/*</exclude>
<excldue>**/*.iml</excldue>
<excldue>.github/**</excldue>
<!-- Skip the code style configuration file -->
<exclude>**/etc/eclipse-java-google-style.xml</exclude>
<exclude>**/etc/intellij-java-google-style.xml</exclude>
Expand Down
2 changes: 1 addition & 1 deletion scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down