Author: solomax
Date: Tue May 6 09:45:40 2014
New Revision: 1592696
URL: http://svn.apache.org/r1592696
Log:
[OPENMEETINGS-940] build seems to be fixed
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-web/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=1592696&r1=1592695&r2=1592696&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml Tue May 6
09:45:40 2014
@@ -41,6 +41,21 @@
<url>http://smslib.org/maven2/v3</url>
</repository>
</repositories>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
<groupId>org.apache.openmeetings</groupId>
@@ -98,7 +113,6 @@
<dependency>
<groupId>org.red5</groupId>
<artifactId>red5-client</artifactId>
- <version>${red5-client.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml?rev=1592696&r1=1592695&r2=1592696&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml Tue May 6
09:45:40 2014
@@ -150,7 +150,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
- <execution>
+ <execution><!-- FIXME should be
refactored -->
<id>move-openjpa-resources</id>
<phase>process-resources</phase>
<configuration>
@@ -161,6 +161,9 @@
<copy
file="${project.basedir}/src/main/webapp/WEB-INF/classes/META-INF/${db}_persistence.xml"
tofile="${project.build.directory}/${project.build.finalName}/WEB-INF/classes/META-INF/persistence.xml"
overwrite="true"/>
+ <copy
file="${project.basedir}/src/main/webapp/WEB-INF/classes/META-INF/${db}_persistence.xml"
+
tofile="${project.build.directory}/test-classes/META-INF/persistence.xml"
+
overwrite="true"/>
</target>
<skip>${om.quick.build}</skip>
</configuration>
@@ -173,7 +176,7 @@
<phase>verify</phase>
<configuration>
<target>
- <delete
dir="${server.webapps}/installer"/>
+ <delete
dir="${server.webapps}/installer"/> <!-- maven-clean-plugin OR truezip::delete
OR assembly::exclude-->
<delete
dir="${server.webapps}/live"/>
<delete
dir="${server.webapps}/vod"/>
<mkdir
dir="${server.webapps.om}"/>
@@ -341,6 +344,30 @@
<skip>${om.quick.build}</skip>
</configuration>
</execution>
+ <execution><!-- FIXME should be
refactored -->
+ <id>create-zip-distribution</id>
+ <goals>
+ <goal>cp</goal>
+ </goals>
+ <phase>verify</phase>
+ <configuration>
+
<from>${project.build.directory}/server</from>
+
<to>${project.build.directory}/openmeetings-${project.version}.zip</to>
+
<skip>${om.quick.build}</skip>
+ </configuration>
+ </execution>
+ <execution><!-- FIXME should be
refactored -->
+ <id>create-tgz-distribution</id>
+ <goals>
+ <goal>cp</goal>
+ </goals>
+ <phase>verify</phase>
+ <configuration>
+
<from>${project.build.directory}/server</from>
+
<to>${project.build.directory}/openmeetings-${project.version}.tgz</to>
+
<skip>${om.quick.build}</skip>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1592696&r1=1592695&r2=1592696&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Tue May 6 09:45:40 2014
@@ -471,8 +471,8 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven.surefire.version}</version>
<configuration>
- <forkCount>0</forkCount>
- <reuseForks>false</reuseForks>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
<argLine>-Xmx1024m
-XX:MaxPermSize=256m</argLine>
<includes>
<include>**/Test*.java</include>
