From 7b04714eb42046fde3f9b1578883f5e83de31d13 Mon Sep 17 00:00:00 2001 From: "Dr. Martin Goik" <goik@hdm-stuttgart.de> Date: Sat, 4 Jan 2020 09:42:48 +0100 Subject: [PATCH] MathJax support --- Klausuren/Sd1/2018winter/Exam/pom.xml | 4 +-- Klausuren/Sd1/2018winter/Solve/pom.xml | 6 ++--- P/Sd1/fraction/V05/pom.xml | 13 +++++----- P/Sd1/fraction/V1/pom.xml | 13 +++++----- P/Sd1/fraction/V2/pom.xml | 13 +++++----- P/Sd1/interest/V1/pom.xml | 12 ++++----- P/Sd1/interest/V2/pom.xml | 11 ++++---- P/Sd1/math/V1/pom.xml | 6 ++--- P/Sd1/math/V2/pom.xml | 13 +++++----- P/Sd1/math/V3/pom.xml | 13 +++++----- P/Sd1/math/V4/pom.xml | 11 ++++---- pom.xml | 14 +++++----- ws/eclipse/Jdbc/pom.xml | 36 +------------------------- 13 files changed, 69 insertions(+), 96 deletions(-) diff --git a/Klausuren/Sd1/2018winter/Exam/pom.xml b/Klausuren/Sd1/2018winter/Exam/pom.xml index cbab63b6d..4e33c8c6b 100644 --- a/Klausuren/Sd1/2018winter/Exam/pom.xml +++ b/Klausuren/Sd1/2018winter/Exam/pom.xml @@ -13,6 +13,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <mathjax.home><![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></mathjax.home> </properties> <repositories> @@ -69,8 +70,7 @@ <version>3.1.0</version> <configuration> <additionalOptions> - <additionalOption>-html5 --allow-script-in-comments -header - <![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></additionalOption> + <additionalOption>-html5 --allow-script-in-comments -header ${mathjax.home}</additionalOption> </additionalOptions> <javaApiLinks> <property> diff --git a/Klausuren/Sd1/2018winter/Solve/pom.xml b/Klausuren/Sd1/2018winter/Solve/pom.xml index 9d337c467..4a7e773c0 100644 --- a/Klausuren/Sd1/2018winter/Solve/pom.xml +++ b/Klausuren/Sd1/2018winter/Solve/pom.xml @@ -13,6 +13,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <mathjax.home><![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></mathjax.home> </properties> <repositories> @@ -69,8 +70,7 @@ <version>3.1.0</version> <configuration> <additionalOptions> - <additionalOption>-html5 --allow-script-in-comments -header - <![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></additionalOption> + <additionalOption>-html5 --allow-script-in-comments -header ${mathjax.home}</additionalOption> </additionalOptions> <javaApiLinks> @@ -117,4 +117,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/P/Sd1/fraction/V05/pom.xml b/P/Sd1/fraction/V05/pom.xml index bdd9c8b63..f54ceffe6 100644 --- a/P/Sd1/fraction/V05/pom.xml +++ b/P/Sd1/fraction/V05/pom.xml @@ -12,6 +12,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <mathjax.home><![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></mathjax.home> </properties> <repositories> @@ -42,22 +43,22 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.0.1</version> + <version>3.1.0</version> <configuration> <linksource>true</linksource> <additionalOptions> - <additionalOption>-html5 --allow-script-in-comments -header - <![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></additionalOption> + <additionalOption>-html5 --allow-script-in-comments -header ${mathjax.home}</additionalOption> </additionalOptions> - </configuration> + <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>3.7.0</version> <configuration> - <source>1.8</source> - <target>1.8</target> + <source>11</source> + <target>11</target> </configuration> </plugin> </plugins> diff --git a/P/Sd1/fraction/V1/pom.xml b/P/Sd1/fraction/V1/pom.xml index 00e2167d0..7b413f9e8 100644 --- a/P/Sd1/fraction/V1/pom.xml +++ b/P/Sd1/fraction/V1/pom.xml @@ -11,6 +11,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <mathjax.home><![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></mathjax.home> </properties> <repositories> @@ -41,22 +42,22 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.0.1</version> + <version>3.1.0</version> <configuration> <linksource>true</linksource> <additionalOptions> - <additionalOption>-html5 --allow-script-in-comments -header - <![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></additionalOption> + <additionalOption>-html5 --allow-script-in-comments -header ${mathjax.home}</additionalOption> </additionalOptions> + <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.7.0</version> + <version>3.8.1</version> <configuration> - <source>1.8</source> - <target>1.8</target> + <source>11</source> + <target>11</target> </configuration> </plugin> diff --git a/P/Sd1/fraction/V2/pom.xml b/P/Sd1/fraction/V2/pom.xml index 92b83b69b..4f3dfc5ca 100644 --- a/P/Sd1/fraction/V2/pom.xml +++ b/P/Sd1/fraction/V2/pom.xml @@ -12,6 +12,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <mathjax.home><![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></mathjax.home> </properties> <repositories> @@ -48,22 +49,22 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.0.1</version> + <version>3.1.0</version> <configuration> <linksource>true</linksource> <additionalOptions> - <additionalOption>-html5 --allow-script-in-comments -header - <![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></additionalOption> + <additionalOption>-html5 --allow-script-in-comments -header ${mathjax.home}</additionalOption> </additionalOptions> + <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.7.0</version> + <version>3.8.1</version> <configuration> - <source>1.8</source> - <target>1.8</target> + <source>11</source> + <target>11</target> </configuration> </plugin> </plugins> diff --git a/P/Sd1/interest/V1/pom.xml b/P/Sd1/interest/V1/pom.xml index 596c3120f..d7585058a 100644 --- a/P/Sd1/interest/V1/pom.xml +++ b/P/Sd1/interest/V1/pom.xml @@ -11,6 +11,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <mathjax.home><![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></mathjax.home> </properties> <repositories> @@ -41,14 +42,13 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.0.1</version> + <version>3.1.0</version> <configuration> <linksource>true</linksource> <additionalOptions> - <additionalOption>--allow-script-in-comments</additionalOption> - <additionalOption>-html5 --allow-script-in-comments -header - <![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></additionalOption> + <additionalOption>-html5 --allow-script-in-comments -header ${mathjax.home}</additionalOption> </additionalOptions> + <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable> </configuration> </plugin> <plugin> @@ -56,8 +56,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.7.0</version> <configuration> - <source>1.8</source> - <target>1.8</target> + <source>11</source> + <target>11</target> </configuration> </plugin> </plugins> diff --git a/P/Sd1/interest/V2/pom.xml b/P/Sd1/interest/V2/pom.xml index 06eda2714..fe60bd13f 100644 --- a/P/Sd1/interest/V2/pom.xml +++ b/P/Sd1/interest/V2/pom.xml @@ -11,6 +11,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <mathjax.home><![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></mathjax.home> </properties> <repositories> @@ -41,14 +42,14 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.0.1</version> + <version>3.1.0</version> <configuration> <linksource>true</linksource> <additionalOptions> <additionalOption>--allow-script-in-comments</additionalOption> - <additionalOption>-html5 --allow-script-in-comments -header - <![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></additionalOption> + <additionalOption>-html5 --allow-script-in-comments -header ${mathjax.home}</additionalOption> </additionalOptions> + <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable> </configuration> </plugin> <plugin> @@ -56,8 +57,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.7.0</version> <configuration> - <source>1.8</source> - <target>1.8</target> + <source>11</source> + <target>11</target> </configuration> </plugin> </plugins> diff --git a/P/Sd1/math/V1/pom.xml b/P/Sd1/math/V1/pom.xml index b2ef8b669..5c17cef3d 100644 --- a/P/Sd1/math/V1/pom.xml +++ b/P/Sd1/math/V1/pom.xml @@ -11,6 +11,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <mathjax.home><![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></mathjax.home> </properties> <repositories> @@ -45,8 +46,7 @@ <configuration> <linksource>true</linksource> <additionalOptions> - <additionalOption>-html5 --allow-script-in-comments -header - <![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></additionalOption> + <additionalOption>-html5 --allow-script-in-comments -header ${mathjax.home}</additionalOption> </additionalOptions> <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable> </configuration> @@ -54,7 +54,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.7.0</version> + <version>3.8.1</version> <configuration> <source>11</source> <target>11</target> diff --git a/P/Sd1/math/V2/pom.xml b/P/Sd1/math/V2/pom.xml index 2ace241ae..2b9d0189c 100644 --- a/P/Sd1/math/V2/pom.xml +++ b/P/Sd1/math/V2/pom.xml @@ -11,6 +11,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <mathjax.home><![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></mathjax.home> </properties> <repositories> @@ -41,22 +42,22 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.0.1</version> + <version>3.1.0</version> <configuration> <linksource>true</linksource> <additionalOptions> - <additionalOption>-html5 --allow-script-in-comments -header - <![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></additionalOption> + <additionalOption>-html5 --allow-script-in-comments -header ${mathjax.home}</additionalOption> </additionalOptions> + <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.7.0</version> + <version>3.8.1</version> <configuration> - <source>1.8</source> - <target>1.8</target> + <source>11</source> + <target>11</target> </configuration> </plugin> diff --git a/P/Sd1/math/V3/pom.xml b/P/Sd1/math/V3/pom.xml index 8ea86aabd..6ccab9064 100644 --- a/P/Sd1/math/V3/pom.xml +++ b/P/Sd1/math/V3/pom.xml @@ -11,6 +11,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <mathjax.home><![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></mathjax.home> </properties> <repositories> @@ -41,22 +42,22 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.0.1</version> + <version>3.1.0</version> <configuration> <linksource>true</linksource> <additionalOptions> - <additionalOption>-html5 --allow-script-in-comments -header - <![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></additionalOption> + <additionalOption>-html5 --allow-script-in-comments -header ${mathjax.home}</additionalOption> </additionalOptions> + <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.7.0</version> + <version>3.8.1</version> <configuration> - <source>1.8</source> - <target>1.8</target> + <source>11</source> + <target>11</target> </configuration> </plugin> diff --git a/P/Sd1/math/V4/pom.xml b/P/Sd1/math/V4/pom.xml index 6d1497fce..5ac48a511 100644 --- a/P/Sd1/math/V4/pom.xml +++ b/P/Sd1/math/V4/pom.xml @@ -11,6 +11,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <mathjax.home><![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></mathjax.home> </properties> <repositories> @@ -41,13 +42,13 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.0.1</version> + <version>3.1.0</version> <configuration> <linksource>true</linksource> <additionalOptions> - <additionalOption>-html5 --allow-script-in-comments -header - <![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></additionalOption> + <additionalOption>-html5 --allow-script-in-comments -header ${mathjax.home}</additionalOption> </additionalOptions> + <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable> </configuration> </plugin> <plugin> @@ -55,8 +56,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.7.0</version> <configuration> - <source>1.8</source> - <target>1.8</target> + <source>11</source> + <target>11</target> </configuration> </plugin> diff --git a/pom.xml b/pom.xml index dc0de86e3..37f61a03d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,6 +6,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <mathjax.home><![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></mathjax.home> <!-- dependencies --> <jaxen.jaxen.version>1.1.6</jaxen.jaxen.version> @@ -35,24 +36,23 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>3.8.1</version> <configuration> - <source>1.8</source> - <target>1.8</target> + <source>11</source> + <target>11</target> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.0.1</version> + <version>3.1.0</version> <configuration> <linksource>true</linksource> <additionalOptions> - <additionalOption>--allow-script-in-comments</additionalOption> - <additionalOption>-html5 --allow-script-in-comments -header - <![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></additionalOption> + <additionalOption>-html5 --allow-script-in-comments -header ${mathjax.home}</additionalOption> </additionalOptions> + <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable> </configuration> </plugin> diff --git a/ws/eclipse/Jdbc/pom.xml b/ws/eclipse/Jdbc/pom.xml index 44072457c..5ee97d40f 100644 --- a/ws/eclipse/Jdbc/pom.xml +++ b/ws/eclipse/Jdbc/pom.xml @@ -52,38 +52,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.4</version> - <configuration> - <linksource>true</linksource> - <additionalparam>--allow-script-in-comments -header <![CDATA['<script type="text/javascript" src="https://freedocs.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>']]></additionalparam> - <taglets> - <taglet> - <tagletClass>de.hdm_stuttgart.sd1.taglet.HtmlExtensionTaglet</tagletClass> - <tagletArtifact> - <groupId>de.hdm-stuttgart.sd1</groupId> - <artifactId>taglet</artifactId> - <version>1.2</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.7.0</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin> - - </plugins> - </build> - -</project> \ No newline at end of file +</project> -- GitLab