Repository: openmeetings Updated Branches: refs/heads/master 1c3f765ee -> cec150c81
[OPENMEETINGS-980] Library versions are updated Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/cec150c8 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/cec150c8 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/cec150c8 Branch: refs/heads/master Commit: cec150c817caaed88c5061cae04ac123b794bb8a Parents: 1c3f765 Author: Maxim Solodovnik <[email protected]> Authored: Sat Oct 14 13:17:56 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sat Oct 14 13:17:56 2017 +0700 ---------------------------------------------------------------------- .../src/main/assembly/components/all.xml | 5 +++++ openmeetings-util/pom.xml | 2 +- openmeetings-web/pom.xml | 22 +++++++++++++++++--- pom.xml | 8 +++---- 4 files changed, 29 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cec150c8/openmeetings-server/src/main/assembly/components/all.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/main/assembly/components/all.xml b/openmeetings-server/src/main/assembly/components/all.xml index 018f486..1bc3b4c 100644 --- a/openmeetings-server/src/main/assembly/components/all.xml +++ b/openmeetings-server/src/main/assembly/components/all.xml @@ -34,7 +34,10 @@ <exclude>webapps/root/favicon.ico</exclude> <exclude>webapps/root/index.html</exclude> <exclude>lib/commons-io*.jar</exclude> + <exclude>lib/spring*.jar</exclude> <exclude>plugins/websocket*.jar</exclude> + <exclude>plugins/tomcat-embed*.jar</exclude> <!-- added for Red5 lib substitution --> + <exclude>plugins/ecj*.jar</exclude> <!-- added for Red5 lib substitution --> <exclude>*.sh</exclude> <exclude>conf/jee-container.xml</exclude> </excludes> @@ -109,6 +112,7 @@ <exclude>WEB-INF/lib/aopalliance*</exclude> <exclude>WEB-INF/lib/cglib-nodep*</exclude> <exclude>WEB-INF/lib/slf4j-*</exclude> + <exclude>WEB-INF/lib/ecj-*</exclude> <!-- added for Red5 lib substitution --> <exclude>WEB-INF/lib/tomcat-*</exclude> <exclude>WEB-INF/lib/spring-*</exclude> <exclude>WEB-INF/lib/mina-core-*</exclude> @@ -143,6 +147,7 @@ <directory>${project.parent.basedir}/openmeetings-web/target/openmeetings-web-${project.version}/WEB-INF/lib</directory> <outputDirectory>plugins</outputDirectory> <includes> + <include>ecj-*</include> <!-- added for Red5 lib substitution --> <include>tomcat-*</include> </includes> </fileSet> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cec150c8/openmeetings-util/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml index cb9d7dd..17145d4 100644 --- a/openmeetings-util/pom.xml +++ b/openmeetings-util/pom.xml @@ -30,7 +30,7 @@ <name>Openmeetings Util</name> <description>Module for utility classes being used by all OpenMeetings modules</description> <properties> - <dom4j.version>2.0.1</dom4j.version> + <dom4j.version>2.1.0</dom4j.version> <commons-codec.version>1.10</commons-codec.version> <commons-io.version>2.5</commons-io.version> <site.basedir>${project.parent.basedir}</site.basedir> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cec150c8/openmeetings-web/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml index f09b743..a72af60 100644 --- a/openmeetings-web/pom.xml +++ b/openmeetings-web/pom.xml @@ -34,7 +34,7 @@ <mssql.version>6.2.1.jre8</mssql.version> <old-backups.dir>${project.build.directory}/test-data</old-backups.dir> <site.basedir>${project.parent.basedir}</site.basedir> - <pdfbox.version>2.0.6</pdfbox.version> + <pdfbox.version>2.0.7</pdfbox.version> </properties> <profiles> <profile> @@ -539,12 +539,12 @@ <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-websocket</artifactId> <version>${tomcat.version}</version> - <exclusions> + <!--exclusions> commented for Red5 lib substitution <exclusion> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-core</artifactId> </exclusion> - </exclusions> + </exclusions--> </dependency> <dependency> <groupId>org.apache.tomcat</groupId> @@ -625,5 +625,21 @@ </exclusion> </exclusions> </dependency> + <!-- added for Red5 lib substitution --> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-core</artifactId> + <version>${tomcat.version}</version> + </dependency> + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-jasper</artifactId> + <version>${tomcat.version}</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cec150c8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1d2ebf4..ec74b1a 100644 --- a/pom.xml +++ b/pom.xml @@ -63,12 +63,12 @@ <wickets.version>8.0.0-SNAPSHOT</wickets.version> <red5-server.version>1.0.10-M4</red5-server.version> <red5-client.version>1.0.10-M4</red5-client.version> - <spring.version>4.3.10.RELEASE</spring.version> + <spring.version>4.3.12.RELEASE</spring.version> <mina.version>2.0.16</mina.version> - <tomcat.version>8.5.16</tomcat.version> - <ical4j.version>2.0.5</ical4j.version> + <tomcat.version>8.5.23</tomcat.version> + <ical4j.version>2.1.0</ical4j.version> <cxf.version>3.2.0</cxf.version> - <selenium.version>3.5.3</selenium.version> + <selenium.version>3.6.0</selenium.version> <simple-xml.version>2.7.1</simple-xml.version> <jettison.version>1.3.8</jettison.version> <site.basedir>${project.basedir}</site.basedir>
