Author: solomax
Date: Mon Sep  5 14:43:41 2016
New Revision: 1759280

URL: http://svn.apache.org/viewvc?rev=1759280&view=rev
Log:
Merge of ChristianSchulte/openmeetings:patch-1 - build with Maven 3.4 is fixed

Modified:
    openmeetings/application/branches/3.1.x/pom.xml
    openmeetings/application/branches/3.2.x/pom.xml
    openmeetings/application/trunk/pom.xml

Modified: openmeetings/application/branches/3.1.x/pom.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/pom.xml?rev=1759280&r1=1759279&r2=1759280&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/pom.xml Mon Sep  5 14:43:41 2016
@@ -494,7 +494,6 @@
                                <groupId>org.red5</groupId>
                                <artifactId>red5-server</artifactId>
                                <version>${red5-server.version}</version>
-                               <optional>true</optional>
                        </dependency>
                        <dependency>
                                <groupId>org.red5</groupId>

Modified: openmeetings/application/branches/3.2.x/pom.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/pom.xml?rev=1759280&r1=1759279&r2=1759280&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/pom.xml (original)
+++ openmeetings/application/branches/3.2.x/pom.xml Mon Sep  5 14:43:41 2016
@@ -494,7 +494,6 @@
                                <groupId>org.red5</groupId>
                                <artifactId>red5-server</artifactId>
                                <version>${red5-server.version}</version>
-                               <optional>true</optional>
                        </dependency>
                        <dependency>
                                <groupId>org.red5</groupId>

Modified: openmeetings/application/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/pom.xml?rev=1759280&r1=1759279&r2=1759280&view=diff
==============================================================================
--- openmeetings/application/trunk/pom.xml (original)
+++ openmeetings/application/trunk/pom.xml Mon Sep  5 14:43:41 2016
@@ -494,7 +494,6 @@
                                <groupId>org.red5</groupId>
                                <artifactId>red5-server</artifactId>
                                <version>${red5-server.version}</version>
-                               <optional>true</optional>
                        </dependency>
                        <dependency>
                                <groupId>org.red5</groupId>


Reply via email to