Update Trellis URL to use https

acoburn · acoburn · commit 2806049f8843 · 2017-12-23T11:09:19.000-05:00
diff --git a/build.gradle b/build.gradle
@@ -72,6 +72,9 @@ subprojects {
         mustacheVersion = '0.9.5_1'
         slf4jVersion = '1.7.25'
 
+        /* Transitive dependencies (for Karaf provisioning) */
+        guavaVersion = '20.0' // mustache 0.9.5
+
         /* Testing */
         apiguardianVersion = '1.0.0'
         commonsTextVersion = '1.2'
diff --git a/trellis-http/src/main/resources/org/trellisldp/http/resource.mustache b/trellis-http/src/main/resources/org/trellisldp/http/resource.mustache
@@ -3,8 +3,8 @@
     <head>
       <title>{{title}}</title>
       <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-      <link rel="icon" href="//s3.amazonaws.com/www.trellisldp.org/assets/img/trellis.png"/>
-      <link rel="stylesheet" type="text/css" href="//s3.amazonaws.com/www.trellisldp.org/assets/css/trellis.css"/>
+      <link rel="icon" href="https://www.trellisldp.org/assets/img/trellis.png"/>
+      <link rel="stylesheet" type="text/css" href="https://www.trellisldp.org/assets/css/trellis.css"/>
       <style >
       </style>
     </head>
@@ -23,6 +23,6 @@
       </p>
       {{/triples}}
       </main>
-      <footer><a href="http://www.trellisldp.org">Trellis Linked Data Server</a></footer>
+      <footer><a href="https://www.trellisldp.org">Trellis Linked Data Server</a></footer>
     </body>
 </html>
diff --git a/trellis-io-jena/src/main/resources/org/trellisldp/io/resource.mustache b/trellis-io-jena/src/main/resources/org/trellisldp/io/resource.mustache
@@ -25,7 +25,7 @@
       </p>
       {{/triples}}
       </main>
-      <footer><a href="http://www.trellisldp.org">Trellis Linked Data Server</a></footer>
+      <footer><a href="https://www.trellisldp.org">Trellis Linked Data Server</a></footer>
       {{#js}}
       <script src="{{.}}"></script>
       {{/js}}
diff --git a/trellis-io-jena/src/test/resources/resource-test.mustache b/trellis-io-jena/src/test/resources/resource-test.mustache
@@ -25,7 +25,7 @@
       </p>
       {{/triples}}
       </main>
-      <footer><a href="http://www.trellisldp.org">Trellis Linked Data Server</a></footer>
+      <footer><a href="https://www.trellisldp.org">Trellis Linked Data Server</a></footer>
       {{#js}}
       <script src="{{.}}"></script>
       {{/js}}
diff --git a/trellis-karaf/src/main/resources/features.xml b/trellis-karaf/src/main/resources/features.xml
@@ -106,6 +106,9 @@
     <feature>trellis-api</feature>
     <feature>trellis-vocabulary</feature>
 
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mustache-compiler/${mustacheVersion}</bundle>
+    <bundle dependency="true">mvn:com.google.guava/guava/${guavaVersion}</bundle>
+
     <bundle>mvn:org.trellisldp/trellis-io-jena/${project.version}</bundle>
   </feature>
 
@@ -146,13 +149,12 @@
     <feature version="${jenaVersionRange}">jena</feature>
 
     <bundle dependency="true">mvn:org.apache.commons/commons-rdf-api/${commonsRdfVersion}</bundle>
-    <bundle dependency="true">mvn:org.apache.commons/commons-rdf-jena/${commonsRdfVersion}</bundle>
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mustache-compiler/${mustacheVersion}</bundle>
+    <!-- commons-rdf-jena depends on commons-rdf-simple -->
+    <bundle dependency="true">mvn:org.apache.commons/commons-rdf-simple/${commonsRdfVersion}</bundle>
 
     <!-- transitively required by jena -->
     <bundle dependency="true">wrap:mvn:com.google.errorprone/error_prone_annotations/2.1.1</bundle>
 
-
     <bundle dependency="true">mvn:org.apache.commons/commons-rdf-api/${commonsRdfVersion}</bundle>
     <bundle>mvn:org.apache.commons/commons-rdf-jena/${commonsRdfVersion}</bundle>
   </feature>
diff --git a/trellis-vocabulary/README.md b/trellis-vocabulary/README.md
@@ -20,7 +20,7 @@ The following vocabularies are defined in this package:
   * `RDF` and `RDFS`: [RDF Schema 1.1](https://www.w3.org/TR/rdf-schema/) (W3C)
   * `SKOS`: [Simple Knowledge Organization System](https://www.w3.org/2009/08/skos-reference/skos.html) (W3C)
   * `Time`: [OWL-Time](https://www.w3.org/TR/owl-time/) (W3C)
-  * `Trellis`: [Trellis Vocabulary](http://www.trellisldp.org/ns/trellis)
+  * `Trellis`: [Trellis Vocabulary](https://www.trellisldp.org/ns/trellis.html)
   * `VCARD`: [vCard Ontology](https://www.w3.org/TR/vcard-rdf) (W3C)
   * `XSD`: [XML Schema](https://www.w3.org/TR/xmlschema-2/) (W3C)
 
diff --git a/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/Trellis.java b/trellis-vocabulary/src/main/java/org/trellisldp/vocabulary/Trellis.java
@@ -18,7 +18,7 @@
 /**
  * RDF Terms from the trellis vocabulary.
  *
- * @see <a href="http://www.trellisldp.org/ns/trellis">Trellis vocabulary</a>
+ * @see <a href="https://www.trellisldp.org/ns/trellis.html">Trellis vocabulary</a>
  *
  * @author acoburn
  */

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`/**`
`19`	`19`	`* RDF Terms from the trellis vocabulary.`
`20`	`20`	`*`
`21`		`- * @see <a href="http://www.trellisldp.org/ns/trellis">Trellis vocabulary</a>`
	`21`	`+ * @see <a href="https://www.trellisldp.org/ns/trellis.html">Trellis vocabulary</a>`
`22`	`22`	`*`
`23`	`23`	`* @author acoburn`
`24`	`24`	`*/`