Skip to content

Commit

Permalink
release: release 1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
slievrly committed Feb 19, 2020
2 parents 5bdbc44 + e81ae8d commit f990a57
Show file tree
Hide file tree
Showing 627 changed files with 11,241 additions and 5,002 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ dependency-reduced-pom.xml
/sessionStore/
/test/sessionStore/
/distribution/sessionStore/
/file_store/

# system ignore
.DS_Store
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ before_script:

script:
- if [ "$TRAVIS_BRANCH" == "develop" ] && [ "$TRAVIS_PULL_REQUEST" == false ]; then
travis_wait 30 ./mvnw clean install -DskipTests=false -P image -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
travis_wait 30 ./mvnw clean install -DskipTests=false -q -P image -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
else
travis_wait 30 ./mvnw clean install -DskipTests=false -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
travis_wait 30 ./mvnw clean install -DskipTests=false -q -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
fi
after_success:
- bash <(curl -s https://codecov.io/bash)
21 changes: 16 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ For more details about principle and design, please go to [Seata wiki page](http

## Maven dependency
```xml
<seata.version>1.0.0</seata.version>
<seata.version>1.1.0</seata.version>

<dependency>
<groupId>io.seata</groupId>
Expand All @@ -96,6 +96,7 @@ For more details about principle and design, please go to [Seata wiki page](http

## Documentation


You can view the full documentation from the wiki: [Seata wiki page](https://github.com/seata/seata/wiki).

## Reporting bugs
Expand All @@ -115,9 +116,7 @@ Contributors are welcomed to join the Seata project. Please check [CONTRIBUTING]
* Mailing list:
* dev-seata@googlegroups.com , for dev/user discussion. [subscribe](mailto:dev-seata+subscribe@googlegroups.com), [unsubscribe](mailto:dev-seata+unsubscribe@googlegroups.com), [archive](https://groups.google.com/forum/#!forum/dev-seata)

**Dingtalk**

<img src="https://upload-images.jianshu.io/upload_images/4420767-4e95b186a1a1bfba.png?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240" height="300" width="300">
<img src="https://img.alicdn.com/tfs/TB1CR2orKT2gK0jSZFvXXXnFXXa-1798-588.jpg" height="200" width="630">


## Seata ecosystem
Expand All @@ -126,7 +125,7 @@ Contributors are welcomed to join the Seata project. Please check [CONTRIBUTING]
* [Seata Samples](https://github.com/seata/seata-samples) - Samples for Seata
* [Seata Docker](https://github.com/seata/seata-docker) - Seata integration with docker
* [Seata K8s](https://github.com/seata/seata-k8s) - Seata integration with k8s
* [Awesome Seata](https://github.com/seata/awesome-seata) - Description of Seata related projects
* [Awesome Seata](https://github.com/seata/awesome-seata) - Seata's slides and videa address in meetup
* [Seata Website](https://github.com/seata/seata.github.io) - Seata official website

## Contributors
Expand Down Expand Up @@ -184,6 +183,18 @@ here](https://github.com/seata/seata/issues/1246) to tell us your scenario to ma
<img alt='乾动新能源' height='40' src='http://www.cangowin.com/images/logo.png' /img>
<img alt='路客精品民宿' height='40' src='https://img.alicdn.com/tfs/TB1CCavoBr0gK0jSZFnXXbRRXXa-240-100.png' /img>
<img alt='深圳好尔美' height='40' src='https://img.alicdn.com/tfs/TB1IIivoxD1gK0jSZFyXXciOVXa-200-130.png' /img>
<img alt='浙大睿医' height='40' src='https://img.alicdn.com/tfs/TB1kQThrFY7gK0jSZKzXXaikpXa-220-110.jpg' /img>
<img alt='居然之家' height='40' src='https://img.alicdn.com/tfs/TB1LK6jrUT1gK0jSZFrXXcNCXXa-180-54.png' /img>
<img alt='臻善科技' height='40' src='http://www.gisquest.com/static/web/img/img-1.png?v=v3' /img>
<img alt='中国支付通' height='40' src='http://www.chinasmartpay.com/img/index_logo.png' /img>
<img alt='众网小贷' height='40' src='http://imassbank.com/images/zw_logo.png' /img>
<img alt='谐云科技' height='40' src='https://img.alicdn.com/tfs/TB1V1YlrRv0gK0jSZKbXXbK2FXa-514-160.png' /img>
<img alt='浙江甄品' height='40' src='https://img.alicdn.com/tfs/TB1oC2prND1gK0jSZFyXXciOVXa-246-124.jpg' /img>
<img alt='深圳海豚网' height='40' src='https://img.alicdn.com/tfs/TB1defkrLb2gK0jSZK9XXaEgFXa-434-146.jpg' /img>
<img alt='汇通天下' height='40' src='https://img.alicdn.com/tfs/TB1uIHmrHr1gK0jSZR0XXbP8XXa-1024-568.png' /img>
<img alt='九机网' height='40' src='https://img.alicdn.com/tfs/TB1ERHlrUY1gK0jSZFMXXaWcVXa-120-60.png' /img>
<img alt='有好东西' height='40' src='https://img.alicdn.com/tfs/TB1LT2lrNn1gK0jSZKPXXXvUXXa-300-300.jpg' /img>
<img alt='南京智慧盾' height='40' src='https://img.alicdn.com/tfs/TB1s2LprUY1gK0jSZFCXXcwqXXa-618-148.jpg' /img>
</div>


45 changes: 35 additions & 10 deletions all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<groupId>io.seata</groupId>
<artifactId>seata-all</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>

<name>Seata All-in-one ${project.version}</name>
<url>http://seata.io</url>
Expand Down Expand Up @@ -182,6 +182,11 @@
<artifactId>seata-dubbo</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-http</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-dubbo-alibaba</artifactId>
Expand All @@ -207,6 +212,16 @@
<artifactId>seata-rm-datasource</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-sqlparser-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-sqlparser-druid</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring</artifactId>
Expand All @@ -224,12 +239,12 @@
</dependency>
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-codec-seata</artifactId>
<artifactId>seata-serializer-seata</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-codec-protobuf</artifactId>
<artifactId>seata-serializer-protobuf</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand All @@ -239,12 +254,12 @@
</dependency>
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-codec-kryo</artifactId>
<artifactId>seata-serializer-kryo</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-codec-hessian</artifactId>
<artifactId>seata-serializer-hessian</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -302,7 +317,10 @@
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
</dependency>
<!-- the 3rd part -->
<dependency>
<groupId>io.netty</groupId>
Expand Down Expand Up @@ -488,6 +506,10 @@
<artifactId>mysql-connector-java</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
Expand Down Expand Up @@ -606,16 +628,19 @@
<include>io.seata:seata-dubbo-alibaba</include>
<include>io.seata:seata-motan</include>
<include>io.seata:seata-grpc</include>
<include>io.seata:seata-http</include>
<include>io.seata:seata-rm</include>
<include>io.seata:seata-rm-datasource</include>
<include>io.seata:seata-sqlparser-core</include>
<include>io.seata:seata-sqlparser-druid</include>
<include>io.seata:seata-sofa-rpc</include>
<include>io.seata:seata-spring</include>
<include>io.seata:seata-tcc</include>
<include>io.seata:seata-tm</include>
<include>io.seata:seata-codec-seata</include>
<include>io.seata:seata-codec-protobuf</include>
<include>io.seata:seata-codec-kryo</include>
<include>io.seata:seata-codec-hessian</include>
<include>io.seata:seata-serializer-seata</include>
<include>io.seata:seata-serializer-protobuf</include>
<include>io.seata:seata-serializer-kryo</include>
<include>io.seata:seata-serializer-hessian</include>
<!-- saga -->
<include>io.seata:seata-saga-processctrl</include>
<include>io.seata:seata-saga-statelang</include>
Expand Down
8 changes: 7 additions & 1 deletion bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<groupId>io.seata</groupId>
<artifactId>seata-bom</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>

<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
Expand Down Expand Up @@ -102,6 +102,7 @@
<caffeine.version>2.7.0</caffeine.version>
<oracle.client.version>10.2.0.3.0</oracle.client.version>
<mysql.client.version>5.1.30</mysql.client.version>
<postgres.client.version>42.1.4</postgres.client.version>
<h2.version>1.4.181</h2.version>
<motan.version>1.0.0</motan.version>
<jackson.version>2.9.9</jackson.version>
Expand Down Expand Up @@ -378,6 +379,11 @@
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.client.version}</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgres.client.version}</version>
</dependency>
<dependency>
<groupId>com.weibo</groupId>
<artifactId>motan-core</artifactId>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ coverage:
precision: 2
range: "50...100"
ignore:
- "codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/generated"
- "codec/seata-serializer-protobuf/src/main/java/io/seata/serializer/protobuf/generated"
- "test/.*"
- ".github/.*"
- ".mvn/.*"
Expand Down
8 changes: 0 additions & 8 deletions common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,9 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
</dependencies>
</project>
8 changes: 8 additions & 0 deletions common/src/main/java/io/seata/common/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,12 @@ public class Constants {
* default charset is utf-8
*/
public static final Charset DEFAULT_CHARSET = Charset.forName(DEFAULT_CHARSET_NAME);
/**
* The constant OBJECT_KEY_SPRING_APPLICATION_CONTEXT
*/
public static final String OBJECT_KEY_SPRING_APPLICATION_CONTEXT = "springApplicationContext";
/**
* The constant BEAN_NAME_SPRING_APPLICATION_CONTEXT_PROVIDER
*/
public static final String BEAN_NAME_SPRING_APPLICATION_CONTEXT_PROVIDER = "springApplicationContextProvider";
}
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,11 @@ public enum FrameworkErrorCode {
*/
StateMachineInstanceNotExists("0420", "State machine instance not exists", "State machine instance not exists"),

/**
* State machine execution timeout
*/
StateMachineExecutionTimeout("0421", "State machine execution timeout", "State machine execution timeout"),

/**
* Undefined error
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ public interface Callback<T> {
* @return the t
* @throws Throwable the throwable
*/
public T execute() throws Throwable;
T execute() throws Throwable;
}

Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ public interface Initialize {
/**
* init method
*/
public void init();
void init();

}
46 changes: 46 additions & 0 deletions common/src/main/java/io/seata/common/holder/ObjectHolder.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/*
* Copyright 1999-2019 Seata.io Group.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.seata.common.holder;

import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

import io.seata.common.exception.ShouldNeverHappenException;

/**
* @author xingfudeshi@gmail.com
* The enum object holder
*/
public enum ObjectHolder {
/**
* singleton instance
*/
INSTANCE;
private static final int MAP_SIZE = 8;
private static final Map<String, Object> OBJECT_MAP = new ConcurrentHashMap<>(MAP_SIZE);

public Object getObject(String objectKey) {
return OBJECT_MAP.get(objectKey);
}

public <T> T getObject(Class<T> clasz) {
return clasz.cast(OBJECT_MAP.values().stream().filter(clasz::isInstance).findAny().orElseThrow(() -> new ShouldNeverHappenException("Can't find any object of class " + clasz.getName())));
}

public Object setObject(String objectKey, Object object) {
return OBJECT_MAP.putIfAbsent(objectKey, object);
}
}
Loading

0 comments on commit f990a57

Please sign in to comment.