This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new e1de3d2 [OPENMEETINGS-2640] maven-javadoc-plugin, font-awesome
e1de3d2 is described below
commit e1de3d2229bb0da304c6a3e809639ac914342a39
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Wed Sep 8 15:34:16 2021 +0700
[OPENMEETINGS-2640] maven-javadoc-plugin, font-awesome
---
pom.xml | 76 ++++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 40 insertions(+), 36 deletions(-)
diff --git a/pom.xml b/pom.xml
index f5306e2..75d32f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
<autoModuleName>apache.openmeetings.parent</autoModuleName>
<jdk.version>11</jdk.version>
<!-- plugin versions -->
-
<maven-javadoc-plugin.version>3.3.0</maven-javadoc-plugin.version>
+
<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<maven-site-plugin.version>3.9.1</maven-site-plugin.version>
<exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
@@ -84,7 +84,7 @@
<wicket-jquery-ui.version>9.3.2</wicket-jquery-ui.version>
<wicketstuff.version>9.4.0</wicketstuff.version>
<wicket-bootstrap.version>6.0.0-M4-SNAPSHOT</wicket-bootstrap.version>
- <font-awesome.version>5.15.3</font-awesome.version>
+ <font-awesome.version>5.15.4</font-awesome.version>
<spring.version>5.3.9</spring.version>
<tomcat.version>9.0.52</tomcat.version>
<ical4j.version>3.0.21</ical4j.version>
@@ -1060,13 +1060,6 @@
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
-
<groupId>io.github.devacfr.maven.skins</groupId>
-
<artifactId>reflow-velocity-tools</artifactId>
-
<version>${reflow-maven-skin.version}</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -1139,33 +1132,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
-
<version>${maven-checkstyle-plugin.version}</version>
- <configuration>
- <checkstyleRules>
- <module name = "Checker">
- <property
name="fileExtensions" value="java,js,css,xml"/>
- <module
name="NewlineAtEndOfFile">
- <property
name="fileExtensions" value="java"/>
- </module>
- <module
name="TreeWalker">
- <module
name="UnusedImports"></module>
- <module
name="RegexpSinglelineJava">
-
<property name="format" value="^\t* "/>
-
<property name="message" value="Indent must use tab characters"/>
-
<property name="ignoreComments" value="true"/>
- </module>
- </module>
- <module
name="RegexpSingleline">
- <property
name="format" value="\s+$"/>
- <property
name="message" value="Line has trailing spaces."/>
- </module>
- </module>
- </checkstyleRules>
-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
- <encoding>UTF-8</encoding>
- <consoleOutput>true</consoleOutput>
- <failsOnError>true</failsOnError>
- </configuration>
<executions>
<execution>
<goals>
@@ -1227,6 +1193,37 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-checkstyle-plugin</artifactId>
+
<version>${maven-checkstyle-plugin.version}</version>
+ <configuration>
+ <checkstyleRules>
+ <module name =
"Checker">
+ <property
name="fileExtensions" value="java,js,css,xml"/>
+ <module
name="NewlineAtEndOfFile">
+
<property name="fileExtensions" value="java"/>
+ </module>
+ <module
name="TreeWalker">
+ <module
name="UnusedImports"></module>
+ <module
name="RegexpSinglelineJava">
+
<property name="format" value="^\t* "/>
+
<property name="message" value="Indent must use tab characters"/>
+
<property name="ignoreComments" value="true"/>
+
</module>
+ </module>
+ <module
name="RegexpSingleline">
+
<property name="format" value="\s+$"/>
+
<property name="message" value="Line has trailing spaces."/>
+ </module>
+ </module>
+ </checkstyleRules>
+
<includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <encoding>UTF-8</encoding>
+
<consoleOutput>true</consoleOutput>
+
<failsOnError>true</failsOnError>
+ </configuration>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven-assembly-plugin.version}</version>
</plugin>
@@ -1239,6 +1236,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${maven-site-plugin.version}</version>
+ <dependencies>
+ <dependency>
+
<groupId>io.github.devacfr.maven.skins</groupId>
+
<artifactId>reflow-velocity-tools</artifactId>
+
<version>${reflow-maven-skin.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
