Migrate to the jhispter v2.23.0

acheype · Nov 5, 2015 · 93cb646 · 93cb646
1 parent 624c717
commit 93cb646
Show file tree

Hide file tree

Showing 157 changed files with 2,891 additions and 1,588 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,7 +21,6 @@
 *.pydevproject
 .project
 .metadata
-/bin/**
 /tmp/**
 /tmp/**/*
 *.tmp

diff --git a/.yo-rc.json b/.yo-rc.json
@@ -16,6 +16,10 @@
     "frontendBuilder": "grunt",
     "javaVersion": "8",
     "enableTranslation": false,
-    "rememberMeKey": "cb0f037ff3c3646f9796359f3916f7e654f33744"
+    "rememberMeKey": "cb0f037ff3c3646f9796359f3916f7e654f33744",
+    "enableSocialSignIn": false,
+    "testFrameworks": [
+      "gatling"
+    ]
   }
 }
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,4 +1,4 @@
-// Generated on 2015-09-18 using generator-jhipster 2.21.0
+// Generated on 2015-11-04 using generator-jhipster 2.23.0
 'use strict';
 var fs = require('fs');
 
@@ -20,7 +20,7 @@ var useminAutoprefixer = {
         if(block.src.length === 0) {
             return {};
         } else {
-            return require('grunt-usemin/lib/config/cssmin').createConfig(context, block) // Reuse cssmins createConfig
+            return require('grunt-usemin/lib/config/cssmin').createConfig(context, block); // Reuse cssmins createConfig
         }
     }
 };
@@ -75,6 +75,7 @@ module.exports = function (grunt) {
                 src: ['src/main/webapp/index.html', 'src/main/scss/main.scss'],
                 exclude: [
                     /angular-i18n/, // localizations are loaded dynamically
+                    'bower_components/bootstrap/', // Exclude Bootstrap LESS as we use bootstrap-sass
                     /bootstrap-sass\/assets\/stylesheets/
                 ],
                 ignorePath: /\.\.\/webapp\/bower_components\// // remove ../webapp/bower_components/ from paths of injected sass files
@@ -229,7 +230,7 @@ module.exports = function (grunt) {
         ngtemplates:    {
             dist: {
                 cwd: 'src/main/webapp',
-                src: ['scripts/app/**/*.html', 'scripts/components/**/*.html',],
+                src: ['scripts/app/**/*.html', 'scripts/components/**/*.html'],
                 dest: '.tmp/templates/templates.js',
                 options: {
                     module: 'malariaplantdbApp',
@@ -372,7 +373,7 @@ module.exports = function (grunt) {
                     'src/main/webapp/index.html': 'src/main/webapp/index.html'
                 }
             }
-        },
+        }
     });
 
     grunt.registerTask('serve', [
@@ -420,27 +421,27 @@ module.exports = function (grunt) {
         'htmlmin'
     ]);
 
-	grunt.registerTask('appendSkipBower', 'Force skip of bower for Gradle', function () {
+    grunt.registerTask('appendSkipBower', 'Force skip of bower for Gradle', function () {
 
-		if (!grunt.file.exists(filepath)) {
-			// Assume this is a maven project
-			return true;
-		}
+        if (!grunt.file.exists(filepath)) {
+            // Assume this is a maven project
+            return true;
+        }
 
-		var fileContent = grunt.file.read(filepath);
-		var skipBowerIndex = fileContent.indexOf("skipBower=true");
+        var fileContent = grunt.file.read(filepath);
+        var skipBowerIndex = fileContent.indexOf("skipBower=true");
 
-		if (skipBowerIndex != -1) {
-			return true;
-		}
+        if (skipBowerIndex != -1) {
+            return true;
+        }
 
-		grunt.file.write(filepath, fileContent + "\nskipBower=true\n");
-	});
+        grunt.file.write(filepath, fileContent + "\nskipBower=true\n");
+    });
 
     grunt.registerTask('buildOpenshift', [
         'test',
         'build',
-        'copy:generateOpenshiftDirectory',
+        'copy:generateOpenshiftDirectory'
     ]);
 
     grunt.registerTask('deployOpenshift', [

diff --git a/bower.json b/bower.json
@@ -14,7 +14,7 @@
         "angular-sanitize": "1.4.5",
         "angular-ui-router": "0.2.15",
         "bootstrap-sass": "3.3.5",
-        "bootswatch" : "3.3.5",
+      "bootswatch": "3.3.5",
         "jquery": "2.1.4",
         "json3": "3.3.2",
         "modernizr": "2.8.3",

diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
@@ -0,0 +1,19 @@
+jhipster-prod-elasticsearch:
+  container_name: malariaplantdb-prod-elasticsearch
+  image: elasticsearch
+  # volumes:
+  # - ~/volumes/jhipster/malariaplantdb/prod-elasticsearch/:/usr/share/elasticsearch/data/
+  ports:
+  - "9200:9200"
+  - "9300:9300"
+jhipster-prod-postgresql:
+  container_name: malariaplantdb-prod-postgresql
+  image: postgres
+  # volumes:
+  # - ~/volumes/jhipster/malariaplantdb/prod-postgresql/:/var/lib/postgresql/
+  environment:
+  - POSTGRES_USER=malariaplantdb
+  - POSTGRES_PASSWORD=
+  ports:
+  - "5432:5432"
+
diff --git a/package.json b/package.json
@@ -3,55 +3,57 @@
   "version": "0.0.0",
   "description": "Description for malariaplantdb",
   "private": true,
-  "dependencies": {},
+  "dependencies": {
+  },
   "devDependencies": {
-    "event-stream": "3.3.1",
-    "generator-jhipster": "2.21.0",
     "grunt": "0.4.5",
-    "grunt-angular-templates": "0.5.7",
     "grunt-autoprefixer": "2.2.0",
-    "grunt-browser-sync": "2.1.3",
     "grunt-build-control": "0.3.0",
+    "grunt-wiredep": "2.0.0",
+    "grunt-browser-sync": "2.1.3",
+    "browser-sync": "2.9.6",
+    "grunt-contrib-copy": "0.8.0",
     "grunt-contrib-clean": "0.6.0",
     "grunt-contrib-concat": "0.5.1",
-    "grunt-contrib-copy": "0.8.0",
     "grunt-contrib-cssmin": "0.11.0",
     "grunt-contrib-htmlmin": "0.4.0",
     "grunt-contrib-imagemin": "0.9.3",
     "grunt-contrib-jshint": "0.11.0",
     "grunt-contrib-uglify": "0.8.0",
     "grunt-contrib-watch": "0.6.1",
     "grunt-include-source": "^0.7.0",
-    "grunt-karma": "0.11.0",
     "grunt-modernizr": "0.6.0",
     "grunt-ng-annotate": "0.10.0",
     "grunt-ng-constant": "1.1.0",
     "grunt-rev": "0.1.0",
-    "grunt-sass": "1.0.0",
     "grunt-svgmin": "2.0.1",
     "grunt-text-replace": "0.4.0",
     "grunt-usemin": "3.0.0",
-    "grunt-wiredep": "2.0.0",
-    "jasmine-core": "2.1.0",
+    "grunt-angular-templates":"0.5.7",
+    "load-grunt-tasks": "3.1.0",
+    "grunt-karma": "0.11.0",
+    "time-grunt": "1.1.0",
+    "grunt-sass": "1.0.0",
+    "event-stream": "3.3.1",
     "jshint-stylish": "1.0.1",
-    "karma": "0.12.35",
+    "karma-script-launcher": "0.1.0",
     "karma-chrome-launcher": "0.1.12",
-    "karma-coverage": "0.4.2",
     "karma-html2js-preprocessor": "0.1.0",
     "karma-jasmine": "0.3.5",
-    "karma-jenkins-reporter": "0.0.2",
-    "karma-phantomjs-launcher": "0.2.0",
     "karma-requirejs": "0.2.2",
-    "karma-script-launcher": "0.1.0",
-    "load-grunt-tasks": "3.1.0",
-    "lodash": "3.3.1",
+    "karma-phantomjs-launcher": "0.2.0",
     "phantomjs": "1.9.17",
-    "requirejs": "2.1",
-    "time-grunt": "1.1.0",
-    "wiredep": "2.2.2",
+    "karma": "0.12.35",
+    "karma-coverage": "0.4.2",
+    "karma-jenkins-reporter": "0.0.2",
+    "generator-jhipster": "2.23.0",
+    "lodash": "3.3.1",
     "xml2js": "0.4.5",
     "yo": ">=1.3.0",
-    "zeparser": "0.0.7"
+    "requirejs": "2.1",
+    "jasmine-core": "2.1.0",
+    "zeparser": "0.0.7",
+    "wiredep": "2.2.2"
   },
   "engines": {
     "node": ">=0.12.0"

diff --git a/pom.xml b/pom.xml
@@ -5,35 +5,46 @@
     <parent>
         <artifactId>spring-boot-starter-parent</artifactId>
         <groupId>org.springframework.boot</groupId>
-        <version>1.2.5.RELEASE</version>
+        <version>1.3.0.RC1</version>
         <relativePath/>
     </parent>
 
     <groupId>nc.ird.malariaplantdb</groupId>
     <artifactId>malariaplantdb</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>war</packaging>
-
     <name>malariaplantdb</name>
 
+    <repositories>
+        <repository>
+            <id>spring-milestones</id>
+            <url>http://repo.spring.io/milestone</url>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-milestones</id>
+            <url>http://repo.spring.io/milestone</url>
+        </pluginRepository>
+    </pluginRepositories>
+
     <prerequisites>
         <maven>3.0.0</maven>
     </prerequisites>
 
     <properties>
-        <hikaricp.version>2.4.0</hikaricp.version>
+        <hikaricp.version>2.4.1</hikaricp.version>
         <assertj-core.version>3.1.0</assertj-core.version>
         <awaitility.version>1.4.0</awaitility.version>
         <commons-io.version>2.4</commons-io.version>
         <commons-lang.version>2.6</commons-lang.version>
-        <gatling.version>2.1.6</gatling.version>
-        <gatling-maven-plugin.version>2.1.6</gatling-maven-plugin.version>
-        <hibernate.version>4.3.10.Final</hibernate.version>
+        <gatling.version>2.1.7</gatling.version>
+        <gatling-maven-plugin.version>2.1.7</gatling-maven-plugin.version>
+        <hibernate.version>4.3.11.Final</hibernate.version>
         <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <javax.inject.version>1</javax.inject.version>
-        <joda-time-hibernate.version>1.4</joda-time-hibernate.version>
         <liquibase.version>3.4.1</liquibase.version>
         <liquibase-slf4j.version>1.2.1</liquibase-slf4j.version>
         <liquibase-hibernate4.version>3.5</liquibase-hibernate4.version>
@@ -43,11 +54,10 @@
         <maven-sortpom-plugin.version>2.3.0</maven-sortpom-plugin.version>
         <metrics-spark-reporter.version>1.2</metrics-spark-reporter.version>
         <metrics-spring.version>3.1.2</metrics-spring.version>
-        <postgresql.version>9.4-1201-jdbc41</postgresql.version>
+        <postgresql.version>9.4-1203-jdbc42</postgresql.version>
         <run.addResources>false</run.addResources>
         <spring-security.version>4.0.2.RELEASE</spring-security.version>
         <springfox.version>2.0.3</springfox.version>
-        <usertype-core.version>4.0.0.GA</usertype-core.version>
         <!-- Sonar properties -->
         <project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
         <sonar-maven-plugin.version>2.6</sonar-maven-plugin.version>
@@ -63,7 +73,6 @@
         <sonar.sources>${project.basedir}/src/main/</sonar.sources>
         <sonar.surefire.reportsPath>${project.testresult.directory}/surefire-reports</sonar.surefire.reportsPath>
         <sonar.tests>${project.basedir}/src/test/</sonar.tests>
-
     </properties>
 
     <dependencies>
@@ -127,7 +136,7 @@
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-joda</artifactId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -223,15 +232,6 @@
             <artifactId>javax.inject</artifactId>
             <version>${javax.inject.version}</version>
         </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time-hibernate</artifactId>
-            <version>${joda-time-hibernate.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -257,11 +257,6 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jadira.usertype</groupId>
-            <artifactId>usertype.core</artifactId>
-            <version>${usertype-core.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.liquibase</groupId>
             <artifactId>liquibase-core</artifactId>
@@ -294,10 +289,20 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-loader-tools</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
@@ -577,6 +582,7 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
+                    <executable>true</executable>
                     <jvmArguments>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005</jvmArguments>
                     <arguments>
                         <argument>--spring.profiles.active=dev</argument>
@@ -647,6 +653,7 @@
                         <groupId>org.springframework.boot</groupId>
                         <artifactId>spring-boot-maven-plugin</artifactId>
                         <configuration>
+                            <executable>true</executable>
                             <arguments>
                                 <argument>--spring.profiles.active=dev,fast</argument>
                             </arguments>
@@ -707,6 +714,7 @@
                         <groupId>org.springframework.boot</groupId>
                         <artifactId>spring-boot-maven-plugin</artifactId>
                         <configuration>
+                            <executable>true</executable>
                             <arguments>
                                 <argument>--spring.profiles.active=prod</argument>
                             </arguments>