Skip to content

Commit

Permalink
Merge pull request #214 from semuxgo/manual-merge
Browse files Browse the repository at this point in the history 
VM, API and P2P updates
  • Loading branch information
@semuxgo
semuxgo authored Jul 7, 2019
2 parents af50945 + 9e86337 commit 5174eb6
Show file tree
Hide file tree
Showing 11 changed files with 663 additions and 382 deletions.
67 changes: 34 additions & 33 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -572,10 +572,20 @@
<dependency>
<groupId>com.github.semuxproject</groupId>
<artifactId>evm</artifactId>
<version>de88e39aa01be079c555f268953725076b151d85</version>
<version>0147112b476106f1c329684a3e6ab6f72f6c5603</version>
</dependency>

<!-- Swagger & JAX-RS API -->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.5.22</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>swagger-ui</artifactId>
<version>3.22.2</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
Expand All @@ -586,22 +596,21 @@
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</version>
</dependency>

<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.5.22</version>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>swagger-ui</artifactId>
<version>3.19.4</version>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
</dependency>
<!-- at least one runtime needs to be provided -->
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
<version>2.28</version>
<version>2.29</version>
<exclusions>
<exclusion>
<groupId>jakarta.ws.rs</groupId>
Expand All @@ -611,48 +620,40 @@
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Java 9 Deprecated Packages Required by JAX-RS -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
</dependency>

<!-- Logging framework -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
<version>1.7.26</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.11.2</version>
<version>2.12.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.11.2</version>
<version>2.12.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.11.2</version>
<version>2.12.0</version>
</dependency>

<!-- Bouncy Castle -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.61</version>
<version>1.62</version>
</dependency>

<!-- LevelDB -->
Expand All @@ -666,7 +667,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.1.36.Final</version>
<version>4.1.37.Final</version>
</dependency>

<!-- Snappy Java -->
Expand All @@ -680,7 +681,7 @@
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
<version>3.13.2</version>
<version>3.13.3</version>
</dependency>

<!-- Apache commons -->
Expand Down Expand Up @@ -745,7 +746,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.9.0</version>
<version>2.9.9</version>
</dependency>

<!-- ED25519 -->
Expand Down Expand Up @@ -859,25 +860,25 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>2.28</version>
<version>2.29</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-proxy-client</artifactId>
<version>2.28</version>
<version>2.29</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>2.28</version>
<version>2.29</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>2.28</version>
<version>2.29</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/semux/api/http/HttpHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ protected void channelRead0(ChannelHandlerContext ctx, FullHttpRequest msg) {
} else if (STATIC_FILE_PATTERN.matcher(path).matches()) {
if (path.startsWith("/swagger-ui/")) {
lastContentFuture = writeStaticFile(ctx,
"/META-INF/resources/webjars/swagger-ui/3.19.4" + path.substring(11));
"/META-INF/resources/webjars/swagger-ui/3.22.2" + path.substring(11));
} else {
lastContentFuture = writeStaticFile(ctx, "/org/semux/api" + path);
}
Expand Down
Loading

0 comments on commit 5174eb6

Please sign in to comment.