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 6b15ae4 [OPENMEETINGS-2640] slf4j tika, mysql, plugins
6b15ae4 is described below
commit 6b15ae4598ddb946c6851b5fe15824eac1f9f365
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Sat Jul 24 00:08:34 2021 +0700
[OPENMEETINGS-2640] slf4j tika, mysql, plugins
---
openmeetings-core/pom.xml | 14 -
openmeetings-db/pom.xml | 33 +-
openmeetings-install/pom.xml | 5 +-
openmeetings-server/pom.xml | 1 -
openmeetings-service/pom.xml | 10 -
openmeetings-util/pom.xml | 7 +-
.../org/apache/openmeetings/util/StoredFile.java | 2 +-
.../openmeetings/util/crypt/CryptProvider.java | 3 -
openmeetings-web/pom.xml | 70 ----
pom.xml | 448 +++++++++++++++++++--
.../license/THIRD-PARTY.properties | 3 +-
src/license/license-template.ftl | 93 +++++
12 files changed, 518 insertions(+), 171 deletions(-)
diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index 01d7b75..145b416 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -64,38 +64,26 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
- <version>${commons-collections4.version}</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>${xstream.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
- <version>${wicket.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-ioc</artifactId>
- <version>${wicket.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-all</artifactId>
- <version>${api-all.version}</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
- <version>${javax.mail.version}</version>
</dependency>
<dependency>
<groupId>org.jodconverter</groupId>
@@ -104,7 +92,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.kurento</groupId>
@@ -122,7 +109,6 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openmeetings</groupId>
diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml
index a6b710b..9e754e4 100644
--- a/openmeetings-db/pom.xml
+++ b/openmeetings-db/pom.xml
@@ -42,22 +42,18 @@
<!-- required for JAXB/CXF -->
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>2.3.3</version>
</dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-datastore-hazelcast</artifactId>
- <version>${wicketstuff.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>${openjpa.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -70,48 +66,30 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>${commons-dbcp.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
- <version>${commons-pool2.version}</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>${h2.version}</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>${postgresql.version}</version>
</dependency>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
- <version>${mssql.version}</version>
</dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc10</artifactId>
- <version>${ojdbc.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openmeetings</groupId>
@@ -126,7 +104,6 @@
<plugin>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>${openjpa.version}</version>
<configuration>
<includes>**/entity/**/*.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
@@ -142,14 +119,6 @@
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
-
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <!-- set the version to be the
same as the level in your runtime -->
-
<version>${openjpa.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
diff --git a/openmeetings-install/pom.xml b/openmeetings-install/pom.xml
index c6c3577..f843164 100644
--- a/openmeetings-install/pom.xml
+++ b/openmeetings-install/pom.xml
@@ -43,13 +43,16 @@
<artifactId>spring-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-core</artifactId>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>${commons-cli.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openmeetings</groupId>
diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index 9aaf6d4..05c25c3 100644
--- a/openmeetings-server/pom.xml
+++ b/openmeetings-server/pom.xml
@@ -152,7 +152,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>${exec-maven-plugin.version}</version>
<executions>
<execution>
<id>generate-configs-xml-site</id>
diff --git a/openmeetings-service/pom.xml b/openmeetings-service/pom.xml
index 43ab501..0646134 100644
--- a/openmeetings-service/pom.xml
+++ b/openmeetings-service/pom.xml
@@ -41,12 +41,10 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
- <version>${wicket.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-spring</artifactId>
- <version>${wicket.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -55,14 +53,6 @@
<dependency>
<groupId>com.github.caldav4j</groupId>
<artifactId>caldav4j</artifactId>
- <version>${caldav4j.version}</version>
- <exclusions>
- <exclusion>
- <!-- Remove the need for ehcache, since
we use the Methods directly -->
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml
index 5ac31ed..7e1d250 100644
--- a/openmeetings-util/pom.xml
+++ b/openmeetings-util/pom.xml
@@ -79,7 +79,6 @@
<dependency>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
- <version>${dom4j.version}</version>
</dependency>
<dependency>
<groupId>org.mnode.ical4j</groupId>
@@ -96,22 +95,18 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${commons-codec.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-util</artifactId>
- <version>${wicket.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket-core</artifactId>
- <version>${wicket.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
@@ -131,7 +126,7 @@
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parsers</artifactId>
+ <artifactId>tika-parsers-standard-package</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java
index 7ad48f3..2b83e28 100644
---
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java
+++
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java
@@ -21,7 +21,7 @@ package org.apache.openmeetings.util;
import static org.apache.openmeetings.util.OmFileHelper.FILE_NAME_FMT;
import static org.apache.openmeetings.util.OmFileHelper.PNG_MIME_TYPE;
import static org.apache.openmeetings.util.OmFileHelper.getFileExt;
-import static org.apache.tika.metadata.TikaMetadataKeys.RESOURCE_NAME_KEY;
+import static org.apache.tika.metadata.TikaCoreProperties.RESOURCE_NAME_KEY;
import static org.apache.tika.mime.MediaType.application;
import java.io.File;
diff --git
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/CryptProvider.java
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/CryptProvider.java
index d0046ab..a89b0af 100644
---
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/CryptProvider.java
+++
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/CryptProvider.java
@@ -23,9 +23,6 @@ import static
org.apache.openmeetings.util.OpenmeetingsVariables.getCryptClassNa
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.jcip.annotations.ThreadSafe;
-
-@ThreadSafe
public class CryptProvider {
private static final Logger log =
LoggerFactory.getLogger(CryptProvider.class);
private static ICrypt crypt;
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 28124ad..bcfd548 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -46,7 +46,6 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>${mysql.version}</version>
</dependency>
</dependencies>
</profile>
@@ -187,14 +186,6 @@
<plugin>
<groupId>com.samaxes.maven</groupId>
<artifactId>minify-maven-plugin</artifactId>
-
<version>${minify-maven-plugin.version}</version>
- <dependencies>
- <dependency>
-
<groupId>com.google.javascript</groupId>
-
<artifactId>closure-compiler</artifactId>
- <version>v20170521</version>
- </dependency>
- </dependencies>
<executions>
<execution>
<id>theme-minify</id>
@@ -482,32 +473,6 @@
</configuration>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.jetty</groupId>
-
<artifactId>jetty-maven-plugin</artifactId>
- <version>${jetty.version}</version>
- <configuration>
- <systemProperties>
- <systemProperty>
-
<name>current_openmeetings_log_dir</name>
-
<value>${project.build.directory}</value>
- </systemProperty>
- <systemProperty>
-
<name>maven.project.build.directory.test-classes</name>
-
<value>${project.basedir}/src/test/resources</value>
- </systemProperty>
- </systemProperties>
- <webApp>
-
<contextPath>/openmeetings</contextPath>
-
<descriptor>${project.basedir}/src/test/jetty/web.xml</descriptor>
- </webApp>
-
<jettyXml>${project.basedir}/src/test/jetty/jetty.xml,${project.basedir}/src/test/jetty/jetty-ssl.xml,${project.basedir}/src/test/jetty/jetty-http.xml,${project.basedir}/src/test/jetty/jetty-https.xml</jettyXml>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<dependencies>
<dependency>
@@ -537,13 +502,6 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jasny-bootstrap</artifactId>
- <version>${jasny-bootstrap.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.webjars</groupId>
- <artifactId>bootstrap</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -556,72 +514,58 @@
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-dashboard-core</artifactId>
- <version>${wicketstuff.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-auth-roles</artifactId>
- <version>${wicket.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket-javax</artifactId>
- <version>${wicket.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-devutils</artifactId>
- <version>${wicket.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui-core</artifactId>
- <version>${wicket-jquery-ui.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui</artifactId>
- <version>${wicket-jquery-ui.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui-calendar</artifactId>
- <version>${wicket-jquery-ui.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui-plugins</artifactId>
- <version>${wicket-jquery-ui.version}</version>
</dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-urlfragment</artifactId>
- <version>${wicketstuff.version}</version>
</dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-select2</artifactId>
- <version>${wicketstuff.version}</version>
</dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>jqplot</artifactId>
- <version>${wicketstuff.version}</version>
</dependency>
<dependency>
<groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-extensions</artifactId>
- <version>${wicket-bootstrap.version}</version>
</dependency>
<dependency>
<groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-themes</artifactId>
- <version>${wicket-bootstrap.version}</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>font-awesome</artifactId>
- <version>${font-awesome.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -638,7 +582,6 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery-ui-touch-punch</artifactId>
- <version>0.2.3-2</version>
</dependency>
<!-- Test dependencies -->
<dependency>
@@ -667,35 +610,22 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-websocket</artifactId>
- <version>${tomcat.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-test-framework</artifactId>
- <version>2.0.0.AM26</version>
- <exclusions>
- <exclusion>
-
<groupId>org.apache.directory.api</groupId>
-
<artifactId>api-ldap-schema-data</artifactId>
- </exclusion>
- </exclusions>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index e54af59..5e0ab35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,13 +45,13 @@
<maven-javadoc-plugin.version>3.3.0</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>1.6.0</exec-maven-plugin.version>
+ <exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
<minify-maven-plugin.version>1.7.6</minify-maven-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
<maven-source-plugin.version>3.2.0</maven-source-plugin.version>
-
<checksum-maven-plugin.version>1.8</checksum-maven-plugin.version>
+
<checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
-
<license-maven-plugin.version>1.16</license-maven-plugin.version>
+
<license-maven-plugin.version>2.0.0</license-maven-plugin.version>
<reflow-maven-skin.version>2.3.0</reflow-maven-skin.version>
<reflow-theme>cerulean</reflow-theme>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
@@ -106,16 +106,16 @@
<commons-codec.version>1.15</commons-codec.version>
<commons-io.version>2.11.0</commons-io.version>
<postgresql.version>42.2.23</postgresql.version>
- <mysql.version>8.0.25</mysql.version>
+ <mysql.version>8.0.26</mysql.version>
<mssql.version>9.2.1.jre11</mssql.version>
<ojdbc.version>19.11.0.0</ojdbc.version>
<commons-collections4.version>4.4</commons-collections4.version>
<xstream.version>1.4.17</xstream.version>
<api-all.version>2.1.0</api-all.version>
<caldav4j.version>1.0.1</caldav4j.version>
- <tika-parsers.version>1.27</tika-parsers.version>
+ <tika-parsers.version>2.0.0</tika-parsers.version>
<commons-text.version>1.9</commons-text.version>
- <slf4j.version>1.7.31</slf4j.version>
+ <slf4j.version>1.7.32</slf4j.version>
<logback.version>1.2.3</logback.version>
<jetty.version>9.4.43.v20210629</jetty.version>
<license.excludedScopes>test</license.excludedScopes>
@@ -126,6 +126,9 @@
<jain-sip.version>1.2.307</jain-sip.version><!-- other versions
are broken! -->
<jasny-bootstrap.version>3.1.3-2</jasny-bootstrap.version>
<jodconverter.version>4.4.2</jodconverter.version>
+ <jaxb-runtime.version>2.3.3</jaxb-runtime.version>
+
<jquery-ui-touch-punch.version>0.2.3-2</jquery-ui-touch-punch.version>
+
<apacheds-test-framework.version>2.0.0.AM26</apacheds-test-framework.version>
<!-- Exclude all generated code -->
<sonar.exclusions>file:**/generated-sources/**,
file:**/jquery-ui.css, file:**/cssemoticons.js,
file:**/bootstrap-confirmation.js</sonar.exclusions>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -515,6 +518,21 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.mnode.ical4j</groupId>
<artifactId>ical4j</artifactId>
<version>${ical4j.version}</version>
@@ -606,14 +624,48 @@
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+
<artifactId>wicket-native-websocket-core</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-ioc</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
<version>${wicket.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
-
<artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-auth-roles</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+
<artifactId>wicket-native-websocket-javax</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-devutils</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-spring</artifactId>
+ <version>${wicket.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -653,14 +705,10 @@
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parsers</artifactId>
+
<artifactId>tika-parsers-standard-package</artifactId>
<version>${tika-parsers.version}</version>
<exclusions>
<exclusion>
- <groupId>org.slf4j</groupId>
-
<artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
@@ -668,10 +716,6 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
- <exclusion>
-
<groupId>org.glassfish.jaxb</groupId>
-
<artifactId>jaxb-runtime</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -701,6 +745,199 @@
<version>${jain-sip.version}</version>
</dependency>
<dependency>
+ <!-- required for JAXB/CXF -->
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>jquery-ui-touch-punch</artifactId>
+
<version>${jquery-ui-touch-punch.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+
<version>${commons-collections4.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>${xstream.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-all</artifactId>
+ <version>${api-all.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+
<artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ <version>${javax.mail.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>${dom4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons-codec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wicketstuff</groupId>
+
<artifactId>wicketstuff-datastore-hazelcast</artifactId>
+ <version>${wicketstuff.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>${openjpa.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-dbcp2</artifactId>
+ <version>${commons-dbcp.version}</version>
+ <exclusions>
+ <exclusion>
+
<groupId>commons-logging</groupId>
+
<artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ <version>${commons-pool2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${h2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>${postgresql.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>mssql-jdbc</artifactId>
+ <version>${mssql.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.oracle.database.jdbc</groupId>
+ <artifactId>ojdbc10</artifactId>
+ <version>${ojdbc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>${commons-cli.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.caldav4j</groupId>
+ <artifactId>caldav4j</artifactId>
+ <version>${caldav4j.version}</version>
+ <exclusions>
+ <exclusion>
+ <!-- Remove the need for
ehcache, since we use the Methods directly -->
+
<groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${mysql.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>jasny-bootstrap</artifactId>
+ <version>${jasny-bootstrap.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.webjars</groupId>
+
<artifactId>bootstrap</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.wicketstuff</groupId>
+
<artifactId>wicketstuff-dashboard-core</artifactId>
+ <version>${wicketstuff.version}</version>
+ </dependency>
+ <dependency>
+
<groupId>com.googlecode.wicket-jquery-ui</groupId>
+ <artifactId>wicket-jquery-ui-core</artifactId>
+ <version>${wicket-jquery-ui.version}</version>
+ </dependency>
+ <dependency>
+
<groupId>com.googlecode.wicket-jquery-ui</groupId>
+ <artifactId>wicket-jquery-ui</artifactId>
+ <version>${wicket-jquery-ui.version}</version>
+ </dependency>
+ <dependency>
+
<groupId>com.googlecode.wicket-jquery-ui</groupId>
+
<artifactId>wicket-jquery-ui-calendar</artifactId>
+ <version>${wicket-jquery-ui.version}</version>
+ </dependency>
+ <dependency>
+
<groupId>com.googlecode.wicket-jquery-ui</groupId>
+
<artifactId>wicket-jquery-ui-plugins</artifactId>
+ <version>${wicket-jquery-ui.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-urlfragment</artifactId>
+ <version>${wicketstuff.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-select2</artifactId>
+ <version>${wicketstuff.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>jqplot</artifactId>
+ <version>${wicketstuff.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>de.agilecoders.wicket</groupId>
+
<artifactId>wicket-bootstrap-extensions</artifactId>
+ <version>${wicket-bootstrap.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>de.agilecoders.wicket</groupId>
+ <artifactId>wicket-bootstrap-themes</artifactId>
+ <version>${wicket-bootstrap.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>font-awesome</artifactId>
+ <version>${font-awesome.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <version>${quartz.version}</version>
+ </dependency>
+
+ <!-- TESTS -->
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
@@ -718,6 +955,24 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-test-framework</artifactId>
+
<version>${apacheds-test-framework.version}</version>
+ <exclusions>
+ <exclusion>
+
<groupId>org.apache.directory.api</groupId>
+
<artifactId>api-ldap-schema-data</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-websocket</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
@@ -1177,6 +1432,146 @@
<installDirectory>${project.build.directory}</installDirectory>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.openjpa</groupId>
+
<artifactId>openjpa-maven-plugin</artifactId>
+ <version>${openjpa.version}</version>
+ <dependencies>
+ <dependency>
+
<groupId>org.apache.openjpa</groupId>
+
<artifactId>openjpa</artifactId>
+ <!-- set the version to
be the same as the level in your runtime -->
+
<version>${openjpa.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+
<artifactId>exec-maven-plugin</artifactId>
+
<version>${exec-maven-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>com.samaxes.maven</groupId>
+
<artifactId>minify-maven-plugin</artifactId>
+
<version>${minify-maven-plugin.version}</version>
+ <dependencies>
+ <dependency>
+
<groupId>com.google.javascript</groupId>
+
<artifactId>closure-compiler</artifactId>
+
<version>v20170521</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.jetty</groupId>
+
<artifactId>jetty-maven-plugin</artifactId>
+ <version>${jetty.version}</version>
+ <configuration>
+ <systemProperties>
+ <systemProperty>
+
<name>current_openmeetings_log_dir</name>
+
<value>${project.build.directory}</value>
+ </systemProperty>
+ <systemProperty>
+
<name>maven.project.build.directory.test-classes</name>
+
<value>${project.basedir}/src/test/resources</value>
+ </systemProperty>
+ </systemProperties>
+ <webApp>
+
<contextPath>/openmeetings</contextPath>
+
<descriptor>${project.basedir}/src/test/jetty/web.xml</descriptor>
+ </webApp>
+
<jettyXml>${project.basedir}/src/test/jetty/jetty.xml,${project.basedir}/src/test/jetty/jetty-ssl.xml,${project.basedir}/src/test/jetty/jetty-http.xml,${project.basedir}/src/test/jetty/jetty-https.xml</jettyXml>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+
<artifactId>license-maven-plugin</artifactId>
+
<version>${license-maven-plugin.version}</version>
+ <configuration>
+
<outputDirectory>${project.build.directory}</outputDirectory>
+
<excludedScopes>test,provided</excludedScopes>
+
<useMissingFile>true</useMissingFile>
+
<fileTemplate>${project.basedir}/src/license/license-template.ftl</fileTemplate>
+ <licenseMerges>
+ <licenseMerge>
+ Apache License
Version 2.0|
+ The Apache
Software License, Version 2.0|
+ Apache 2.0|
+ ASF 2.0|
+ Apache License
2.0|
+ Apache License
v2.0|
+ Apache 2.0
License|
+ Apache License
v2|
+ The Apache
License, Version 2.0|
+ Apache License,
Version 2.0|
+ Apache Software
Licenses|
+ Apache License,
Version 2.0 and
+ Common Development And Distribution License (CDDL) Version 1.0|
+
http://www.apache.org/licenses/LICENSE-2.0.txt
+ </licenseMerge>
+ <licenseMerge>
+ Eclipse Public
License - v 1.0|
+ MPL 2.0 or EPL
1.0
+ </licenseMerge>
+ <licenseMerge>
+ Eclipse Public
License - v 2.0|
+ EPL 2.0
+ </licenseMerge>
+ <licenseMerge>
+ Eclipse
Distribution License - v 1.0|
+ EDL 1.0
+ </licenseMerge>
+ <licenseMerge>
+ MIT License|
+ The MIT License|
+ MIT
+ </licenseMerge>
+ <licenseMerge>
+ Common
Development and Distribution License (CDDL) v1.0|
+ CDDL/GPLv2+CE|
+ CDDL + GPLv2
with classpath exception|
+ CDDL, v1.0
+ </licenseMerge>
+ <licenseMerge>
+ BSD License|
+ BSD license|
+ BSD|
+ The BSD License
+ </licenseMerge>
+ <licenseMerge>
+ BSD 3-Clause|
+ BSD-3-Clause|
+ iCal4j -
License|
+ The BSD
3-Clause License (BSD3)|
+ BSD 3-clause
License w/nuclear disclaimer|
+ BSD 3-clause
New License
+ </licenseMerge>
+ </licenseMerges>
+ <verbose>false</verbose>
+ </configuration>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-gpg-plugin</artifactId>
+
<version>${maven-gpg-plugin.version}</version>
+ </plugin>
+ <plugin>
+
<groupId>net.nicoulaj.maven.plugins</groupId>
+
<artifactId>checksum-maven-plugin</artifactId>
+
<version>${checksum-maven-plugin.version}</version>
+ <configuration>
+
<shasumSummary>true</shasumSummary>
+ <algorithms>
+
<algorithm>SHA-512</algorithm>
+ </algorithms>
+ </configuration>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-source-plugin</artifactId>
+
<version>${maven-source-plugin.version}</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -1291,7 +1686,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
-
<version>${maven-source-plugin.version}</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -1316,7 +1710,6 @@
<plugin>
<groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
-
<version>${checksum-maven-plugin.version}</version>
<executions>
<execution>
<goals>
@@ -1324,16 +1717,10 @@
</goals>
</execution>
</executions>
- <configuration>
-
<shasumSummary>true</shasumSummary>
- <algorithms>
-
<algorithm>SHA-512</algorithm>
- </algorithms>
- </configuration>
</plugin>
<plugin>
+
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
-
<version>${maven-gpg-plugin.version}</version>
<executions>
<execution>
<id>sign-artifacts</id>
@@ -1367,7 +1754,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
-
<version>${license-maven-plugin.version}</version>
<executions>
<execution>
<id>download-licenses</id>
diff --git a/THIRD-PARTY.properties b/src/license/THIRD-PARTY.properties
similarity index 82%
rename from THIRD-PARTY.properties
rename to src/license/THIRD-PARTY.properties
index f69aac4..c2f4ed8 100644
--- a/THIRD-PARTY.properties
+++ b/src/license/THIRD-PARTY.properties
@@ -9,6 +9,5 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-jaxen--jaxen--1.1.6=The Apache Software License, Version 2.0
-org.apache.xbean--xbean-asm5-shaded--3.17=The Apache Software License, Version
2.0
+org.apache.xbean--xbean-asm8-shaded--4.17=The Apache Software License, Version
2.0
diff --git a/src/license/license-template.ftl b/src/license/license-template.ftl
new file mode 100644
index 0000000..4e3e209
--- /dev/null
+++ b/src/license/license-template.ftl
@@ -0,0 +1,93 @@
+<#--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<#--
+ #%L
+ License Maven Plugin
+ %%
+ Copyright (C) 2012 Codehaus, Tony Chemit
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Lesser Public License for more details.
+
+ You should have received a copy of the GNU General Lesser Public
+ License along with this program. If not, see
+ <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ #L%
+-->
+
+<#-- Format artifact "name (groupId:artifactId:version - url)" -->
+<#function artifactFormat artifact>
+ <#if artifact.name?index_of('Unnamed') > -1>
+ <#return artifact.artifactId + " (" + artifact.groupId + ":" +
artifact.artifactId + ":" + artifact.version + " - " + (artifact.url!"no url
defined") + ")">
+ <#else>
+ <#return artifact.name + " (" + artifact.groupId + ":" +
artifact.artifactId + ":" + artifact.version + " - " + (artifact.url!"no url
defined") + ")">
+ </#if>
+</#function>
+
+<#-- Create a key from provided licenses list, ordered alphabetically:
"license A, license B, license C" -->
+<#function licensesKey licenses>
+ <#local result = "">
+ <#list licenses?sort as license>
+ <#if license?contains("Apache License, Version 2.0")><#return "Apache
License Version 2.0"></#if><#-- FIXME TODO overriding mapping-->
+ <#if license?lower_case?contains("apache")><#return license></#if>
+ <#if license?contains("Eclipse Public License")><#return license></#if>
+ <#if license?contains("Common Development and Distribution
License")><#return license></#if>
+ <#local result=result + ", " + license>
+ </#list>
+ <#return result?substring(2)>
+</#function>
+
+<#-- Aggregate dependencies map for generated license key (support for
multi-license) and convert artifacto to string -->
+<#function aggregateLicenses dependencies>
+ <#assign aggregate = {}>
+ <#list dependencyMap as entry>
+ <#assign project = artifactFormat(entry.getKey())/>
+ <#assign licenses = entry.getValue()/>
+ <#assign key = licensesKey(licenses)/>
+ <#if aggregate[key]?? >
+ <#assign replacement = aggregate[key] + [project] />
+ <#assign aggregate = aggregate + {key:replacement} />
+ <#else>
+ <#assign aggregate = aggregate + {key:[project]} />
+ </#if>
+ </#list>
+ <#return aggregate>
+</#function>
+
+<#if dependencyMap?size == 0>
+ The project has no dependencies.
+<#else>
+<#assign aggregate = aggregateLicenses(dependencyMap)>
+ <#-- Print sorted aggregate licenses -->
+ <#list aggregate?keys?sort as licenses>
+ <#assign projects = aggregate[licenses]/>
+
+ ${licenses}
+
+ <#-- Print sorded projects -->
+ <#list projects?sort as project>
+ * ${project}
+ </#list>
+ </#list>
+</#if>
