Skip to content

Commit a3acb24

Browse files
committed
Merge branch 'release/1.0.0-RC7'
2 parents 0b9ffa5 + 0c849d8 commit a3acb24

File tree

9 files changed

+20
-11
lines changed

9 files changed

+20
-11
lines changed

domino-rest-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>domino-rest</artifactId>
77
<groupId>org.dominokit</groupId>
8-
<version>1.0.0-RC6</version>
8+
<version>1.0.0-RC7</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

domino-rest-client/src/main/java/org/dominokit/rest/DominoRestConfig.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class DominoRestConfig implements RestConfig {
4141
private static String defaultResourceRootPath = "service";
4242
private static String defaultJsonDateFormat = null;
4343

44-
private static final RequestRouter<ServerRequest> serverRouter =
44+
private static RequestRouter<ServerRequest> serverRouter =
4545
new ServerRouter(
4646
new DefaultRequestAsyncSender(new ServerEventFactory(), new RequestSender<>()));
4747
private static List<DynamicServiceRoot> dynamicServiceRoots = new ArrayList<>();
@@ -189,6 +189,15 @@ public DominoRestConfig setDefaultResourceRootPath(String rootPath) {
189189
return this;
190190
}
191191

192+
/**
193+
* Sets the server router
194+
*
195+
* @param serverRouter the new router
196+
*/
197+
public void setServerRouter(RequestRouter<ServerRequest> serverRouter) {
198+
DominoRestConfig.serverRouter = serverRouter;
199+
}
200+
192201
/** {@inheritDoc} */
193202
@Override
194203
public RequestRouter<ServerRequest> getServerRouter() {

domino-rest-jaxrs/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.dominokit</groupId>
77
<artifactId>domino-rest</artifactId>
8-
<version>1.0.0-RC6</version>
8+
<version>1.0.0-RC7</version>
99
</parent>
1010

1111
<artifactId>domino-rest-jaxrs</artifactId>

domino-rest-jvm/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>domino-rest</artifactId>
77
<groupId>org.dominokit</groupId>
8-
<version>1.0.0-RC6</version>
8+
<version>1.0.0-RC7</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

domino-rest-processor/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>domino-rest</artifactId>
66
<groupId>org.dominokit</groupId>
7-
<version>1.0.0-RC6</version>
7+
<version>1.0.0-RC7</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

domino-rest-shared/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>domino-rest</artifactId>
77
<groupId>org.dominokit</groupId>
8-
<version>1.0.0-RC6</version>
8+
<version>1.0.0-RC7</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

domino-rest-shared/src/main/java/org/dominokit/rest/shared/request/ServerRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public void startRouting() {
145145
requestContext.getConfig().getServerRouter().routeRequest(this);
146146
}
147147

148-
void setHttpRequest(RestfulRequest httpRequest) {
148+
public void setHttpRequest(RestfulRequest httpRequest) {
149149
this.httpRequest = httpRequest;
150150
}
151151

domino-rest-test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>domino-rest</artifactId>
77
<groupId>org.dominokit</groupId>
8-
<version>1.0.0-RC6</version>
8+
<version>1.0.0-RC7</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>org.dominokit</groupId>
77
<artifactId>domino-rest</artifactId>
8-
<version>1.0.0-RC6</version>
8+
<version>1.0.0-RC7</version>
99
<packaging>pom</packaging>
1010

1111
<name>domino-rest</name>
@@ -70,7 +70,7 @@
7070

7171
<properties>
7272
<snapshot.version>HEAD-SNAPSHOT</snapshot.version>
73-
<next.release.version>1.0.0-RC6</next.release.version>
73+
<next.release.version>1.0.0-RC7</next.release.version>
7474
<maven.compiler.source>1.8</maven.compiler.source>
7575
<maven.compiler.target>1.8</maven.compiler.target>
7676
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -89,7 +89,7 @@
8989
<maven.gwt.plugin>1.0.0</maven.gwt.plugin>
9090
<gwt.version>2.9.0</gwt.version>
9191
<domino.logger.version>1.0.2</domino.logger.version>
92-
<domino.jackson.version>1.0.0-RC3</domino.jackson.version>
92+
<domino.jackson.version>1.0.0-RC4</domino.jackson.version>
9393
<domino.history.version>1.0.0-RC3</domino.history.version>
9494
<domino.aggregator.version>1.0.2</domino.aggregator.version>
9595
</properties>

0 commit comments

Comments
 (0)