Implemented renderScripts

ao-apps · Sep 27, 2023 · 6c53802 · 6c53802
1 parent c49a9af
commit 6c53802
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/book/pom.xml b/book/pom.xml
@@ -29,7 +29,7 @@ along with ao-fluent-html-util.  If not, see <https://www.gnu.org/licenses/>.
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
-  <groupId>com.aoapps</groupId><artifactId>ao-fluent-html-util-book</artifactId><version>0.7.0-POST-SNAPSHOT</version>
+  <groupId>com.aoapps</groupId><artifactId>ao-fluent-html-util-book</artifactId><version>0.8.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <properties>
@@ -204,7 +204,7 @@ along with ao-fluent-html-util.  If not, see <https://www.gnu.org/licenses/>.
         <groupId>com.aoapps</groupId><artifactId>ao-fluent-html</artifactId><version>0.7.0${POST-SNAPSHOT}</version>
       </dependency>
       <dependency>
-        <groupId>com.aoapps</groupId><artifactId>ao-fluent-html-any</artifactId><version>0.7.0${POST-SNAPSHOT}</version>
+        <groupId>com.aoapps</groupId><artifactId>ao-fluent-html-any</artifactId><version>0.8.0-SNAPSHOT<!-- ${POST-SNAPSHOT} --></version>
       </dependency>
       <dependency>
         <groupId>com.aoapps</groupId><artifactId>ao-fluent-html-servlet</artifactId><version>0.7.0${POST-SNAPSHOT}</version>
@@ -243,7 +243,7 @@ along with ao-fluent-html-util.  If not, see <https://www.gnu.org/licenses/>.
         <groupId>com.aoapps</groupId><artifactId>ao-tlds</artifactId><version>2.0.0${POST-SNAPSHOT}</version>
       </dependency>
       <dependency>
-        <groupId>com.aoapps</groupId><artifactId>ao-web-resources-registry</artifactId><version>0.4.0${POST-SNAPSHOT}</version>
+        <groupId>com.aoapps</groupId><artifactId>ao-web-resources-registry</artifactId><version>0.6.0-SNAPSHOT<!-- ${POST-SNAPSHOT} --></version>
       </dependency>
       <dependency>
         <groupId>com.aoapps</groupId><artifactId>ao-web-resources-servlet</artifactId><version>0.5.0${POST-SNAPSHOT}</version>
@@ -261,7 +261,7 @@ along with ao-fluent-html-util.  If not, see <https://www.gnu.org/licenses/>.
         <groupId>com.semanticcms</groupId><artifactId>semanticcms-core-model</artifactId><version>1.14.1${POST-SNAPSHOT}</version>
       </dependency>
       <dependency>
-        <groupId>com.semanticcms</groupId><artifactId>semanticcms-core-servlet</artifactId><version>1.19.1${POST-SNAPSHOT}</version>
+        <groupId>com.semanticcms</groupId><artifactId>semanticcms-core-servlet</artifactId><version>1.20.0-SNAPSHOT<!-- ${POST-SNAPSHOT} --></version>
       </dependency>
       <dependency>
         <groupId>com.semanticcms</groupId><artifactId>semanticcms-news-model</artifactId><version>1.3.0${POST-SNAPSHOT}</version>

diff --git a/book/src/main/resources-filtered/META-INF/resources/fluent-html/util/changelog.jspx b/book/src/main/resources-filtered/META-INF/resources/fluent-html/util/changelog.jspx
@@ -37,7 +37,7 @@ along with ao-fluent-html-util.  If not, see <https://www.gnu.org/licenses/>.
     shortTitle="Changelog"
     tocLevels="1"
     datePublished="2021-03-15T13:05:48-05:00"
-    dateModified="2022-05-15T02:24:41-05:00"
+    dateModified="2023-09-26T19:00:16Z"
   >
     <c:set var="latestRelease" value="0.7.0" />
     <c:if test="${
@@ -52,7 +52,11 @@ along with ao-fluent-html-util.  If not, see <https://www.gnu.org/licenses/>.
         artifactId="@{documented.artifactId}"
         repository="@{nexusUrl}content/repositories/snapshots/"
         scmUrl="@{project.scm.url}"
-      />
+      >
+        <ul>
+          <li>Updated dependencies.</li>
+        </ul>
+      </changelog:release>
     </c:if>
 
     <changelog:release

diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@ along with ao-fluent-html-util.  If not, see <https://www.gnu.org/licenses/>.
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
-  <groupId>com.aoapps</groupId><artifactId>ao-fluent-html-util</artifactId><version>0.7.0-POST-SNAPSHOT</version>
+  <groupId>com.aoapps</groupId><artifactId>ao-fluent-html-util</artifactId><version>0.8.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <properties>
@@ -188,7 +188,7 @@ along with ao-fluent-html-util.  If not, see <https://www.gnu.org/licenses/>.
         <groupId>com.aoapps</groupId><artifactId>ao-encoding</artifactId><version>7.0.0${POST-SNAPSHOT}</version>
       </dependency>
       <dependency>
-        <groupId>com.aoapps</groupId><artifactId>ao-fluent-html-any</artifactId><version>0.7.0${POST-SNAPSHOT}</version>
+        <groupId>com.aoapps</groupId><artifactId>ao-fluent-html-any</artifactId><version>0.8.0-SNAPSHOT<!-- ${POST-SNAPSHOT} --></version>
       </dependency>
       <dependency>
         <groupId>com.aoapps</groupId><artifactId>ao-lang</artifactId><version>5.5.1${POST-SNAPSHOT}</version>

diff --git a/src/main/java/com/aoapps/html/util/GoogleAnalytics.java b/src/main/java/com/aoapps/html/util/GoogleAnalytics.java
@@ -27,6 +27,7 @@
 import com.aoapps.html.any.AnyLINK;
 import com.aoapps.html.any.AnyScriptSupportingContent;
 import com.aoapps.html.any.AnyUnion_Metadata_Phrasing;
+import com.aoapps.html.any.attributes.enumeration.Crossorigin;
 import com.aoapps.lang.Strings;
 import java.io.IOException;
 import java.net.URLEncoder;
@@ -58,7 +59,7 @@ public static void writeGlobalSiteTag(AnyUnion_Metadata_Phrasing<?, ?> content,
       // See https://blog.luke.lol/webmaster/optimize-google-analytics-google-tag-manager-via-preconnect-headers/
       content
           .link(AnyLINK.Rel.DNS_PREFETCH).href("https://www.google-analytics.com/").__()
-          .link(AnyLINK.Rel.PRECONNECT).href("https://www.google-analytics.com/").crossorigin(AnyLINK.Crossorigin.ANONYMOUS).__()
+          .link(AnyLINK.Rel.PRECONNECT).href("https://www.google-analytics.com/").crossorigin(Crossorigin.Value.ANONYMOUS).__()
           // .out.write("<!-- Google tag (gtag.js) -->").autoNl()
           .script().async(true).src("https://www.googletagmanager.com/gtag/js?id=" + URLEncoder.encode(trimmedId, StandardCharsets.UTF_8)).__()
           .script().out(script -> script.indent()