Merge branch 'release/1.0.0-RC7'

DominoKit · May 29, 2022 · a3acb24 · a3acb24
2 parents 0b9ffa5 + 0c849d8
commit a3acb24
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 11 deletions.
diff --git a/domino-rest-client/pom.xml b/domino-rest-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>domino-rest</artifactId>
         <groupId>org.dominokit</groupId>
-        <version>1.0.0-RC6</version>
+        <version>1.0.0-RC7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/domino-rest-client/src/main/java/org/dominokit/rest/DominoRestConfig.java b/domino-rest-client/src/main/java/org/dominokit/rest/DominoRestConfig.java
@@ -41,7 +41,7 @@ public class DominoRestConfig implements RestConfig {
   private static String defaultResourceRootPath = "service";
   private static String defaultJsonDateFormat = null;
 
-  private static final RequestRouter<ServerRequest> serverRouter =
+  private static RequestRouter<ServerRequest> serverRouter =
       new ServerRouter(
           new DefaultRequestAsyncSender(new ServerEventFactory(), new RequestSender<>()));
   private static List<DynamicServiceRoot> dynamicServiceRoots = new ArrayList<>();
@@ -189,6 +189,15 @@ public DominoRestConfig setDefaultResourceRootPath(String rootPath) {
     return this;
   }
 
+  /**
+   * Sets the server router
+   *
+   * @param serverRouter the new router
+   */
+  public void setServerRouter(RequestRouter<ServerRequest> serverRouter) {
+    DominoRestConfig.serverRouter = serverRouter;
+  }
+
   /** {@inheritDoc} */
   @Override
   public RequestRouter<ServerRequest> getServerRouter() {

diff --git a/domino-rest-jaxrs/pom.xml b/domino-rest-jaxrs/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.dominokit</groupId>
         <artifactId>domino-rest</artifactId>
-        <version>1.0.0-RC6</version>
+        <version>1.0.0-RC7</version>
     </parent>
 
     <artifactId>domino-rest-jaxrs</artifactId>

diff --git a/domino-rest-jvm/pom.xml b/domino-rest-jvm/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>domino-rest</artifactId>
         <groupId>org.dominokit</groupId>
-        <version>1.0.0-RC6</version>
+        <version>1.0.0-RC7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/domino-rest-processor/pom.xml b/domino-rest-processor/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>domino-rest</artifactId>
         <groupId>org.dominokit</groupId>
-        <version>1.0.0-RC6</version>
+        <version>1.0.0-RC7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/domino-rest-shared/pom.xml b/domino-rest-shared/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>domino-rest</artifactId>
         <groupId>org.dominokit</groupId>
-        <version>1.0.0-RC6</version>
+        <version>1.0.0-RC7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/domino-rest-shared/src/main/java/org/dominokit/rest/shared/request/ServerRequest.java b/domino-rest-shared/src/main/java/org/dominokit/rest/shared/request/ServerRequest.java
@@ -145,7 +145,7 @@ public void startRouting() {
     requestContext.getConfig().getServerRouter().routeRequest(this);
   }
 
-  void setHttpRequest(RestfulRequest httpRequest) {
+  public void setHttpRequest(RestfulRequest httpRequest) {
     this.httpRequest = httpRequest;
   }
 

diff --git a/domino-rest-test/pom.xml b/domino-rest-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>domino-rest</artifactId>
         <groupId>org.dominokit</groupId>
-        <version>1.0.0-RC6</version>
+        <version>1.0.0-RC7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.dominokit</groupId>
     <artifactId>domino-rest</artifactId>
-    <version>1.0.0-RC6</version>
+    <version>1.0.0-RC7</version>
     <packaging>pom</packaging>
 
     <name>domino-rest</name>
@@ -70,7 +70,7 @@
 
     <properties>
         <snapshot.version>HEAD-SNAPSHOT</snapshot.version>
-        <next.release.version>1.0.0-RC6</next.release.version>
+        <next.release.version>1.0.0-RC7</next.release.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -89,7 +89,7 @@
         <maven.gwt.plugin>1.0.0</maven.gwt.plugin>
         <gwt.version>2.9.0</gwt.version>
         <domino.logger.version>1.0.2</domino.logger.version>
-        <domino.jackson.version>1.0.0-RC3</domino.jackson.version>
+        <domino.jackson.version>1.0.0-RC4</domino.jackson.version>
         <domino.history.version>1.0.0-RC3</domino.history.version>
         <domino.aggregator.version>1.0.2</domino.aggregator.version>
     </properties>