Skip to content

Commit 3c57ac3

Browse files
thomaswoehlkethomaswoehlke
authored
Merge pull request #115 from Spring-Framework-Java-Apps/heroku-deployment
Heroku deployment
2 parents 8a1412e + 977b9a3 commit 3c57ac3

File tree

6 files changed

+122
-144
lines changed

6 files changed

+122
-144
lines changed

‎.github/workflows/maven.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616

1717
steps:
1818
- uses: actions/checkout@v2
19-
- name: Set up JDK 1.8
20-
uses: actions/setup-java@v1
19+
- name: Set up JDK 13s
20+
uses: actions/setup-java@v13
2121
with:
22-
java-version: 1.8
22+
java-version: 13
2323
- name: Build with Maven
2424
run: ./mvnw -B package --file pom.xml

‎README.md

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,11 @@ Status
99
------
1010
![Java CI with Maven](https://github.com/Spring-Framework-Java-Apps/simpleworklist/workflows/Java%20CI%20with%20Maven/badge.svg?branch=master)
1111

12-
Setup local Test-System
13-
-----------------------
14-
15-
1. Setup a PostgreSQL 10-Database
16-
3. copy src/main/resources/worklist_sample.properties to _src/main/resources/worklist.properties
17-
4. start project with: mvn clean spring-boot:run
18-
1912
Getting Things Done
2013
-------------------
2114
GTD® and Getting Things Done® are registered trademarks of the David Allen Company.
2215
SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
2316

24-
Setup a PostgreSQL 10-Database
25-
------------------------------
26-
* https://www.postgresql.org/download/
27-
* Windows and macOS - Graphical installer by *BigSQL*: https://www.openscg.com/bigsql/postgresql/installers.jsp/
28-
* Windows:
29-
1. start cmd as admin
30-
2. cd \PostgreSQL
31-
3. pgc start
32-
4. pgc pgadmin3
33-
3417
Developer Reminder
3518
------------------
3619
* Create serialVersionUID for Classes with "implements Serializable": use the JDK tool “serialver“

‎etc/TODO.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,7 @@ Fixed #103, Fixed #102
6868
Fixed #107, Fixed #108
6969

7070
## 2.3.12
71-
Fixed #106
71+
Fixed #106, #Fixed 109, Fixed #110
72+
73+
Deployment to heroku
7274

‎pom.xml

Lines changed: 113 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -121,22 +121,10 @@
121121
<artifactId>spring-boot-properties-migrator</artifactId>
122122
<scope>runtime</scope>
123123
</dependency>
124-
<!--
125-
<dependency>
126-
<groupId>org.springframework.boot</groupId>
127-
<artifactId>spring-boot-starter-data-jdbc</artifactId>
128-
</dependency>
129-
-->
130-
<dependency>
131-
<groupId>org.springframework.boot</groupId>
132-
<artifactId>spring-boot-starter-data-jpa</artifactId>
133-
</dependency>
134-
<!--
135-
<dependency>
136-
<groupId>org.springframework.boot</groupId>
137-
<artifactId>spring-boot-starter-data-solr</artifactId>
138-
</dependency>
139-
-->
124+
<dependency>
125+
<groupId>org.springframework.boot</groupId>
126+
<artifactId>spring-boot-starter-data-jpa</artifactId>
127+
</dependency>
140128
<dependency>
141129
<groupId>org.springframework.boot</groupId>
142130
<artifactId>spring-boot-starter-web</artifactId>
@@ -326,6 +314,111 @@
326314
<detachedMode>true</detachedMode>
327315
</configuration>
328316
</plugin>
317+
<plugin>
318+
<groupId>org.apache.maven.plugins</groupId>
319+
<artifactId>maven-dependency-plugin</artifactId>
320+
<executions>
321+
<execution>
322+
<id>unpack-dependencies</id>
323+
<phase>pre-site</phase>
324+
<goals>
325+
<goal>analyze-only</goal>
326+
<goal>analyze-dep-mgt</goal>
327+
<goal>analyze-report</goal>
328+
<goal>sources</goal>
329+
<goal>resolve</goal>
330+
<goal>resolve-plugins</goal>
331+
<goal>collect</goal>
332+
<goal>copy-dependencies</goal>
333+
<goal>unpack-dependencies</goal>
334+
<goal>build-classpath</goal>
335+
</goals>
336+
<configuration>
337+
<overWriteReleases>true</overWriteReleases>
338+
<overWriteSnapshots>true</overWriteSnapshots>
339+
<outputFile>${project.build.outputDirectory}/classpath.txt</outputFile>
340+
<failOnWarning>false</failOnWarning>
341+
<ignoredDependencies>
342+
<ignoredDependency>org.apache.maven.plugins:maven-surefire-plugin</ignoredDependency>
343+
<!--
344+
<ignoredDependency>org.apache.maven.scm:maven-scm</ignoredDependency>
345+
<ignoredDependency>org.apache.maven.scm:maven-scm-providers-git</ignoredDependency>
346+
<ignoredDependency>org.apache.maven.scm:maven-scm-providers-standard</ignoredDependency>
347+
<ignoredDependency>org.apache.maven.scm:maven-scm-providers</ignoredDependency>
348+
<ignoredDependency>org.apache.maven.scm:maven-scm-managers</ignoredDependency>
349+
-->
350+
</ignoredDependencies>
351+
<ignoredUsedUndeclaredDependencies>
352+
<ignoredUsedUndeclaredDependency>org.apache.maven.plugins:maven-surefire-plugin</ignoredUsedUndeclaredDependency>
353+
</ignoredUsedUndeclaredDependencies>
354+
<ignoredUnusedDeclaredDependencies>
355+
<ignoredUnusedDeclaredDependency>org.apache.maven.plugins:maven-surefire-plugin</ignoredUnusedDeclaredDependency>
356+
</ignoredUnusedDeclaredDependencies>
357+
</configuration>
358+
</execution>
359+
<execution>
360+
<id>check-dependencies1</id>
361+
<phase>pre-site</phase>
362+
<goals>
363+
<goal>list</goal>
364+
<goal>list-repositories</goal>
365+
<goal>properties</goal>
366+
</goals>
367+
</execution>
368+
<execution>
369+
<id>check-dependencies2</id>
370+
<phase>pre-site</phase>
371+
<goals>
372+
<goal>analyze</goal>
373+
<goal>analyze-dep-mgt</goal>
374+
<goal>analyze-duplicate</goal>
375+
<goal>analyze-report</goal>
376+
</goals>
377+
</execution>
378+
<execution>
379+
<id>check-dependencies3</id>
380+
<phase>verify</phase>
381+
<goals>
382+
<goal>tree</goal>
383+
</goals>
384+
</execution>
385+
<execution>
386+
<id>report</id>
387+
<phase>site</phase>
388+
<configuration>
389+
<excludeGroupIds>org.webjars,org.jclouds,org.jboss.as,xml-resolver,commons-configuration,org.codehaus.plexus,commons-digester,junit,log4j,io.openliberty.features</excludeGroupIds>
390+
<excludeArtifactIds>weld-probe-core,commons-configuration,jdk.tools,maven-antrun-plugin</excludeArtifactIds>
391+
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
392+
<reportSets>
393+
<reportSet>
394+
<reports>
395+
<report>analyze-report</report>
396+
</reports>
397+
</reportSet>
398+
</reportSets>
399+
</configuration>
400+
</execution>
401+
<execution>
402+
<id>get-dependency-sources</id>
403+
<phase>pre-site</phase>
404+
<goals>
405+
<goal>sources</goal>
406+
<goal>resolve</goal>
407+
<goal>resolve-plugins</goal>
408+
<goal>collect</goal>
409+
<goal>copy-dependencies</goal>
410+
<goal>unpack-dependencies</goal>
411+
</goals>
412+
<configuration>
413+
<classifier>sources</classifier>
414+
<excludeGroupIds>org.webjars</excludeGroupIds>
415+
<excludeArtifactIds>weld-probe-core</excludeArtifactIds>
416+
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
417+
<outputDirectory>${project.build.directory}/dependencies/</outputDirectory>
418+
</configuration>
419+
</execution>
420+
</executions>
421+
</plugin>
329422
</plugins>
330423
</build>
331424

@@ -341,7 +434,10 @@
341434
</activation>
342435
<build>
343436
<finalName>simpleworklist</finalName>
344-
<defaultGoal>clean install dependency:sources dependency:resolve dependency:resolve-plugins dependency:tree spring-boot:run</defaultGoal>
437+
<defaultGoal>clean spring-boot:run</defaultGoal>
438+
<!--
439+
<defaultGoal>clean install dependency:sources dependency:resolve dependency:resolve-plugins dependency:tree/defaultGoal>
440+
-->
345441
<plugins>
346442
<plugin>
347443
<groupId>org.springframework.boot</groupId>
@@ -368,111 +464,6 @@
368464
</execution>
369465
</executions>
370466
</plugin>
371-
<plugin>
372-
<groupId>org.apache.maven.plugins</groupId>
373-
<artifactId>maven-dependency-plugin</artifactId>
374-
<executions>
375-
<execution>
376-
<id>unpack-dependencies</id>
377-
<phase>prepare-package</phase>
378-
<goals>
379-
<goal>analyze-only</goal>
380-
<goal>analyze-dep-mgt</goal>
381-
<goal>analyze-report</goal>
382-
<goal>sources</goal>
383-
<goal>resolve</goal>
384-
<goal>resolve-plugins</goal>
385-
<goal>collect</goal>
386-
<goal>copy-dependencies</goal>
387-
<goal>unpack-dependencies</goal>
388-
<goal>build-classpath</goal>
389-
</goals>
390-
<configuration>
391-
<overWriteReleases>true</overWriteReleases>
392-
<overWriteSnapshots>true</overWriteSnapshots>
393-
<outputFile>${project.build.outputDirectory}/classpath.txt</outputFile>
394-
<failOnWarning>false</failOnWarning>
395-
<ignoredDependencies>
396-
<ignoredDependency>org.apache.maven.plugins:maven-surefire-plugin</ignoredDependency>
397-
<!--
398-
<ignoredDependency>org.apache.maven.scm:maven-scm</ignoredDependency>
399-
<ignoredDependency>org.apache.maven.scm:maven-scm-providers-git</ignoredDependency>
400-
<ignoredDependency>org.apache.maven.scm:maven-scm-providers-standard</ignoredDependency>
401-
<ignoredDependency>org.apache.maven.scm:maven-scm-providers</ignoredDependency>
402-
<ignoredDependency>org.apache.maven.scm:maven-scm-managers</ignoredDependency>
403-
-->
404-
</ignoredDependencies>
405-
<ignoredUsedUndeclaredDependencies>
406-
<ignoredUsedUndeclaredDependency>org.apache.maven.plugins:maven-surefire-plugin</ignoredUsedUndeclaredDependency>
407-
</ignoredUsedUndeclaredDependencies>
408-
<ignoredUnusedDeclaredDependencies>
409-
<ignoredUnusedDeclaredDependency>org.apache.maven.plugins:maven-surefire-plugin</ignoredUnusedDeclaredDependency>
410-
</ignoredUnusedDeclaredDependencies>
411-
</configuration>
412-
</execution>
413-
<execution>
414-
<id>check-dependencies1</id>
415-
<phase>verify</phase>
416-
<goals>
417-
<goal>list</goal>
418-
<goal>list-repositories</goal>
419-
<goal>properties</goal>
420-
</goals>
421-
</execution>
422-
<execution>
423-
<id>check-dependencies2</id>
424-
<phase>verify</phase>
425-
<goals>
426-
<goal>analyze</goal>
427-
<goal>analyze-dep-mgt</goal>
428-
<goal>analyze-duplicate</goal>
429-
<goal>analyze-report</goal>
430-
</goals>
431-
</execution>
432-
<execution>
433-
<id>check-dependencies3</id>
434-
<phase>verify</phase>
435-
<goals>
436-
<goal>tree</goal>
437-
</goals>
438-
</execution>
439-
<execution>
440-
<id>report</id>
441-
<phase>site</phase>
442-
<configuration>
443-
<excludeGroupIds>org.webjars,org.jclouds,org.jboss.as,xml-resolver,commons-configuration,org.codehaus.plexus,commons-digester,junit,log4j,io.openliberty.features</excludeGroupIds>
444-
<excludeArtifactIds>weld-probe-core,commons-configuration,jdk.tools,maven-antrun-plugin</excludeArtifactIds>
445-
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
446-
<reportSets>
447-
<reportSet>
448-
<reports>
449-
<report>analyze-report</report>
450-
</reports>
451-
</reportSet>
452-
</reportSets>
453-
</configuration>
454-
</execution>
455-
<execution>
456-
<id>get-dependency-sources</id>
457-
<phase>prepare-package</phase>
458-
<goals>
459-
<goal>sources</goal>
460-
<goal>resolve</goal>
461-
<goal>resolve-plugins</goal>
462-
<goal>collect</goal>
463-
<goal>copy-dependencies</goal>
464-
<goal>unpack-dependencies</goal>
465-
</goals>
466-
<configuration>
467-
<classifier>sources</classifier>
468-
<excludeGroupIds>org.webjars</excludeGroupIds>
469-
<excludeArtifactIds>weld-probe-core</excludeArtifactIds>
470-
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
471-
<outputDirectory>${project.build.directory}/dependencies/</outputDirectory>
472-
</configuration>
473-
</execution>
474-
</executions>
475-
</plugin>
476467
<plugin>
477468
<groupId>org.apache.maven.plugins</groupId>
478469
<artifactId>maven-surefire-plugin</artifactId>

‎setenv-sample.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ export MAIL_SMTP_USERNAME='mailuser'
77
export MAIL_SMTP_PASSWORD='mailuserpassword'
88
export MAIL_FROM='noreply@example.org'
99
export MAIL_URL_APP_HOST='localhost:5000'
10+
export JPA_DLL_AUTO='update'
11+
#export JPA_DLL_AUTO='create-drop'

‎system.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
java.runtime.version=1.8
1+
java.runtime.version=1.8

0 commit comments

Comments
 (0)