Merge branch 'main' of https://github.com/common-workflow-language/cwlviewer into fix-queued-workflow-delete

Author: obasekiosa

.github/dependabot.yml

@@ -0,0 +1,21 @@
+version: 2
+updates:
+- package-ecosystem: maven
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: org.springframework.boot:spring-boot-starter-parent
+    versions:
+    - "> 1.5.22.RELEASE"
+  - dependency-name: com.fasterxml.jackson.core:jackson-core
+    versions:
+    - 2.12.1
+    - 2.12.2
+  - dependency-name: org.eclipse.jgit:org.eclipse.jgit
+    versions:
+    - 5.10.0.202012080955-r
+  - dependency-name: org.apache.jena:jena-osgi
+    versions:
+    - 3.17.0

pom.xml

@@ -23,10 +23,10 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<jena.version>3.15.0</jena.version>
+		<jena.version>4.0.0</jena.version>
 		<!-- BEGIN should correspond to https://repo1.maven.org/maven2/org/apache/jena/jena/3.9.0/jena-3.9.0.pom -->
-		<ver.jsonldjava>0.13.0</ver.jsonldjava>
-		<ver.jackson>2.11.1</ver.jackson>
+		<ver.jsonldjava>0.13.3</ver.jsonldjava>
+		<ver.jackson>2.12.3</ver.jackson>
 		<!-- END -->
 	</properties>
 
@@ -70,7 +70,7 @@
 		<dependency>
 			<groupId>org.yaml</groupId>
 			<artifactId>snakeyaml</artifactId>
-			<version>1.26</version>
+			<version>1.28</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.jabbalaci</groupId>
@@ -106,7 +106,7 @@
 		<dependency>
 			<groupId>org.eclipse.jgit</groupId>
 			<artifactId>org.eclipse.jgit</artifactId>
-			<version>5.8.0.202006091008-r</version>
+			<version>5.11.0.202103091610-r</version>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
@@ -117,7 +117,7 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-compress</artifactId>
-			<version>1.19</version>
+			<version>1.20</version>
 		</dependency>
 	</dependencies>
 

src/main/resources/templates/workflows.html

@@ -71,12 +71,12 @@ <h3>Showing results for "<span th:text="${search}">query</span>" <a href="/workf
                                         <p><i th:text="${workflow.doc}">Description</i></p>
                                     </td>
                                     <td>
-                                        <a th:href="@{${workflow.retrievedFrom.getUrl()}}" rel="noopener" target="_blank">
+                                        <a th:href="@{${workflow.retrievedFrom.repoUrl}}" rel="noopener" target="_blank">
                                             <img th:if="${workflow.retrievedFrom.getType().name() == 'GITHUB'}" id="gitLogo" src="../static/img/GitHub-Mark-32px.png" th:src="@{/img/GitHub-Mark-32px.png}" width="20" height="20" />
                                             <img th:unless="${workflow.retrievedFrom.getType().name() == 'GITHUB'}" id="gitLogo" src="../static/img/gitlogo.png" th:src="@{/img/gitlogo.png}" width="24" height="24" />
                                             <span th:text="@{${workflow.retrievedFrom.repoUrl}}">https://github.com/test/test2/repo.git</span>
                                         </a>
-                                        <p th:if="${workflow.retrievedFrom.path != null}">Path: <i th:text="${workflow.retrievedFrom.path}">/path/to/workflow.cwl</i></p>
+                                        <p th:if="${workflow.retrievedFrom.path != null}">Path:  <a th:href="@{${workflow.retrievedFrom.getUrl()}}" rel="noopener" target="_blank"><i th:text="${workflow.retrievedFrom.path}">/path/to/workflow.cwl</i></a></p>
                                         <p>Branch/Commit ID: <i th:text="${workflow.retrievedFrom.branch}">master</i></p>
                                         <p th:if="${workflow.retrievedFrom.packedId != null}">Packed ID: <i th:text="${workflow.retrievedFrom.packedId}">#main</i></p>
                                     </td>