Skip to content

Commit

Permalink
Upgrade to JHipster 4.14.3
Browse files Browse the repository at this point in the history
* Generated with JHipster 4.13.3

* Fix compilation and testing issues

* Updated yarn.lock

* Add Travis for CI

* Re-create application from scratch

* Update tutorial and screenshots
  • Loading branch information
Matt Raible authored May 3, 2018
1 parent 4986d9d commit 896beea
Show file tree
Hide file tree
Showing 366 changed files with 12,718 additions and 6,434 deletions.
31 changes: 18 additions & 13 deletions .angular-cli.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"name": "blog"
},
"apps": [{
"root": "src/main/webapp/",
"root": "src/main/webapp",
"outDir": "target/www/app",
"assets": [
"content",
Expand All @@ -14,7 +14,7 @@
"index": "index.html",
"main": "app/app.main.ts",
"polyfills": "app/polyfills.ts",
"test": "",
"test": "src/test/javascript/spec/entry.ts",
"tsconfig": "../../../tsconfig.json",
"prefix": "jhi",
"mobile": false,
Expand All @@ -24,8 +24,6 @@
],
"scripts": []
}],
"addons": [],
"packages": [],
"e2e": {
"protractor": {
"config": "src/test/javascript/protractor.conf.js"
Expand All @@ -46,15 +44,22 @@
"defaults": {
"styleExt": "scss",
"prefixInterfaces": false,
"inline": {
"style": true,
"template": false
"component" : {
"inlineStyle" : true,
"inlineTemplate": false,
"spec": false
},
"spec": {
"component": false,
"directive": false,
"pipe": false,
"service": false
"directive" : {
"spec": false
},
"guard" : {
"spec": false
},
"pipe" : {
"spec": false
},
"service" : {
"spec": false
}
},
"packageManager": "yarn"
Expand Down
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*.properties text
*.sass text
*.scss text
*.sh text
*.sh text eol=lf
*.sql text
*.txt text
*.ts text
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
node_tmp/
node_modules/
npm-debug.log.*
/.awcache/*

######################
# SASS
Expand Down Expand Up @@ -59,6 +60,7 @@ local.properties
*.ipr
*.ids
*.orig
classes/

######################
# Visual Studio Code
Expand Down Expand Up @@ -116,7 +118,7 @@ Desktop.ini
######################
# Logs
######################
*.log
*.log*

######################
# Others
Expand Down
5 changes: 3 additions & 2 deletions .jhipster/Blog.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@
"fieldValidateRulesMinlength": 2
}
],
"changelogDate": "20170202161957",
"changelogDate": "20180502214820",
"entityTableName": "blog",
"dto": "no",
"pagination": "no",
"service": "no"
"service": "no",
"jpaMetamodelFiltering": false
}
5 changes: 3 additions & 2 deletions .jhipster/Entry.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,10 @@
]
}
],
"changelogDate": "20170202161958",
"changelogDate": "20180502214821",
"entityTableName": "entry",
"dto": "no",
"pagination": "infinite-scroll",
"service": "no"
"service": "no",
"jpaMetamodelFiltering": false
}
5 changes: 3 additions & 2 deletions .jhipster/Tag.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@
"fieldValidateRulesMinlength": 2
}
],
"changelogDate": "20170202161959",
"changelogDate": "20180502214822",
"entityTableName": "tag",
"dto": "no",
"pagination": "infinite-scroll",
"service": "no"
"service": "no",
"jpaMetamodelFiltering": false
}
57 changes: 57 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
os:
- linux
services:
- docker
language: node_js
node_js:
- "9.8.0"
addons:
apt:
sources:
- google-chrome
packages:
- google-chrome-stable
jdk:
- oraclejdk8
sudo: false
cache:
directories:
- node
- node_modules
- $HOME/.m2
- $HOME/.yarn-cache
env:
global:
- NODE_VERSION=9.8.0
- SPRING_OUTPUT_ANSI_ENABLED=ALWAYS
- SPRING_JPA_SHOW_SQL=false
before_install:
- jdk_switcher use oraclejdk8
- java -version
- sudo /etc/init.d/mysql stop
- sudo /etc/init.d/postgresql stop
# Repo for Yarn
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH
- export CHROME_BIN=/usr/bin/google-chrome
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
install:
- yarn install
script:
- chmod +x mvnw
- ./mvnw clean test
- yarn test
- docker-compose -f src/main/docker/postgresql.yml up -d
- ./mvnw -q package -Pprod -DskipTests
- java -jar target/*.war &
- bootPid=$!
- sleep 60s
- yarn e2e
- kill $bootPid
# ./mvnw com.heroku.sdk:heroku-maven-plugin:1.1.1:deploy -DskipTests -Pprod -Dheroku.appName=
notifications:
webhooks:
on_success: change # options: [always|never|change] default: always
on_failure: always # options: [always|never|change] default: always
on_start: false # default: false
18 changes: 12 additions & 6 deletions .yo-rc.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
{
"generator-jhipster": {
"jhipsterVersion": "4.3.0",
"promptValues": {
"packageName": "org.jhipster",
"nativeLanguage": "en"
},
"jhipsterVersion": "4.14.3",
"baseName": "blog",
"packageName": "org.jhipster",
"packageFolder": "org/jhipster",
"serverPort": "8080",
"authenticationType": "jwt",
"hibernateCache": "ehcache",
"clusteredHttpSession": false,
"cacheProvider": "ehcache",
"enableHibernateCache": true,
"websocket": false,
"databaseType": "sql",
"devDatabaseType": "h2Disk",
Expand All @@ -17,8 +21,9 @@
"serviceDiscoveryType": false,
"buildTool": "maven",
"enableSocialSignIn": false,
"jwtSecretKey": "a895eda190e4ddf6eba453aa725bb4da8a565dfc",
"clientFramework": "angular2",
"enableSwaggerCodegen": false,
"jwtSecretKey": "66a6793747830fceb83801a2f66b634206014a82",
"clientFramework": "angularX",
"useSass": true,
"clientPackageManager": "yarn",
"applicationType": "monolith",
Expand All @@ -32,6 +37,7 @@
"languages": [
"en",
"es"
]
],
"herokuDeployType": "git"
}
}
2 changes: 1 addition & 1 deletion Procfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
web: java -jar target/*.war --spring.profiles.active=prod,heroku --server.port=$PORT
web: java $JAVA_OPTS -Xmx256m -jar target/*.war --spring.profiles.active=prod,heroku --server.port=$PORT
Loading

0 comments on commit 896beea

Please sign in to comment.