You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2021/07/23 03:24:03 UTC
[openmeetings] branch java11-modules updated (49cf5a3 -> 6c00af6)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git.
from 49cf5a3 Another attempt to fix the build
add 0b4b193 [OPENMEETINGS-2593] wicket-jquery-ui
add d0b6b66 [OPENMEETINGS-2593] tika, tomcat, postres
add e3e2402 [OPENMEETINGS-2593] wicket, directory-api
add ba24bad [OPENMEETINGS-2593] wicketstuff
add 904ded9 no jira minor re-structuring
add b65b435 no jira: release build with modern javadoc is fixed
add d0483af [OPENMEETINGS-2638] label.id is corrected
add 1b7cd38 [OPENMEETINGS-2593] slf4j
add f4fa34f [OPENMEETINGS-2593] jetty
add 62ed7ae [OPENMEETINGS-2593] commons-io
add ab193bb [OPENMEETINGS-2593] apache-parent, spring, kurento
add fdb49db [OPENMEETINGS-2614] es, pt_BR, couple of typos
add 2b3d708 no jira: Release preparation
add 08d395b no jira: maven-enforser should be happy
add ea2d515 no jira: build should be fixed
add 5b4cd55 Switching to the next development version
new 0bd41ba Merge branch 'master' into java11-modules
new 6c00af6 Some more work on modules
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.md | 41 ++++++++++++
README.md | 19 ++++++
openmeetings-core/pom.xml | 2 +-
openmeetings-db/pom.xml | 3 +-
openmeetings-db/src/main/java/module-info.java | 4 +-
openmeetings-install/pom.xml | 2 +-
openmeetings-screenshare/pom.xml | 2 +-
openmeetings-server/pom.xml | 4 +-
openmeetings-server/src/site/xdoc/NewsArchive.xml | 72 ++++++++++++++++++++++
.../src/site/xdoc/commercial-support.xml | 8 ++-
openmeetings-server/src/site/xdoc/downloads.xml | 30 ++++-----
openmeetings-server/src/site/xdoc/index.xml | 32 ++++------
openmeetings-server/src/site/xdoc/installation.xml | 2 +-
openmeetings-service/pom.xml | 2 +-
openmeetings-util/pom.xml | 2 +-
openmeetings-util/src/main/java/module-info.java | 37 ++++++-----
.../src/test/java/module-info.test | 11 ++--
openmeetings-web/pom.xml | 8 +--
.../web/app/Application_es.properties.xml | 6 +-
.../web/app/Application_pt_BR.properties.xml | 22 +++----
.../openmeetings/web/room/EventDetailDialog.html | 2 +-
openmeetings-webservice/pom.xml | 2 +-
pom.xml | 54 ++++++++++------
23 files changed, 252 insertions(+), 115 deletions(-)
copy openmeetings-db/src/main/java/org/apache/openmeetings/IWebSession.java => openmeetings-util/src/test/java/module-info.test (82%)
[openmeetings] 02/02: Some more work on modules
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 6c00af6ffee336a52bd822604160149e4a811726
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Jul 23 10:22:37 2021 +0700
Some more work on modules
---
openmeetings-db/pom.xml | 1 -
openmeetings-db/src/main/java/module-info.java | 4 +--
openmeetings-util/src/main/java/module-info.java | 37 ++++++++++++------------
openmeetings-util/src/test/java/module-info.test | 25 ++++++++++++++++
openmeetings-web/pom.xml | 6 ----
pom.xml | 20 ++++++++++---
6 files changed, 61 insertions(+), 32 deletions(-)
diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml
index a6b710b..d16da3c 100644
--- a/openmeetings-db/pom.xml
+++ b/openmeetings-db/pom.xml
@@ -47,7 +47,6 @@
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-datastore-hazelcast</artifactId>
- <version>${wicketstuff.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
diff --git a/openmeetings-db/src/main/java/module-info.java b/openmeetings-db/src/main/java/module-info.java
index 671932f..aa1690d 100644
--- a/openmeetings-db/src/main/java/module-info.java
+++ b/openmeetings-db/src/main/java/module-info.java
@@ -49,8 +49,8 @@ module apache.openmeetings.db {
exports org.apache.openmeetings.db.util.ws;
requires transitive apache.openmeetings.util;
- requires transitive wicket.request;
- requires transitive wicket.native.websocket.core;
+ requires transitive org.apache.wicket.request;
+ requires transitive org.apache.wicket.websocket.core;
requires transitive spring.beans;
requires transitive spring.web;
requires transitive spring.core;
diff --git a/openmeetings-util/src/main/java/module-info.java b/openmeetings-util/src/main/java/module-info.java
index 3032e41..ecd5250 100644
--- a/openmeetings-util/src/main/java/module-info.java
+++ b/openmeetings-util/src/main/java/module-info.java
@@ -16,34 +16,33 @@
* specific language governing permissions and limitations
* under the License.
*/
-module apache.openmeetings.util {
- exports org.apache.openmeetings.util;
- exports org.apache.openmeetings.util.crypt;
- exports org.apache.openmeetings.util.mail;
- exports org.apache.openmeetings.util.process;
- exports org.apache.openmeetings.util.ws;
- exports org.apache.openmeetings.util.logging;
-
- requires transitive javax.servlet.api;
-
- requires transitive wicket.util;
- requires transitive wicket.core;
- requires transitive wicket.extensions;
+module org.apache.openmeetings.util {
+ requires transitive org.apache.wicket.util;
+ requires transitive org.apache.wicket.core;
+ requires transitive org.apache.wicket.extensions;
requires transitive org.apache.commons.codec;
requires transitive org.apache.commons.lang3;
requires transitive com.github.openjson;
requires transitive org.slf4j;
- requires transitive logback.classic;
- requires transitive logback.core;
- requires transitive dom4j;
- requires transitive jcip.annotations;
requires transitive org.bouncycastle.provider;
- requires transitive java.activation;
+ requires transitive jakarta.activation;
requires transitive org.mnode.ical4j.core;
- requires transitive tika.core;
requires org.aspectj.tools;
+ requires transitive javax.servlet.api;
+ requires transitive tika.core;
requires transitive spring.context;
+ requires transitive logback.classic;
+ requires transitive logback.core;
+ requires transitive dom4j;
+ requires transitive jcip.annotations;
requires simpleclient;
+
+ exports org.apache.openmeetings.util;
+ exports org.apache.openmeetings.util.crypt;
+ exports org.apache.openmeetings.util.mail;
+ exports org.apache.openmeetings.util.process;
+ exports org.apache.openmeetings.util.ws;
+ exports org.apache.openmeetings.util.logging;
}
diff --git a/openmeetings-util/src/test/java/module-info.test b/openmeetings-util/src/test/java/module-info.test
new file mode 100644
index 0000000..5987c83
--- /dev/null
+++ b/openmeetings-util/src/test/java/module-info.test
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+module org.apache.openmeetings.util.test {
+ requires transitive org.apache.openmeetings.util;
+
+ //tests
+ requires org.junit.jupiter.engine;
+ requires org.junit.jupiter.api;
+}
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 28124ad..1255216 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -575,18 +575,12 @@
</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>
diff --git a/pom.xml b/pom.xml
index e54af59..90676e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,10 +78,10 @@
<maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
<frontend-maven-plugin.version>1.11.0</frontend-maven-plugin.version>
<!-- dependency versions -->
- <junit.version>5.7.1</junit.version>
- <wicket.version>9.4.0</wicket.version>
+ <junit.version>5.8.0-M1</junit.version>
+ <wicket.version>9.5.0-SNAPSHOT</wicket.version>
<wicket-jquery-ui.version>9.3.2</wicket-jquery-ui.version>
- <wicketstuff.version>9.4.0</wicketstuff.version>
+ <wicketstuff.version>9.5.0-SNAPSHOT</wicketstuff.version>
<wicket-bootstrap.version>5.0.5</wicket-bootstrap.version>
<font-awesome.version>5.15.3</font-awesome.version>
<spring.version>5.3.9</spring.version>
@@ -126,6 +126,7 @@
<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>
+ <javax.servlet-api.version>3.1.0</javax.servlet-api.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>
@@ -616,9 +617,19 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-datastore-hazelcast</artifactId>
+ <version>${wicketstuff.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>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <version>${javax.servlet-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -880,6 +891,7 @@
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
+ <excludes>**/module-info.java,**/module-info.test</excludes>
</configuration>
<executions>
<execution>
[openmeetings] 01/02: Merge branch 'master' into java11-modules
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 0bd41ba2c052f46d2fcf01a528db3a31e5f7b388
Merge: 49cf5a3 5b4cd55
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Jul 22 22:33:11 2021 +0700
Merge branch 'master' into java11-modules
CHANGELOG.md | 41 ++++++++++++
README.md | 19 ++++++
openmeetings-core/pom.xml | 2 +-
openmeetings-db/pom.xml | 2 +-
openmeetings-install/pom.xml | 2 +-
openmeetings-screenshare/pom.xml | 2 +-
openmeetings-server/pom.xml | 4 +-
openmeetings-server/src/site/xdoc/NewsArchive.xml | 72 ++++++++++++++++++++++
.../src/site/xdoc/commercial-support.xml | 8 ++-
openmeetings-server/src/site/xdoc/downloads.xml | 30 ++++-----
openmeetings-server/src/site/xdoc/index.xml | 32 ++++------
openmeetings-server/src/site/xdoc/installation.xml | 2 +-
openmeetings-service/pom.xml | 2 +-
openmeetings-util/pom.xml | 2 +-
openmeetings-web/pom.xml | 2 +-
.../web/app/Application_es.properties.xml | 6 +-
.../web/app/Application_pt_BR.properties.xml | 22 +++----
.../openmeetings/web/room/EventDetailDialog.html | 2 +-
openmeetings-webservice/pom.xml | 2 +-
pom.xml | 38 +++++++-----
20 files changed, 213 insertions(+), 79 deletions(-)