diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b455f988..39cbb54f 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -16,9 +16,9 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - name: Set up JDK 13s + uses: actions/setup-java@v13 with: - java-version: 1.8 + java-version: 13 - name: Build with Maven run: ./mvnw -B package --file pom.xml diff --git a/README.md b/README.md index b3558f89..c2bf7c34 100644 --- a/README.md +++ b/README.md @@ -9,28 +9,11 @@ Status ------ ![Java CI with Maven](https://github.com/Spring-Framework-Java-Apps/simpleworklist/workflows/Java%20CI%20with%20Maven/badge.svg?branch=master) -Setup local Test-System ------------------------ - -1. Setup a PostgreSQL 10-Database -3. copy src/main/resources/worklist_sample.properties to _src/main/resources/worklist.properties -4. start project with: mvn clean spring-boot:run - Getting Things Done ------------------- GTD® and Getting Things Done® are registered trademarks of the David Allen Company. SimpleWorklist is not affiliated with or endorsed by the David Allen Company. -Setup a PostgreSQL 10-Database ------------------------------- -* https://www.postgresql.org/download/ -* Windows and macOS - Graphical installer by *BigSQL*: https://www.openscg.com/bigsql/postgresql/installers.jsp/ -* Windows: - 1. start cmd as admin - 2. cd \PostgreSQL - 3. pgc start - 4. pgc pgadmin3 - Developer Reminder ------------------ * Create serialVersionUID for Classes with "implements Serializable": use the JDK tool “serialver“ diff --git a/etc/TODO.md b/etc/TODO.md index 959436be..b27e451d 100644 --- a/etc/TODO.md +++ b/etc/TODO.md @@ -68,5 +68,7 @@ Fixed #103, Fixed #102 Fixed #107, Fixed #108 ## 2.3.12 -Fixed #106 +Fixed #106, #Fixed 109, Fixed #110 + +Deployment to heroku diff --git a/pom.xml b/pom.xml index c4cab9fc..7fee918f 100644 --- a/pom.xml +++ b/pom.xml @@ -121,22 +121,10 @@ spring-boot-properties-migrator runtime - - - org.springframework.boot - spring-boot-starter-data-jpa - - + + org.springframework.boot + spring-boot-starter-data-jpa + org.springframework.boot spring-boot-starter-web @@ -326,6 +314,111 @@ true + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-dependencies + pre-site + + analyze-only + analyze-dep-mgt + analyze-report + sources + resolve + resolve-plugins + collect + copy-dependencies + unpack-dependencies + build-classpath + + + true + true + ${project.build.outputDirectory}/classpath.txt + false + + org.apache.maven.plugins:maven-surefire-plugin + + + + org.apache.maven.plugins:maven-surefire-plugin + + + org.apache.maven.plugins:maven-surefire-plugin + + + + + check-dependencies1 + pre-site + + list + list-repositories + properties + + + + check-dependencies2 + pre-site + + analyze + analyze-dep-mgt + analyze-duplicate + analyze-report + + + + check-dependencies3 + verify + + tree + + + + report + site + + org.webjars,org.jclouds,org.jboss.as,xml-resolver,commons-configuration,org.codehaus.plexus,commons-digester,junit,log4j,io.openliberty.features + weld-probe-core,commons-configuration,jdk.tools,maven-antrun-plugin + false + + + + analyze-report + + + + + + + get-dependency-sources + pre-site + + sources + resolve + resolve-plugins + collect + copy-dependencies + unpack-dependencies + + + sources + org.webjars + weld-probe-core + false + ${project.build.directory}/dependencies/ + + + + @@ -341,7 +434,10 @@ simpleworklist - clean install dependency:sources dependency:resolve dependency:resolve-plugins dependency:tree spring-boot:run + clean spring-boot:run + org.springframework.boot @@ -368,111 +464,6 @@ - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-dependencies - prepare-package - - analyze-only - analyze-dep-mgt - analyze-report - sources - resolve - resolve-plugins - collect - copy-dependencies - unpack-dependencies - build-classpath - - - true - true - ${project.build.outputDirectory}/classpath.txt - false - - org.apache.maven.plugins:maven-surefire-plugin - - - - org.apache.maven.plugins:maven-surefire-plugin - - - org.apache.maven.plugins:maven-surefire-plugin - - - - - check-dependencies1 - verify - - list - list-repositories - properties - - - - check-dependencies2 - verify - - analyze - analyze-dep-mgt - analyze-duplicate - analyze-report - - - - check-dependencies3 - verify - - tree - - - - report - site - - org.webjars,org.jclouds,org.jboss.as,xml-resolver,commons-configuration,org.codehaus.plexus,commons-digester,junit,log4j,io.openliberty.features - weld-probe-core,commons-configuration,jdk.tools,maven-antrun-plugin - false - - - - analyze-report - - - - - - - get-dependency-sources - prepare-package - - sources - resolve - resolve-plugins - collect - copy-dependencies - unpack-dependencies - - - sources - org.webjars - weld-probe-core - false - ${project.build.directory}/dependencies/ - - - - org.apache.maven.plugins maven-surefire-plugin diff --git a/setenv-sample.sh b/setenv-sample.sh index 2ae04aaa..2d037308 100644 --- a/setenv-sample.sh +++ b/setenv-sample.sh @@ -7,3 +7,5 @@ export MAIL_SMTP_USERNAME='mailuser' export MAIL_SMTP_PASSWORD='mailuserpassword' export MAIL_FROM='noreply@example.org' export MAIL_URL_APP_HOST='localhost:5000' +export JPA_DLL_AUTO='update' +#export JPA_DLL_AUTO='create-drop' diff --git a/system.properties b/system.properties index 916c446b..5e8606c8 100644 --- a/system.properties +++ b/system.properties @@ -1 +1 @@ -java.runtime.version=1.8 \ No newline at end of file +java.runtime.version=1.8