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 2020/12/03 16:33:27 UTC
[openmeetings] branch master updated (3f54d58 -> 91994c3)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git.
from 3f54d58 no jira: release preparation, documentation update
new 3a6be2e Switching to the next dev version
new 91994c3 [OPENMEETINGS-2519] maven-resources-plugin
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:
openmeetings-core/pom.xml | 2 +-
openmeetings-db/pom.xml | 2 +-
openmeetings-install/pom.xml | 2 +-
openmeetings-screenshare/pom.xml | 2 +-
openmeetings-server/pom.xml | 2 +-
openmeetings-service/pom.xml | 2 +-
openmeetings-util/pom.xml | 2 +-
openmeetings-web/pom.xml | 2 +-
openmeetings-webservice/pom.xml | 2 +-
pom.xml | 18 ++++++++++++++++--
10 files changed, 25 insertions(+), 11 deletions(-)
[openmeetings] 02/02: [OPENMEETINGS-2519] maven-resources-plugin
Posted by so...@apache.org.
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
commit 91994c3e8a86b32840a5144953b0c557238611ee
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Dec 3 23:32:40 2020 +0700
[OPENMEETINGS-2519] maven-resources-plugin
---
pom.xml | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index e162387..4231728 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
<maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
<wagon-maven-plugin.version>2.0.0</wagon-maven-plugin.version>
<maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
- <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
+ <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
<replacer.version>1.5.3</replacer.version>
<xml-maven-plugin.version>1.0.2</xml-maven-plugin.version>
<saxon.version>8.7</saxon.version>
@@ -942,6 +942,20 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>${maven-resources-plugin.version}</version>
+ <configuration>
+ <nonFilteredFileExtensions>
+ <nonFilteredFileExtension>pdf</nonFilteredFileExtension>
+ <nonFilteredFileExtension>svg</nonFilteredFileExtension>
+ <nonFilteredFileExtension>ods</nonFilteredFileExtension>
+ <nonFilteredFileExtension>odt</nonFilteredFileExtension>
+ <nonFilteredFileExtension>odp</nonFilteredFileExtension>
+ <nonFilteredFileExtension>docx</nonFilteredFileExtension>
+ <nonFilteredFileExtension>zip</nonFilteredFileExtension>
+ <nonFilteredFileExtension>jks</nonFilteredFileExtension>
+ <nonFilteredFileExtension>mp3</nonFilteredFileExtension>
+ <nonFilteredFileExtension>wav</nonFilteredFileExtension>
+ </nonFilteredFileExtensions>
+ </configuration>
</plugin>
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
[openmeetings] 01/02: Switching to the next dev version
Posted by so...@apache.org.
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
commit 3a6be2e60ab71f015bd20dd35df681f2f28a7862
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Dec 3 23:31:55 2020 +0700
Switching to the next dev version
---
openmeetings-core/pom.xml | 2 +-
openmeetings-db/pom.xml | 2 +-
openmeetings-install/pom.xml | 2 +-
openmeetings-screenshare/pom.xml | 2 +-
openmeetings-server/pom.xml | 2 +-
openmeetings-service/pom.xml | 2 +-
openmeetings-util/pom.xml | 2 +-
openmeetings-web/pom.xml | 2 +-
openmeetings-webservice/pom.xml | 2 +-
pom.xml | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index 936ee4c..ecbc593 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
- <version>5.1.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-core</artifactId>
diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml
index 16562ac..47001fa 100644
--- a/openmeetings-db/pom.xml
+++ b/openmeetings-db/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
- <version>5.1.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-db</artifactId>
diff --git a/openmeetings-install/pom.xml b/openmeetings-install/pom.xml
index 24b81d8..bedfc4a 100644
--- a/openmeetings-install/pom.xml
+++ b/openmeetings-install/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
- <version>5.1.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-install</artifactId>
diff --git a/openmeetings-screenshare/pom.xml b/openmeetings-screenshare/pom.xml
index 6e8f107..91c4164 100644
--- a/openmeetings-screenshare/pom.xml
+++ b/openmeetings-screenshare/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
- <version>5.1.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-screenshare</artifactId>
diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index 150c999..ef074b9 100644
--- a/openmeetings-server/pom.xml
+++ b/openmeetings-server/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
- <version>5.1.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-server</artifactId>
diff --git a/openmeetings-service/pom.xml b/openmeetings-service/pom.xml
index f0fc019..4507a7f 100644
--- a/openmeetings-service/pom.xml
+++ b/openmeetings-service/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
- <version>5.1.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-service</artifactId>
diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml
index 655380d..3df7acc 100644
--- a/openmeetings-util/pom.xml
+++ b/openmeetings-util/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
- <version>5.1.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-util</artifactId>
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 1706ace..d75f93e 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
- <version>5.1.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-web</artifactId>
diff --git a/openmeetings-webservice/pom.xml b/openmeetings-webservice/pom.xml
index 68caadc..16ef367 100644
--- a/openmeetings-webservice/pom.xml
+++ b/openmeetings-webservice/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
- <version>5.1.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-webservice</artifactId>
diff --git a/pom.xml b/pom.xml
index 98abfdb..e162387 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
</parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
- <version>5.1.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Openmeetings</name>
<description>Parent project for all OpenMeetings Maven modules. Required to hold general settings</description>