Merge branch 'master' of https://github.com/eugenp/tutorials

2017-12-15 11:34:10 +01:00
parent 70d58b370f ae109dfb7c
commit deeb2b20f3
60 changed files with 1273 additions and 485 deletions
@@ -58,7 +58,6 @@
        <!--<module>ejb</module>-->

        <module>feign</module>
-        <module>flyway</module>

        <!-- <module>testing-modules/gatling</module> --> <!-- not meant to run as part of the standard build -->

@@ -173,8 +172,9 @@
        <module>spring-hibernate4</module>
        <module>persistence-modules/spring-hibernate-5</module>
        <module>spring-integration</module>
+        <module>spring-jenkins-pipeline</module>
        <module>spring-jersey</module>
-        <module>spring-jmeter-jenkins</module>
+        <module>jmeter</module>
        <module>spring-jms</module>
        <module>spring-jooq</module>
        <module>persistence-modules/spring-jpa</module>