Author: solomax
Date: Sat May 3 11:20:36 2014
New Revision: 1592182
URL: http://svn.apache.org/r1592182
Log:
[OPENMEETINGS-940] some build optimisations
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml
openmeetings/trunk/singlewebapp/pom.xml
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml?rev=1592182&r1=1592181&r2=1592182&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml Sat May 3
11:20:36 2014
@@ -23,7 +23,7 @@
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
<version>3.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-core</artifactId>
<packaging>jar</packaging>
@@ -32,10 +32,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<velocity.version>1.7</velocity.version>
- <batik.version>1.7</batik.version>
<smslib.version>3.5.4</smslib.version>
<derby.version>10.10.1.1</derby.version>
- <red5-client.version>1.0.2-RC2</red5-client.version>
</properties>
<repositories>
<repository>
@@ -47,23 +45,14 @@
<dependency>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-util</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-db</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -88,13 +77,6 @@
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-transcoder</artifactId>
- <version>${batik.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.smslib</groupId>
@@ -105,7 +87,6 @@
<dependency>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-install</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml?rev=1592182&r1=1592181&r2=1592182&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml Sat May 3 11:20:36
2014
@@ -23,7 +23,7 @@
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
<version>3.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-db</artifactId>
<packaging>jar</packaging>
Modified: openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml?rev=1592182&r1=1592181&r2=1592182&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml Sat May 3
11:20:36 2014
@@ -22,10 +22,10 @@
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
<version>3.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-flash</artifactId>
- <!-- packaging>swf</packaging -->
+ <packaging>pom</packaging><!-- FIXME -->
<name>Openmeetings Flash</name>
<description>TODO</description>
<properties>
@@ -84,16 +84,5 @@
<type>swc</type>
<scope>test</scope>
</dependency>
- </dependencies>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex</groupId>
- <artifactId>framework</artifactId>
- <version>4.12.0.20140303</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement-->
+ </dependencies-->
</project>
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml?rev=1592182&r1=1592181&r2=1592182&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml Sat May 3
11:20:36 2014
@@ -23,7 +23,7 @@
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
<version>3.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-install</artifactId>
<packaging>jar</packaging>
@@ -37,23 +37,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-util</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-db</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
Modified: openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml?rev=1592182&r1=1592181&r2=1592182&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml Sat May 3
11:20:36 2014
@@ -23,7 +23,7 @@
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
<version>3.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-screenshare</artifactId>
<packaging>jar</packaging>
@@ -31,7 +31,6 @@
<description>A File to grab a screen and send it to a
Server</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <red5-client.version>1.0.2-RC2</red5-client.version>
<keystore.location>${project.build.directory}/screensharing_sign.keystore</keystore.location>
<key.password>secret</key.password>
<keystore.password>secret</keystore.password>
@@ -42,7 +41,6 @@
<dependency>
<groupId>org.red5</groupId>
<artifactId>red5-client</artifactId>
- <version>${red5-client.version}</version>
</dependency>
<dependency><!-- FIXME should be removed later -->
<groupId>org.red5</groupId>
@@ -52,9 +50,8 @@
<dependency><!-- FIXME should be removed later -->
<groupId>org.red5</groupId>
<artifactId>red5-server</artifactId>
- <version>${red5-server.version}</version>
</dependency>
- <dependency><!-- FIXME should be taken automatically from
red5-client dependencies -->
+ <dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
<version>2.0.7</version>
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml?rev=1592182&r1=1592181&r2=1592182&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml Sat May 3
11:20:36 2014
@@ -23,7 +23,7 @@
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
<version>3.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-service</artifactId>
<packaging>jar</packaging>
Modified: openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml?rev=1592182&r1=1592181&r2=1592182&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml Sat May 3
11:20:36 2014
@@ -23,7 +23,7 @@
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
<version>3.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-util</artifactId>
<packaging>jar</packaging>
@@ -31,37 +31,11 @@
<description>TODO</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <commons-transaction.version>1.2</commons-transaction.version>
<dom4j.version>1.6.1</dom4j.version>
- <ical4j.version>1.0.5.2</ical4j.version>
<mail.version>1.4.7</mail.version>
<commons-codec.version>1.8</commons-codec.version>
<servlet-api.version>2.5</servlet-api.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.red5</groupId>
- <artifactId>red5-server</artifactId>
- <version>${red5-server.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org</groupId>
-
<artifactId>jaudiotagger</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
-
<artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- </exclusion>
- </exclusions>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.red5</groupId>
@@ -70,13 +44,6 @@
<dependency>
<groupId>commons-transaction</groupId>
<artifactId>commons-transaction</artifactId>
- <version>${commons-transaction.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>dom4j</groupId>
@@ -86,13 +53,6 @@
<dependency>
<groupId>org.mnode.ical4j</groupId>
<artifactId>ical4j</artifactId>
- <version>${ical4j.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml?rev=1592182&r1=1592181&r2=1592182&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml Sat May 3
11:20:36 2014
@@ -23,7 +23,7 @@
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
<version>3.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-web</artifactId>
<packaging>war</packaging>
@@ -36,7 +36,6 @@
<dnd.version>0.6.0</dnd.version>
<commons-io.version>2.4</commons-io.version>
<commons-fileupload.version>1.3</commons-fileupload.version>
- <selenium.version>2.41.0</selenium.version>
<mysql.version>5.1.30</mysql.version>
</properties>
<profiles>
@@ -297,65 +296,48 @@
<dependency>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-util</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-db</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-install</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-service</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-webservice</artifactId>
- <version>${project.version}</version>
+ </dependency>
+ <!--dependency>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>openmeetings-flash</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>openmeetings-screenshare</artifactId>
+ <scope>provided</scope>
+ </dependency-->
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency> <!-- TODO most probably should be removed -->
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>ro.fortsoft.wicket.dashboard</groupId>
@@ -446,14 +428,6 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
- <version>${selenium.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.openmeetings</groupId>
Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml?rev=1592182&r1=1592181&r2=1592182&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml Sat May 3
11:20:36 2014
@@ -23,7 +23,7 @@
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
<version>3.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-webservice</artifactId>
<packaging>jar</packaging>
@@ -31,92 +31,36 @@
<description>TODO</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cxf.version>2.7.11</cxf.version>
<jettison.version>1.3.5</jettison.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-util</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-db</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${cxf.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${cxf.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle</artifactId>
- <version>${cxf.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1592182&r1=1592181&r2=1592182&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Sat May 3 11:20:36 2014
@@ -40,6 +40,12 @@
<maven.surefire.version>2.17</maven.surefire.version>
<wicket.version>6.15.0</wicket.version>
<red5-server.version>1.0.2-RELEASE</red5-server.version>
+ <batik.version>1.7</batik.version>
+ <commons-transaction.version>1.2</commons-transaction.version>
+ <ical4j.version>1.0.5.2</ical4j.version>
+ <cxf.version>2.7.11</cxf.version>
+ <selenium.version>2.41.0</selenium.version>
+ <red5-client.version>1.0.2-RC2</red5-client.version>
</properties>
<modules>
<module>openmeetings-core</module>
@@ -135,6 +141,223 @@
<url>http://repository.sonatype.org/content/groups/flexgroup</url>
</pluginRepository>
</pluginRepositories>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>openmeetings-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>openmeetings-db</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>openmeetings-flash</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>openmeetings-install</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>openmeetings-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openmeetings</groupId>
+
<artifactId>openmeetings-screenshare</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>openmeetings-webservice</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>openmeetings-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.red5</groupId>
+ <artifactId>red5-server</artifactId>
+ <version>${red5-server.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org</groupId>
+
<artifactId>jaudiotagger</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+
<artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ </exclusion>
+ </exclusions>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.red5</groupId>
+ <artifactId>red5-client</artifactId>
+ <version>${red5-client.version}</version>
+ <exclusions>
+ <exclusion>
+
<groupId>org.apache.mina</groupId>
+
<artifactId>mina-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+
<groupId>commons-logging</groupId>
+
<artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+
<groupId>commons-logging</groupId>
+
<artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency> <!-- TODO most probably should be removed
-->
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+
<groupId>commons-logging</groupId>
+
<artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-transcoder</artifactId>
+ <version>${batik.version}</version>
+ <exclusions>
+ <exclusion>
+
<groupId>commons-logging</groupId>
+
<artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-transaction</groupId>
+ <artifactId>commons-transaction</artifactId>
+
<version>${commons-transaction.version}</version>
+ <exclusions>
+ <exclusion>
+
<groupId>commons-logging</groupId>
+
<artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.mnode.ical4j</groupId>
+ <artifactId>ical4j</artifactId>
+ <version>${ical4j.version}</version>
+ <exclusions>
+ <exclusion>
+
<groupId>commons-logging</groupId>
+
<artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+
<groupId>org.springframework</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+
<groupId>org.springframework</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-bundle</artifactId>
+ <version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+
<groupId>org.springframework</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+
<groupId>commons-logging</groupId>
+
<artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.seleniumhq.selenium</groupId>
+ <artifactId>selenium-java</artifactId>
+ <version>${selenium.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+
<groupId>commons-logging</groupId>
+
<artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- dependency>
+ <groupId>org.apache.flex</groupId>
+ <artifactId>framework</artifactId>
+ <version>4.12.0.20140303</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency-->
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -145,14 +368,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -162,8 +378,6 @@
</dependency>
</dependencies>
<build>
- <defaultGoal>install</defaultGoal>
- <directory>${basedir}/target</directory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -234,12 +448,12 @@
</archive>
</configuration>
<executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
+ <execution>
+ <goals>
+
<goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
