Skip to content

Commit 5ce046e

Browse files
thomaswoehlkethomaswoehlke
authored
Merge pull request #347 from Spring-Framework-Java-Apps/heroku-deployment
Heroku deployment
2 parents 5351e57 + 555b147 commit 5ce046e

File tree

8 files changed

+78
-25
lines changed

8 files changed

+78
-25
lines changed

‎pom.xml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.woehlke</groupId>
66
<artifactId>simpleworklist</artifactId>
7-
<version>2.3.55-SNAPSHOT</version>
7+
<version>2.3.56-SNAPSHOT</version>
88
<packaging>jar</packaging>
99

1010
<parent>
@@ -403,6 +403,7 @@
403403
<groupId>org.jsoup</groupId>
404404
<artifactId>jsoup</artifactId>
405405
<version>${jsoup.version}</version>
406+
<scope>test</scope>
406407
</dependency>
407408

408409
<!-- SCM -->
@@ -672,11 +673,13 @@
672673
<dependency>
673674
<groupId>org.springframework.boot</groupId>
674675
<artifactId>spring-boot-devtools</artifactId>
676+
<scope>provided</scope>
675677
<optional>true</optional>
676678
</dependency>
677679
<dependency>
678680
<groupId>org.springframework.boot</groupId>
679681
<artifactId>spring-boot-configuration-processor</artifactId>
682+
<scope>provided</scope>
680683
<optional>true</optional>
681684
</dependency>
682685
<!-- spring-boot-starter -->
@@ -735,10 +738,12 @@
735738
<groupId>org.springframework.boot</groupId>
736739
<artifactId>spring-boot-starter-logging</artifactId>
737740
</dependency>
741+
<!--
738742
<dependency>
739743
<groupId>org.springframework.boot</groupId>
740744
<artifactId>spring-boot-starter-cache</artifactId>
741745
</dependency>
746+
-->
742747
<!-- org.springframework -->
743748
<dependency>
744749
<groupId>org.springframework</groupId>
@@ -892,6 +897,7 @@
892897
<dependency>
893898
<groupId>org.jsoup</groupId>
894899
<artifactId>jsoup</artifactId>
900+
<scope>test</scope>
895901
</dependency>
896902

897903
<!-- scope test - without dependency-management in this pom.xml -->
@@ -974,7 +980,6 @@
974980
<dependency>
975981
<groupId>org.apache.commons</groupId>
976982
<artifactId>commons-collections4</artifactId>
977-
<version>4.3</version>
978983
<scope>provided</scope>
979984
</dependency>
980985
<dependency>
@@ -1573,8 +1578,10 @@
15731578
<goal>resolve</goal>
15741579
<goal>resolve-plugins</goal>
15751580
<goal>collect</goal>
1581+
<!--
15761582
<goal>copy-dependencies</goal>
15771583
<goal>unpack-dependencies</goal>
1584+
-->
15781585
</goals>
15791586
<configuration>
15801587
<classifier>sources</classifier>
@@ -1583,8 +1590,10 @@
15831590
</excludeGroupIds>
15841591
<excludeArtifactIds>weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api
15851592
</excludeArtifactIds>
1593+
<!--
15861594
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
15871595
<outputDirectory>${project.build.directory}/dependency-sources/</outputDirectory>
1596+
-->
15881597
</configuration>
15891598
</execution>
15901599
</executions>

‎src/main/resources/templates/project/id/edit.html

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ <h1>
4040
</div>
4141
</div>
4242
</div>
43-
<div class="form-group">
43+
<div class="form-group">
4444
<label th:for="${#ids.next('context.id')}" class="control-label">
4545
<span th:utext="#{project.edit.context}">context</span>
4646
</label>
@@ -53,8 +53,16 @@ <h1>
5353
<div th:each="err : ${#fields.errors('context.id')}"
5454
th:text="${err}" class="alert alert-danger"></div>
5555
</div>
56+
</div>
57+
<div class="row my-3">
58+
<div class="col">
59+
<a th:href="@{/project/{projectId}(projectId=${thisProject.id})}"
60+
class="btn btn-secondary btn-block" role="button">
61+
<i class="fas fa-angle-double-left"></i>
62+
<span th:utext="#{task.show.button.close}">cancel and back</span>
63+
</a>
5664
</div>
57-
<div class="form-group">
65+
<div class="col">
5866
<input type="hidden" th:field="*{id}" />
5967
<button id="saveEditedProject" type="submit" class="btn btn-primary">
6068
<i class="fas fa-save"></i>
@@ -64,6 +72,7 @@ <h1>
6472
name="${_csrf.parameterName}"
6573
value="${_csrf.token}"/>
6674
</div>
75+
</div>
6776
</form>
6877
</div>
6978
<!-- Document Window End -->

‎src/main/resources/templates/project/id/project/add.html

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,21 @@ <h1>
2121
<form id="formId" class="was-validated" method="post"
2222
th:action="@{/project/{id}/project/add(id=${thisProject.id})}" th:object="${project}">
2323
<div th:replace="layout/project :: tw-project-form(project=${project},contexts=${contexts})"></div>
24-
<div class="form-row">
25-
<div class="col-md-12 mb-12">
26-
<button id="createNewProject" type="submit" class="btn btn-block btn-primary">
27-
<i class="fas fa-save"></i>
28-
<span th:utext="#{project.add.button}">Add Project</span>
29-
</button>
30-
</div>
24+
<div class="row my-3">
25+
<div class="col">
26+
<a th:href="@{/project/{projectId}(projectId=${thisProject.id})}"
27+
class="btn btn-secondary btn-block" role="button">
28+
<i class="fas fa-angle-double-left"></i>
29+
<span th:utext="#{task.show.button.close}">cancel and back</span>
30+
</a>
31+
</div>
32+
<div class="col">
33+
<button id="createNewProject" type="submit" class="btn btn-block btn-primary">
34+
<i class="fas fa-save"></i>
35+
<span th:utext="#{project.add.button}">Add Project</span>
36+
</button>
3137
</div>
38+
</div>
3239
</form>
3340
</div>
3441

‎src/main/resources/templates/project/id/task/add.html

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,21 @@ <h1>
2121
<form id="formId" class="was-validated" method="post"
2222
th:action="@{/project/{projectId}/task/add(projectId=${thisProject.id})}" th:object="${task}">
2323
<div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
24-
<div class="form-row">
25-
<div class="col-md-12 mb-12">
24+
<div class="row my-3">
25+
<div class="col">
26+
<a th:href="@{/project/{projectId}(projectId=${thisProject.id})}"
27+
class="btn btn-secondary btn-block" role="button">
28+
<i class="fas fa-angle-double-left"></i>
29+
<span th:utext="#{task.show.button.close}">cancel and back</span>
30+
</a>
31+
</div>
32+
<div class="col">
2633
<button id="createNewTask" type="submit" class="btn btn-block btn-primary">
2734
<i class="fas fa-save"></i>
2835
<span th:utext="#{task.add.button}">Add Task</span>
2936
</button>
30-
</div>
3137
</div>
38+
</div>
3239
</form>
3340
</div>
3441

‎src/main/resources/templates/project/root/project/add.html

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,21 @@ <h1>
2121
<form id="formId" class="was-validated" method="post"
2222
th:action="@{/project/root/project/add}" th:object="${project}">
2323
<div th:replace="layout/project :: tw-project-form(project=${project},contexts=${contexts})"></div>
24-
<div class="form-row">
25-
<div class="col-md-12 mb-12">
26-
<button id="createNewProject" type="submit" class="btn btn-block btn-primary">
27-
<i class="fas fa-save"></i>
28-
<span th:utext="#{project.add.button}">Add Project</span>
29-
</button>
30-
</div>
24+
<div class="row my-3">
25+
<div class="col">
26+
<a th:href="@{/project/root}"
27+
class="btn btn-secondary btn-block" role="button">
28+
<i class="fas fa-angle-double-left"></i>
29+
<span th:utext="#{task.show.button.close}">cancel and back</span>
30+
</a>
3131
</div>
32+
<div class="col">
33+
<button id="createNewProject" type="submit" class="btn btn-block btn-primary">
34+
<i class="fas fa-save"></i>
35+
<span th:utext="#{project.add.button}">Add Project</span>
36+
</button>
37+
</div>
38+
</div>
3239
</form>
3340
</div>
3441

‎src/main/resources/templates/project/root/task/add.html

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,21 @@ <h1>
2121
<form id="formId" class="was-validated" method="post"
2222
th:action="@{/project/root/task/add/}" th:object="${task}">
2323
<div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
24-
<div class="form-row">
25-
<div class="col-md-12 mb-12">
24+
<div class="row my-3">
25+
<div class="col">
26+
<a th:href="@{/project/root}"
27+
class="btn btn-secondary btn-block" role="button">
28+
<i class="fas fa-angle-double-left"></i>
29+
<span th:utext="#{task.show.button.close}">cancel and back</span>
30+
</a>
31+
</div>
32+
<div class="col">
2633
<button id="createNewTask" type="submit" class="btn btn-block btn-primary">
2734
<i class="fas fa-save"></i>
2835
<span th:utext="#{task.add.button}">Add Task</span>
2936
</button>
30-
</div>
3137
</div>
38+
</div>
3239
</form>
3340
</div>
3441

‎src/main/resources/templates/taskstate/task/add.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ <h1>
2121
<form id="formId" class="was-validated"
2222
th:action="@{/taskstate/task/add}" th:object="${task}" method="post">
2323
<div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
24+
<div class="col">
25+
<a th:href="@{/taskstate/{workflowCode}(workflowCode=${userSession.lastTaskState.getType()})}"
26+
class="btn btn-secondary btn-block" role="button">
27+
<i class="fas fa-angle-double-left"></i>
28+
<span th:utext="#{task.show.button.close}">cancel and back</span>
29+
</a>
30+
</div>
2431
<div class="form-row">
2532
<div class="col-md-12 mb-12">
2633
<button id="createNewTask" type="submit" class="btn btn-block btn-primary">

‎system.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
java.runtime.version=11
2-
maven.version=3.6.2
2+
maven.version=3.6.3

0 commit comments

Comments
 (0)