Heroku deployment

.mvn/wrapper/maven-wrapper.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.2/apache-maven-3.6.2-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>org.woehlke</groupId>
   <artifactId>simpleworklist</artifactId>
-  <version>2.3.55-SNAPSHOT</version>
+  <version>2.3.56-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
@@ -72,7 +72,7 @@
 
   <properties>
     <java.version>11</java.version>
-    <version.maven>3.6.2</version.maven>
+    <version.maven>3.6.3</version.maven>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <spring-boot.repackage.layout>JAR</spring-boot.repackage.layout>
@@ -403,6 +403,7 @@
         <groupId>org.jsoup</groupId>
         <artifactId>jsoup</artifactId>
         <version>${jsoup.version}</version>
+        <scope>test</scope>
       </dependency>
 
       <!-- SCM -->
@@ -672,11 +673,13 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-devtools</artifactId>
+      <scope>provided</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-configuration-processor</artifactId>
+      <scope>provided</scope>
       <optional>true</optional>
     </dependency>
     <!-- spring-boot-starter -->
@@ -735,10 +738,12 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-logging</artifactId>
     </dependency>
+    <!--
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-cache</artifactId>
     </dependency>
+    -->
     <!-- org.springframework -->
     <dependency>
       <groupId>org.springframework</groupId>
@@ -892,6 +897,7 @@
     <dependency>
       <groupId>org.jsoup</groupId>
       <artifactId>jsoup</artifactId>
+      <scope>test</scope>
     </dependency>
 
     <!-- scope test - without dependency-management in this pom.xml -->
@@ -974,7 +980,6 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-collections4</artifactId>
-      <version>4.3</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -1573,8 +1578,10 @@
               <goal>resolve</goal>
               <goal>resolve-plugins</goal>
               <goal>collect</goal>
+              <!--
               <goal>copy-dependencies</goal>
               <goal>unpack-dependencies</goal>
+              -->
             </goals>
             <configuration>
               <classifier>sources</classifier>
@@ -1583,8 +1590,10 @@
               </excludeGroupIds>
               <excludeArtifactIds>weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api
               </excludeArtifactIds>
+              <!--
               <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
               <outputDirectory>${project.build.directory}/dependency-sources/</outputDirectory>
+              -->
             </configuration>
           </execution>
         </executions>

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

@@ -40,7 +40,7 @@ <h1>
 					</div>
 				</div>
 			</div>
-            <div class="form-group">
+      <div class="form-group">
                 <label th:for="${#ids.next('context.id')}" class="control-label">
                     <span th:utext="#{project.edit.context}">context</span>
                 </label>
@@ -53,8 +53,16 @@ <h1>
                     <div th:each="err : ${#fields.errors('context.id')}"
                          th:text="${err}" class="alert alert-danger"></div>
                 </div>
+      </div>
+        <div class="row my-3">
+          <div class="col">
+              <a th:href="@{/project/{projectId}(projectId=${thisProject.id})}"
+                 class="btn btn-secondary btn-block" role="button">
+                <i class="fas fa-angle-double-left"></i>
+                <span th:utext="#{task.show.button.close}">cancel and back</span>
+              </a>
             </div>
-            <div class="form-group">
+            <div class="col">
                 <input type="hidden" th:field="*{id}" />
                 <button id="saveEditedProject" type="submit" class="btn btn-primary">
                     <i class="fas fa-save"></i>
@@ -64,6 +72,7 @@ <h1>
                        name="${_csrf.parameterName}"
                        value="${_csrf.token}"/>
             </div>
+        </div>
 		</form>
 	</div>
 	<!-- Document Window End -->

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

@@ -21,14 +21,21 @@ <h1>
     <form id="formId" class="was-validated" method="post"
           th:action="@{/project/{id}/project/add(id=${thisProject.id})}" th:object="${project}">
         <div th:replace="layout/project :: tw-project-form(project=${project},contexts=${contexts})"></div>
-        <div class="form-row">
-            <div class="col-md-12 mb-12">
-                <button id="createNewProject" type="submit" class="btn btn-block btn-primary">
-                    <i class="fas fa-save"></i>
-                    <span th:utext="#{project.add.button}">Add Project</span>
-                </button>
-            </div>
+      <div class="row my-3">
+        <div class="col">
+        <a th:href="@{/project/{projectId}(projectId=${thisProject.id})}"
+           class="btn btn-secondary btn-block" role="button">
+          <i class="fas fa-angle-double-left"></i>
+          <span th:utext="#{task.show.button.close}">cancel and back</span>
+        </a>
+      </div>
+        <div class="col">
+            <button id="createNewProject" type="submit" class="btn btn-block btn-primary">
+                <i class="fas fa-save"></i>
+                <span th:utext="#{project.add.button}">Add Project</span>
+            </button>
         </div>
+      </div>
     </form>
 </div>
 

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

@@ -21,14 +21,21 @@ <h1>
 	<form id="formId" class="was-validated" method="post"
           th:action="@{/project/{projectId}/task/add(projectId=${thisProject.id})}" th:object="${task}">
         <div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
-        <div class="form-row">
-            <div class="col-md-12 mb-12">
+    <div class="row my-3">
+      <div class="col">
+          <a th:href="@{/project/{projectId}(projectId=${thisProject.id})}"
+             class="btn btn-secondary btn-block" role="button">
+            <i class="fas fa-angle-double-left"></i>
+            <span th:utext="#{task.show.button.close}">cancel and back</span>
+          </a>
+        </div>
+        <div class="col">
                 <button id="createNewTask" type="submit" class="btn btn-block btn-primary">
                     <i class="fas fa-save"></i>
                     <span th:utext="#{task.add.button}">Add Task</span>
                 </button>
-            </div>
         </div>
+    </div>
 	</form>
 </div>
 

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

@@ -21,14 +21,21 @@ <h1>
     <form id="formId" class="was-validated" method="post"
           th:action="@{/project/root/project/add}" th:object="${project}">
         <div th:replace="layout/project :: tw-project-form(project=${project},contexts=${contexts})"></div>
-        <div class="form-row">
-            <div class="col-md-12 mb-12">
-                <button id="createNewProject" type="submit" class="btn btn-block btn-primary">
-                    <i class="fas fa-save"></i>
-                    <span th:utext="#{project.add.button}">Add Project</span>
-                </button>
-            </div>
+      <div class="row my-3">
+        <div class="col">
+          <a th:href="@{/project/root}"
+             class="btn btn-secondary btn-block" role="button">
+            <i class="fas fa-angle-double-left"></i>
+            <span th:utext="#{task.show.button.close}">cancel and back</span>
+          </a>
         </div>
+        <div class="col">
+            <button id="createNewProject" type="submit" class="btn btn-block btn-primary">
+                <i class="fas fa-save"></i>
+                <span th:utext="#{project.add.button}">Add Project</span>
+            </button>
+        </div>
+      </div>
     </form>
 </div>
 

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

@@ -21,14 +21,21 @@ <h1>
 	<form id="formId" class="was-validated" method="post"
           th:action="@{/project/root/task/add/}" th:object="${task}">
         <div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
-        <div class="form-row">
-            <div class="col-md-12 mb-12">
+    <div class="row my-3">
+      <div class="col">
+          <a th:href="@{/project/root}"
+             class="btn btn-secondary btn-block" role="button">
+            <i class="fas fa-angle-double-left"></i>
+            <span th:utext="#{task.show.button.close}">cancel and back</span>
+          </a>
+        </div>
+        <div class="col">
                 <button id="createNewTask" type="submit" class="btn btn-block btn-primary">
                     <i class="fas fa-save"></i>
                     <span th:utext="#{task.add.button}">Add Task</span>
                 </button>
-            </div>
         </div>
+    </div>
 	</form>
 </div>
 

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

@@ -21,6 +21,13 @@ <h1>
 	<form id="formId" class="was-validated"
           th:action="@{/taskstate/task/add}" th:object="${task}" method="post">
         <div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
+        <div class="col">
+          <a th:href="@{/taskstate/{workflowCode}(workflowCode=${userSession.lastTaskState.getType()})}"
+             class="btn btn-secondary btn-block" role="button">
+            <i class="fas fa-angle-double-left"></i>
+            <span th:utext="#{task.show.button.close}">cancel and back</span>
+          </a>
+        </div>
         <div class="form-row">
             <div class="col-md-12 mb-12">
                 <button id="createNewTask" type="submit" class="btn btn-block btn-primary">

system.properties

@@ -1,2 +1,2 @@
 java.runtime.version=11
-maven.version=3.6.2
+maven.version=3.6.3