Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ jdk:
before_script:
- me.j360.disboot.websocket.echo "MAVEN_OPTS='-Xmx1024m -XX:MaxPermSize=256m'" > ~/.mavenrc
after_success:
- mvn clean cobertura:cobertura
- mvn -T 1C clean cobertura:cobertura
- bash <(curl -s https://codecov.io/bash)
install: travis_wait 30 mvn install
install: travis_wait 30 mvn -T 1C install
2 changes: 1 addition & 1 deletion j360-disboot-websocket/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<dependency>
<groupId>com.corundumstudio.socketio</groupId>
<artifactId>netty-socketio</artifactId>
<version>1.7.18-SNAPSHOT</version>
<version>1.7.19</version>
</dependency>
<dependency>
<groupId>io.socket</groupId>
Expand Down
13 changes: 6 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>

<groupId>me.j360.disboot</groupId>
Expand Down Expand Up @@ -50,7 +47,9 @@

<dependencyManagement>
<dependencies>
<!--j360 framework-->

<!--j360 framework-->

<dependency>
<groupId>me.j360.framework</groupId>
<artifactId>j360-core</artifactId>
Expand Down Expand Up @@ -424,7 +423,7 @@
<configuration>
<argLine>-Xdebug -Dspring.config.location=file:../.././yml/application-local.yml,file:../.././yml/application-sharding.yml,classpath:application.yml</argLine>
</configuration>
</plugin>
<configuration><parallel>all</parallel></configuration></plugin>
</plugins>
</pluginManagement>
<plugins>
Expand All @@ -446,4 +445,4 @@
</plugin>
</plugins>
</build>
</project>
</project>