automatic project update

cloudbees · Apr 20, 2016 · 915d253 · 915d253
1 parent ed41ad9
commit 915d253
Show file tree

Hide file tree

Showing 119 changed files with 1,271 additions and 43,501 deletions.
diff --git a/.yo-rc.json b/.yo-rc.json
@@ -24,8 +24,9 @@
       "en"
     ],
     "serverPort": 8080,
-    "jhipsterVersion": "3.0.0",
+    "jhipsterVersion": "3.1.0",
     "enableSocialSignIn": false,
-    "useSass": false
+    "useSass": false,
+    "jhiPrefix": "jhi"
   }
 }
diff --git a/bower.json b/bower.json
@@ -1,62 +1,54 @@
 {
-    "version": "0.0.0",
-    "name": "sampleApplication",
-    "appPath": "src/main/webapp/",
-    "testPath": "src/test/javascript/spec",
-    "dependencies": {
-        "angular": "1.5.2",
-        "angular-aria": "1.5.2",
-        "angular-bootstrap": "1.2.5",
-        "angular-cache-buster": "0.4.3",
-        "angular-cookies": "1.5.2",
-        "angular-dynamic-locale": "0.1.30",
-        "angular-i18n": "1.5.2",
-        "ngstorage": "0.3.10",
-        "angular-loading-bar": "0.9.0",
-        "angular-resource": "1.5.2",
-        "angular-sanitize": "1.5.2",
-        "angular-translate": "2.11.0",
-        "angular-translate-interpolation-messageformat": "2.11.0",
-        "angular-translate-loader-partial": "2.11.0",
-        "angular-translate-storage-cookie": "2.11.0",
-        "angular-ui-router": "0.2.18",
-        "bootstrap": "3.3.6",
-        "bootstrap-ui-datetime-picker": "2.2.3",
-        "jquery": "2.2.2",
-        "json3": "3.3.2",
-        "modernizr": "3.3.1",
-        "ng-file-upload": "12.0.4",
-        "ngInfiniteScroll": "1.2.2",
-        "swagger-ui": "2.1.4"
-    },
-    "devDependencies": {
-        "angular-mocks": "1.5.2",
-        "angular-scenario": "1.5.2"
-    },
-    "overrides": {
-        "angular": {
-            "dependencies": {
-                "jquery": "2.2.2"
-            }
-        },
-        "bootstrap": {
-            "main": [
-                "dist/js/bootstrap.js",
-                "dist/css/bootstrap.css",
-                "less/bootstrap.less"
-            ]
-        },
-        "messageformat": {
-            "main": [
-                "messageformat.js",
-                "locale/en.js"
-            ]
-        }
-    },
-    "resolutions": {
-        "angular": "1.5.2",
-        "angular-cookies": "1.5.2",
-        "angular-bootstrap": "1.2.5",
+  "version": "0.0.0",
+  "name": "sample-application",
+  "appPath": "src/main/webapp/",
+  "testPath": "src/test/javascript/spec",
+  "dependencies": {
+    "angular": "1.5.2",
+    "angular-aria": "1.5.2",
+    "angular-bootstrap": "1.2.5",
+    "angular-cache-buster": "0.4.3",
+    "angular-cookies": "1.5.2",
+    "angular-dynamic-locale": "0.1.30",
+    "angular-i18n": "1.5.2",
+    "ngstorage": "0.3.10",
+    "angular-loading-bar": "0.9.0",
+    "angular-resource": "1.5.2",
+    "angular-sanitize": "1.5.2",
+    "angular-translate": "2.11.0",
+    "angular-translate-interpolation-messageformat": "2.11.0",
+    "angular-translate-loader-partial": "2.11.0",
+    "angular-translate-storage-cookie": "2.11.0",
+    "angular-ui-router": "0.2.18",
+    "bootstrap": "3.3.6",
+    "bootstrap-ui-datetime-picker": "2.3.1",
+    "jquery": "2.2.2",
+    "json3": "3.3.2",
+    "messageformat": "0.3.1",
+    "modernizr": "3.3.1",
+    "ng-file-upload": "12.0.4",
+    "ngInfiniteScroll": "1.2.2",
+    "swagger-ui": "2.1.4"
+  },
+  "devDependencies": {
+    "angular-mocks": "1.5.2"
+  },
+  "overrides": {
+    "angular" : {
+      "dependencies": {
         "jquery": "2.2.2"
+      }
+    },
+    "bootstrap": {
+      "main": [
+        "dist/css/bootstrap.css"
+      ]
     }
+  },
+  "resolutions": {
+    "angular": "1.5.2",
+    "angular-cookies": "1.5.2",
+    "angular-bootstrap": "1.2.5",
+    "jquery": "2.2.2"
+  }
 }
diff --git a/gulpfile.js b/gulpfile.js
@@ -1,4 +1,4 @@
-// Generated on 2016-03-23 using generator-jhipster 3.0.0
+// Generated on 2016-04-20 using generator-jhipster 3.1.0
 'use strict';
 
 var gulp = require('gulp'),
@@ -113,12 +113,7 @@ gulp.task('wiredep', ['wiredep:test', 'wiredep:app']);
 gulp.task('wiredep:app', function () {
     var stream = gulp.src(config.app + 'index.html')
         .pipe(plumber({errorHandler: handleErrors}))
-        .pipe(wiredep({
-            exclude: [
-                /angular-i18n/,  // localizations are loaded dynamically
-                'bower_components/bootstrap/dist/js/' // exclude bootstrap js files as we use ui-bootstrap
-            ]
-        }))
+        .pipe(wiredep())
         .pipe(gulp.dest(config.app));
 
     return stream;
@@ -128,11 +123,6 @@ gulp.task('wiredep:test', function () {
     return gulp.src(config.test + 'karma.conf.js')
         .pipe(plumber({errorHandler: handleErrors}))
         .pipe(wiredep({
-            exclude: [
-                /angular-i18n/,  // localizations are loaded dynamically
-                /angular-scenario/,
-                'bower_components/bootstrap/dist/js/' // exclude Bootstrap js files as we use ui-bootstrap
-            ],
             ignorePath: /\.\.\/\.\.\//, // remove ../../ from paths of injected JavaScript files
             devDependencies: true,
             fileTypes: {

diff --git a/package.json b/package.json
@@ -7,16 +7,13 @@
     "node_modules",
     "src/main/webapp/bower_components"
   ],
-  "dependencies": {
-    "bower": "^1.6.3"
-  },
   "devDependencies": {
     "browser-sync": "2.11.2",
     "del": "2.2.0",
     "eslint-config-angular": "0.5.0",
     "eslint-plugin-angular": "1.0.0",
     "event-stream": "3.3.2",
-    "generator-jhipster": "3.0.0",
+    "generator-jhipster": "3.1.0",
     "gulp": "3.9.1",
     "gulp-angular-filesort": "1.1.1",
     "gulp-angular-templatecache": "1.8.0",
@@ -34,10 +31,10 @@
     "gulp-ng-constant-fork": "0.4.1",
     "gulp-notify": "2.2.0",
     "gulp-plumber": "1.1.0",
-    "gulp-protractor": "2.1.0",
+    "gulp-protractor": "2.3.0",
     "gulp-util": "3.0.7",
     "gulp-rev": "7.0.0",
-    "gulp-rev-replace": "^0.4.3",
+    "gulp-rev-replace": "0.4.3",
     "gulp-sourcemaps": "1.6.0",
     "gulp-uglify": "1.5.3",
     "gulp-useref": "3.0.7",
@@ -53,9 +50,9 @@
     "lazypipe": "1.0.1",
     "lodash": "4.6.1",
     "map-stream": "0.0.6",
-    "phantomjs-prebuilt": "2.1.4",
-    "protractor": "3.1.1",
-    "protractor-jasmine2-screenshot-reporter": "0.3.0",
+    "phantomjs-prebuilt": "2.1.7",
+    "protractor": "3.2.2",
+    "protractor-jasmine2-screenshot-reporter": "0.3.1",
     "proxy-middleware": "0.15.0",
     "run-sequence": "1.1.5",
     "wiredep": "4.0.0",

diff --git a/pom.xml b/pom.xml
@@ -75,6 +75,7 @@
         <sonar.tests>${project.basedir}/src/test/</sonar.tests>
     </properties>
 
+
     <dependencies>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
@@ -558,7 +559,7 @@
                     <driver></driver>
                     <url></url>
                     <defaultSchemaName></defaultSchemaName>
-                    <username></username>
+                    <username>sampleApplication</username>
                     <password></password>
                     <referenceUrl>hibernate:spring:com.mycompany.myapp.domain?dialect=&amp;hibernate.ejb.naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringNamingStrategy</referenceUrl>
                     <verbose>true</verbose>
@@ -599,7 +600,7 @@
             <plugin>
                 <groupId>com.spotify</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>0.4.1</version>
+                <version>0.4.5</version>
                 <configuration>
                     <imageName>sampleapplication</imageName>
                     <dockerDirectory>src/main/docker</dockerDirectory>
@@ -743,9 +744,6 @@
                                 <fileset>
                                     <directory>target/www/</directory>
                                 </fileset>
-                                <fileset>
-                                    <directory>node_modules</directory>
-                                </fileset>
                             </filesets>
                         </configuration>
                     </plugin>

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
@@ -1,10 +1,13 @@
-FROM java:openjdk-8-jdk-alpine
+FROM java:openjdk-8-jre-alpine
+
+ENV JHIPSTER_SLEEP 0
 
 # add directly the war
 ADD *.war /app.war
 
 RUN sh -c 'touch /app.war'
 VOLUME /tmp
-CMD ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.war"]
-
 EXPOSE 8080
+CMD echo "The application will start in ${JHIPSTER_SLEEP}s..." && \
+    sleep ${JHIPSTER_SLEEP} && \
+    java -Djava.security.egd=file:/dev/./urandom -jar /app.war
diff --git a/src/main/docker/mysql.yml b/src/main/docker/mysql.yml
@@ -11,4 +11,4 @@ services:
             - MYSQL_DATABASE=sampleapplication
         ports:
             - 3306:3306
-        command: mysqld --lower_case_table_names=1
+        command: mysqld --lower_case_table_names=1 --skip-ssl
diff --git a/src/main/java/com/mycompany/myapp/config/JHipsterProperties.java b/src/main/java/com/mycompany/myapp/config/JHipsterProperties.java
@@ -207,6 +207,8 @@ public static class Swagger {
 
         private String licenseUrl;
 
+        private Boolean enabled;
+
         public String getTitle() {
             return title;
         }
@@ -278,6 +280,14 @@ public String getLicenseUrl() {
         public void setLicenseUrl(String licenseUrl) {
             this.licenseUrl = licenseUrl;
         }
+
+        public Boolean isEnabled() {
+            return enabled;
+        }
+
+        public void setEnabled(Boolean enabled) {
+            this.enabled = enabled;
+        }
     }
 
     public static class Metrics {

diff --git a/src/main/java/com/mycompany/myapp/config/LoggingConfiguration.java b/src/main/java/com/mycompany/myapp/config/LoggingConfiguration.java
@@ -3,6 +3,7 @@
 import ch.qos.logback.classic.AsyncAppender;
 import ch.qos.logback.classic.LoggerContext;
 import net.logstash.logback.appender.LogstashSocketAppender;
+import net.logstash.logback.stacktrace.ShortenedThrowableConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -47,6 +48,13 @@ public void addLogstashAppender() {
         logstashAppender.setSyslogHost(jHipsterProperties.getLogging().getLogstash().getHost());
         logstashAppender.setPort(jHipsterProperties.getLogging().getLogstash().getPort());
         logstashAppender.setCustomFields(customFields);
+
+        // Limit the maximum length of the forwarded stacktrace so that it won't exceed the 8KB UDP limit of logstash
+        ShortenedThrowableConverter throwableConverter = new ShortenedThrowableConverter();
+        throwableConverter.setMaxLength(7500);
+        throwableConverter.setRootCauseFirst(true);
+        logstashAppender.setThrowableConverter(throwableConverter);
+
         logstashAppender.start();
 
         // Wrap the appender in an Async appender for performance

diff --git a/src/main/java/com/mycompany/myapp/config/WebConfigurer.java b/src/main/java/com/mycompany/myapp/config/WebConfigurer.java
@@ -7,6 +7,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainer;
 import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
 import org.springframework.boot.context.embedded.MimeMappings;
@@ -120,14 +121,14 @@ private void initMetrics(ServletContext servletContext, EnumSet<DispatcherType>
     }
 
     @Bean
+    @ConditionalOnProperty(name = "jhipster.cors.allowed-origins")
     public CorsFilter corsFilter() {
+        log.debug("Registering CORS filter");
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         CorsConfiguration config = jHipsterProperties.getCors();
-        if (config.getAllowedOrigins() != null && !config.getAllowedOrigins().isEmpty()) {
-            source.registerCorsConfiguration("/api/**", config);
-            source.registerCorsConfiguration("/v2/api-docs", config);
-            source.registerCorsConfiguration("/oauth/**", config);
-        }
+        source.registerCorsConfiguration("/api/**", config);
+        source.registerCorsConfiguration("/v2/api-docs", config);
+        source.registerCorsConfiguration("/oauth/**", config);
         return new CorsFilter(source);
     }
 

diff --git a/src/main/java/com/mycompany/myapp/config/apidoc/SwaggerConfiguration.java b/src/main/java/com/mycompany/myapp/config/apidoc/SwaggerConfiguration.java
@@ -6,7 +6,7 @@
 import java.util.Date;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.*;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
@@ -28,7 +28,8 @@
  */
 @Configuration
 @EnableSwagger2
-@ConditionalOnExpression("#{!environment.acceptsProfiles('" + Constants.SPRING_PROFILE_NO_SWAGGER + "') && !environment.acceptsProfiles('" + Constants.SPRING_PROFILE_PRODUCTION + "')}")
+@Profile("!" + Constants.SPRING_PROFILE_NO_SWAGGER)
+@ConditionalOnProperty(prefix="jhipster.swagger", name="enabled")
 public class SwaggerConfiguration {
 
     private final Logger log = LoggerFactory.getLogger(SwaggerConfiguration.class);

diff --git a/src/main/java/com/mycompany/myapp/domain/User.java b/src/main/java/com/mycompany/myapp/domain/User.java
@@ -51,7 +51,7 @@ public class User extends AbstractAuditingEntity implements Serializable {
     @NotNull
     @Email
     @Size(max = 100)
-    @Column(length = 100, unique = true)
+    @Column(length = 100, unique = true, nullable = false)
     private String email;
 
     @NotNull