Author: solomax
Date: Fri May 30 19:53:07 2014
New Revision: 1598717
URL: http://svn.apache.org/r1598717
Log:
Build is fixed
Modified:
openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
openmeetings/trunk/singlewebapp/pom.xml
Modified: openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml?rev=1598717&r1=1598716&r2=1598717&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml Fri May 30
19:53:07 2014
@@ -43,16 +43,6 @@
</properties>
<profiles>
<profile>
- <id>Skip download red5-server</id>
- <activation>
-
<file><exists>target/${red5-server.file.name}</exists></file>
- <property><name>!forceDownload</name></property>
- </activation>
- <properties>
-
<red5-server.dwnd.skip>true</red5-server.dwnd.skip>
- </properties>
- </profile>
- <profile>
<id>Quick</id>
<activation>
<property>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml?rev=1598717&r1=1598716&r2=1598717&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml Fri May 30
19:53:07 2014
@@ -38,7 +38,6 @@
<commons-fileupload.version>1.3</commons-fileupload.version>
<mysql.version>5.1.30</mysql.version>
<old-backups.dir>${project.build.directory}/old-backups</old-backups.dir>
-
<old-backups.dwnd.skip>${maven.test.skip}</old-backups.dwnd.skip>
<backup.to.check>backup_v_2_0_0_r1361497.zip</backup.to.check>
</properties>
<profiles>
@@ -59,16 +58,6 @@
</dependencies>
</profile>
<profile>
- <id>Skip download old backups</id>
- <activation>
-
<file><exists>target/old-backups/${backup.to.check}</exists></file>
- <property><name>!forceDownload</name></property>
- </activation>
- <properties>
-
<old-backups.dwnd.skip>true</old-backups.dwnd.skip>
- </properties>
- </profile>
- <profile>
<id>Quick</id>
<activation>
<property>
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1598717&r1=1598716&r2=1598717&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Fri May 30 19:53:07 2014
@@ -32,6 +32,7 @@
<description>TODO</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.build.timestamp.format>yyyy/MM/dd
HH:mm</maven.build.timestamp.format>
<wicket.mode>DEPLOYMENT</wicket.mode>
<db>derby</db>
<spring.version>4.0.3.RELEASE</spring.version>
@@ -406,6 +407,22 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+
<artifactId>buildnumber-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>true</doUpdate>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -441,6 +458,10 @@
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
+
<Built-By>OpenMeetings - http://openmeetings.apache.org</Built-By>
+
<Built-On>${maven.build.timestamp}</Built-On>
+
<Svn-Revision>${buildNumber}</Svn-Revision>
+
<Product-Version>${project.version}</Product-Version>
</manifestEntries>
</archive>
</configuration>
