diff --git a/.travis.yml b/.travis.yml
index b8f521d776d..80f8f5fd30f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,7 @@ cache:
   - $HOME/samples/server/petstore/rust-server/target
   - $HOME/perl5
   - $HOME/.cargo
+  - $HOME/.stack
 
 services:
   - docker
diff --git a/CI/pom.xml.circleci b/CI/pom.xml.circleci
index 2b641dfc36c..01aae6a5f18 100644
--- a/CI/pom.xml.circleci
+++ b/CI/pom.xml.circleci
@@ -833,6 +833,8 @@
             </activation>
             <modules>
                 <!-- clients -->
+                <!-- test non-java projects -->
+                <module>samples/client/petstore/go</module>
                 <!-- test java-related projects -->
                 <module>samples/client/petstore/akka-scala</module>
                 <module>samples/client/petstore/scala</module>
@@ -855,8 +857,6 @@
                 <module>samples/client/petstore/kotlin/</module>
                 <module>samples/client/petstore/kotlin-threetenbp/</module>
                 <module>samples/client/petstore/kotlin-string/</module>
-                <!-- test non-java projects -->
-                <module>samples/client/petstore/go</module>
                 <!-- servers -->
                 <module>samples/server/petstore/java-vertx/rx</module>
                 <module>samples/server/petstore/java-vertx/async</module>
@@ -873,9 +873,10 @@
                 <module>samples/server/petstore/java-play-framework-api-package-override</module>
                 <module>samples/server/petstore/undertow</module>
                 <module>samples/server/petstore/jaxrs/jersey1</module>
-                <module>samples/server/petstore/jaxrs/jersey2</module>
                 <module>samples/server/petstore/jaxrs/jersey1-useTags</module>
-                <module>samples/server/petstore/jaxrs/jersey2-useTags</module>
+                <!-- move to other CI as the following fails often in CircleCI
+                <module>samples/server/petstore/jaxrs/jersey2</module>
+                <module>samples/server/petstore/jaxrs/jersey2-useTags</module> -->
                 <module>samples/server/petstore/jaxrs-datelib-j8</module>
                 <module>samples/server/petstore/jaxrs-resteasy/default</module>
                 <module>samples/server/petstore/jaxrs-resteasy/eap</module>
@@ -883,9 +884,10 @@
                 <module>samples/server/petstore/jaxrs-resteasy/eap-java8</module>
                 <module>samples/server/petstore/jaxrs-resteasy/joda</module>
                 <!--<module>samples/server/petstore/kotlin-server/ktor</module>-->
+                <!-- move to other CI as the following fails often in CircleCI
                 <module>samples/server/petstore/spring-mvc</module>
                 <module>samples/server/petstore/spring-mvc-j8-async</module>
-                <module>samples/server/petstore/spring-mvc-j8-localdatetime</module>
+                <module>samples/server/petstore/spring-mvc-j8-localdatetime</module>-->
                 <module>samples/client/petstore/spring-cloud</module>
                 <module>samples/server/petstore/springboot</module>
                 <module>samples/server/petstore/springboot-beanvalidation</module>
@@ -898,6 +900,7 @@
                 <module>samples/server/petstore/jaxrs-spec-interface</module>
                 <module>samples/server/petstore/scala-lagom-server</module>
                 <module>samples/server/petstore/scalatra</module>
+                <module>samples/server/petstore/finch</module>
             </modules>
         </profile>
     </profiles>
diff --git a/bin/ensure-up-to-date b/bin/utils/ensure-up-to-date
similarity index 53%
rename from bin/ensure-up-to-date
rename to bin/utils/ensure-up-to-date
index 0bc9d8a7b55..69f52f0fed0 100755
--- a/bin/ensure-up-to-date
+++ b/bin/utils/ensure-up-to-date
@@ -10,21 +10,21 @@ echo "Please press CTRL+C to stop or the script will continue in 5 seconds."
 sleep 5
 
 # LIST OF SCRIPTS:
-./bin/ruby-petstore.sh
-./bin/java-petstore-all.sh
-./bin/java-jaxrs-petstore-server-all.sh
-./bin/spring-all-pestore.sh
-./bin/kotlin-client-petstore.sh
-./bin/kotlin-client-string.sh
-./bin/kotlin-client-threetenbp.sh
-./bin/kotlin-server-petstore.sh
-./bin/php-petstore.sh
-./bin/php-silex-petstore-server.sh
-./bin/php-symfony-petstore.sh
-./bin/php-lumen-petstore-server.sh
-./bin/php-slim-petstore-server.sh
-./bin/php-ze-ph-petstore-server.sh
-./bin/openapi3/php-petstore.sh
+./bin/ruby-petstore.sh > /dev/null 2>&1
+./bin/java-petstore-all.sh > /dev/null 2>&1
+./bin/java-jaxrs-petstore-server-all.sh > /dev/null 2>&1
+./bin/spring-all-pestore.sh > /dev/null 2>&1
+./bin/kotlin-client-petstore.sh > /dev/null 2>&1
+./bin/kotlin-client-string.sh > /dev/null 2>&1
+./bin/kotlin-client-threetenbp.sh > /dev/null 2>&1
+./bin/kotlin-server-petstore.shl> /dev/null 2>&1
+./bin/php-petstore.sh > /dev/null 2>&1
+./bin/php-silex-petstore-server.shj> /dev/null 2>&1
+./bin/php-symfony-petstore.sh > /dev/null 2>&1
+./bin/php-lumen-petstore-server.sh > /dev/null 2>&1
+./bin/php-slim-petstore-server.sh > /dev/null 2>&1
+./bin/php-ze-ph-petstore-server.sh > /dev/null 2>&1
+./bin/openapi3/php-petstore.sh > /dev/null 2>&1
 
 # Check:
 if [ -n "$(git status --porcelain)" ]; then
diff --git a/circle.yml b/circle.yml
index 9dabe4b5d86..85085c24c16 100644
--- a/circle.yml
+++ b/circle.yml
@@ -15,7 +15,7 @@ dependencies:
   cache_directories:
     - "~/.m2"
     - "~/.sbt"
-    - "~/.ivy2/cache"
+    - "~/.ivy2"
 
   pre:
     - sudo add-apt-repository ppa:duggan/bats --yes
diff --git a/pom.xml b/pom.xml
index 916726ec65d..24acb59feb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -935,10 +935,14 @@
             <modules>
                 <!-- clients -->
                 <module>samples/client/petstore/elixir</module>
-                <!--<module>samples/client/petstore/haskell-http-client</module>-->
                 <module>samples/client/petstore/erlang-client</module>
                 <!-- servers -->
                 <module>samples/server/petstore/erlang-server</module>
+                <module>samples/server/petstore/jaxrs/jersey2</module>
+                <module>samples/server/petstore/jaxrs/jersey2-useTags</module>
+                <module>samples/server/petstore/spring-mvc</module>
+                <module>samples/server/petstore/spring-mvc-j8-async</module>
+                <module>samples/server/petstore/spring-mvc-j8-localdatetime</module>
             </modules>
         </profile>
     </profiles>
diff --git a/samples/server/petstore/finch/pom.xml b/samples/server/petstore/finch/pom.xml
new file mode 100644
index 00000000000..92384f2a55a
--- /dev/null
+++ b/samples/server/petstore/finch/pom.xml
@@ -0,0 +1,32 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>finch-server</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>Finch server</name>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.5.0</version>
+                <executions>
+                    <execution>
+                        <id>sbt-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>sbt</executable>
+                            <arguments>
+                                <argument>test</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/samples/server/petstore/scalatra/pom.xml b/samples/server/petstore/scalatra/pom.xml
index e00877441a3..d3b3420e90a 100644
--- a/samples/server/petstore/scalatra/pom.xml
+++ b/samples/server/petstore/scalatra/pom.xml
@@ -1,6 +1,6 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.swagger</groupId>
+    <groupId>org.openapitools</groupId>
     <artifactId>scalatra-server</artifactId>
     <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version>
diff --git a/shippable.yml b/shippable.yml
index 09fb70c2178..686b1ecc1ed 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -12,7 +12,7 @@ build:
   ci:
     - mvn --quiet clean install
     # ensure all modifications created by 'mature' generators are in the git repo
-    - ./bin/ensure-up-to-date
+    - ./bin/utils/ensure-up-to-date
     # prepare enviroment for tests
     - sudo apt-get update -qq
     # install stack