Skip to content

Commit

Permalink
1.6.2-SNAPSHOT
Browse files Browse the repository at this point in the history
  • Loading branch information
yangfuhai committed Jul 19, 2018
1 parent fd962fc commit fa39ae2
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
20 changes: 10 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -100,19 +100,19 @@
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-core</artifactId>
<version>2.0.9.Final</version>
<version>2.0.10.Final</version>
</dependency>

<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-servlet</artifactId>
<version>2.0.9.Final</version>
<version>2.0.10.Final</version>
</dependency>

<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-websockets-jsr</artifactId>
<version>2.0.9.Final</version>
<version>2.0.10.Final</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -265,7 +265,7 @@
<dependency>
<groupId>com.aliyun.openservices</groupId>
<artifactId>ons-client</artifactId>
<version>1.7.7.Final</version>
<version>1.7.8.Final</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -430,7 +430,7 @@
<dependency>
<groupId>io.opentracing.brave</groupId>
<artifactId>brave-opentracing</artifactId>
<version>0.31.0</version>
<version>0.31.2</version>
<exclusions>
<exclusion>
<groupId>io.zipkin.brave</groupId>
Expand All @@ -442,27 +442,27 @@
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-sender-urlconnection</artifactId>
<version>2.6.1</version>
<version>2.7.6</version>
</dependency>

<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-toolkit-opentracing</artifactId>
<version>5.0.0-beta</version>
<version>5.0.0-beta2</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>0.9.0</version>
<version>0.9.1</version>
</dependency>


<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
<scope>provided</scope>
</dependency>

Expand All @@ -488,7 +488,7 @@
<dependency>
<groupId>net.oschina.j2cache</groupId>
<artifactId>j2cache-core</artifactId>
<version>2.3.21-release</version>
<version>2.3.22-release</version>
<scope>provided</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/jboot/db/model/JbootModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,8 @@ protected Table _getTable(boolean validateNull) {
if (table == null) {
table = super._getTable();
if (table == null && validateNull) {
throw new JbootException(String.format("class %s can not mapping to database table, maybe cannot connection to database or not use correct datasource, " +
"please check jboot.properties or correct config @Table(datasource=xxx) if you use multi datasource.", _getUsefulClass().getName()));
throw new JbootException(String.format("class %s can not mapping to database table, maybe application cannot connect to database , " +
"please check jboot.properties or config @Table(datasource=xxx) correct if you use multi datasource.", _getUsefulClass().getName()));
}
}
return table;
Expand Down

0 comments on commit fa39ae2

Please sign in to comment.