This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new a841ab5 [OPENMEETINGS-1872] tests are fixed, packaging improved
a841ab5 is described below
commit a841ab5f10d979fc0fd7fd4d457835120aabe6ec
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Thu Apr 26 09:36:09 2018 +0700
[OPENMEETINGS-1872] tests are fixed, packaging improved
---
openmeetings-server/src/main/assembly/components/all.xml | 4 ++++
openmeetings-util/pom.xml | 6 ------
.../src/main/resources/org/apache/tika/mime/custom-mimetypes.xml | 3 ---
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/openmeetings-server/src/main/assembly/components/all.xml
b/openmeetings-server/src/main/assembly/components/all.xml
index 8583e24..15f4028 100644
--- a/openmeetings-server/src/main/assembly/components/all.xml
+++ b/openmeetings-server/src/main/assembly/components/all.xml
@@ -154,6 +154,8 @@
<exclude>WEB-INF/lib/ehcache-core*</exclude>
<exclude>WEB-INF/lib/jempbox*</exclude>
<exclude>WEB-INF/lib/juniversalchardet*</exclude>
+ <exclude>WEB-INF/lib/jai-imageio-core*</exclude>
+ <exclude>WEB-INF/lib/jbig2-imageio*</exclude>
<exclude>WEB-INF/lib/mchange-commons*</exclude>
<exclude>WEB-INF/lib/metadata-extractor*</exclude>
<exclude>WEB-INF/lib/pdfbox*</exclude>
@@ -251,6 +253,8 @@
<include>httpmime-*</include>
<include>httpservices-*</include>
<include>isoparser-*</include>
+ <include>jbig2-imageio*</include>
+ <include>jai-imageio-core*</include>
<include>j2objc-annotations-*</include>
<include>jackcess-*</include>
<include>jackson-core-*</include>
diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml
index c1e90fe..7ac887e 100644
--- a/openmeetings-util/pom.xml
+++ b/openmeetings-util/pom.xml
@@ -128,11 +128,5 @@
<artifactId>tika-parsers</artifactId>
<version>1.18</version>
</dependency>
- <dependency>
- <groupId>org.apache.pdfbox</groupId>
- <artifactId>jbig2-imageio</artifactId>
- <version>3.0.0</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
</project>
diff --git
a/openmeetings-util/src/main/resources/org/apache/tika/mime/custom-mimetypes.xml
b/openmeetings-util/src/main/resources/org/apache/tika/mime/custom-mimetypes.xml
index 4f8fa6e..d3b1efe 100644
---
a/openmeetings-util/src/main/resources/org/apache/tika/mime/custom-mimetypes.xml
+++
b/openmeetings-util/src/main/resources/org/apache/tika/mime/custom-mimetypes.xml
@@ -31,7 +31,4 @@
<mime-type type="image/other">
<glob pattern="*.wpg"/>
</mime-type>
- <mime-type type="image/other">
- <glob pattern="*.tga"/>
- </mime-type>
</mime-info>
--
To stop receiving notification emails like this one, please contact
[email protected].
