You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/08/31 03:06:16 UTC
svn commit: r1758511 - in /openmeetings/application/branches/3.1.x:
openmeetings-server/src/site/xdoc/BuildInstructions.xml openmeetings-web/
openmeetings-web/pom.xml pom.xml
Author: solomax
Date: Wed Aug 31 03:06:16 2016
New Revision: 1758511
URL: http://svn.apache.org/viewvc?rev=1758511&view=rev
Log:
no jira: test-backups are moved to the custom maven repo
Modified:
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml
openmeetings/application/branches/3.1.x/openmeetings-web/ (props changed)
openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml
openmeetings/application/branches/3.1.x/pom.xml
Modified: openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml?rev=1758511&r1=1758510&r2=1758511&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml Wed Aug 31 03:06:16 2016
@@ -71,7 +71,7 @@ mvn install -P allModules -pl openmeetin
<p>In case you would like to develop Openmeetings you need to run <i>"unpacked"</i> build: </p>
<source>
<![CDATA[
-mvn clean install -P allModules,unpacked,mysql -DskipTests=true -Dold-backups.dwnd.skip=true -Dwicket.mode=DEVELOPMENT
+mvn clean install -P unpacked,mysql -DskipTests=true -Dwicket.mode=DEVELOPMENT
]]>
</source>
<p>After modifications are made you can run <i>"quick"</i> build: </p>
Propchange: openmeetings/application/branches/3.1.x/openmeetings-web/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 31 03:06:16 2016
@@ -1,5 +1,4 @@
target
-test-data
.project
.classpath
.settings
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml?rev=1758511&r1=1758510&r2=1758511&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml Wed Aug 31 03:06:16 2016
@@ -31,7 +31,7 @@
<description>TODO</description>
<properties>
<mysql.version>5.1.39</mysql.version>
- <old-backups.dir>${project.basedir}/test-data</old-backups.dir>
+ <old-backups.dir>${project.build.directory}/test-data</old-backups.dir>
<site.basedir>${project.parent.basedir}</site.basedir>
<skip.site.copy>false</skip.site.copy>
</properties>
@@ -49,254 +49,6 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>prepare-test-data-backup-1.4</id>
- <activation>
- <file>
- <missing>test-data/backup_v_1_4_rc1_r3326.zip</missing>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>wagon-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>download-test-data-1.4</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>download-single</goal>
- </goals>
- <configuration>
- <url>https://dl.bintray.com/openmeetings/generic/backups</url>
- <fromFile>backup_v_1_4_rc1_r3326.zip</fromFile>
- <toDir>${old-backups.dir}</toDir>
- <skip>${old-backups.dwnd.skip}</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>prepare-test-data-backup-1.5</id>
- <activation>
- <file>
- <missing>test-data/backup_v_1_5_rc1_r3393.zip</missing>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>wagon-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>download-test-data-1.5</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>download-single</goal>
- </goals>
- <configuration>
- <url>https://dl.bintray.com/openmeetings/generic/backups</url>
- <fromFile>backup_v_1_5_rc1_r3393.zip</fromFile>
- <toDir>${old-backups.dir}</toDir>
- <skip>${old-backups.dwnd.skip}</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>prepare-test-data-backup-1.6</id>
- <activation>
- <file>
- <missing>test-data/backup_v_1_6_2_r3675.zip</missing>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>wagon-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>download-test-data-1.6</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>download-single</goal>
- </goals>
- <configuration>
- <url>https://dl.bintray.com/openmeetings/generic/backups</url>
- <fromFile>backup_v_1_6_2_r3675.zip</fromFile>
- <toDir>${old-backups.dir}</toDir>
- <skip>${old-backups.dwnd.skip}</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>prepare-test-data-backup-1.7</id>
- <activation>
- <file>
- <missing>test-data/backup_v_1_7_0_r3822.zip</missing>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>wagon-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>download-test-data-1.7</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>download-single</goal>
- </goals>
- <configuration>
- <url>https://dl.bintray.com/openmeetings/generic/backups</url>
- <fromFile>backup_v_1_7_0_r3822.zip</fromFile>
- <toDir>${old-backups.dir}</toDir>
- <skip>${old-backups.dwnd.skip}</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>prepare-test-data-backup-1.8</id>
- <activation>
- <file>
- <missing>test-data/backup_v_1_8_8_r4555.zip</missing>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>wagon-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>download-test-data-1.8</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>download-single</goal>
- </goals>
- <configuration>
- <url>https://dl.bintray.com/openmeetings/generic/backups</url>
- <fromFile>backup_v_1_8_8_r4555.zip</fromFile>
- <toDir>${old-backups.dir}</toDir>
- <skip>${old-backups.dwnd.skip}</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>prepare-test-data-backup-1.9</id>
- <activation>
- <file>
- <missing>test-data/backup_v_1_9_1_r4707.zip</missing>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>wagon-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>download-test-data-1.9</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>download-single</goal>
- </goals>
- <configuration>
- <url>https://dl.bintray.com/openmeetings/generic/backups</url>
- <fromFile>backup_v_1_9_1_r4707.zip</fromFile>
- <toDir>${old-backups.dir}</toDir>
- <skip>${old-backups.dwnd.skip}</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>prepare-test-data-backup-2.0</id>
- <activation>
- <file>
- <missing>test-data/backup_v_2_0_0_r1361497.zip</missing>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>wagon-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>download-test-data-2.0</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>download-single</goal>
- </goals>
- <configuration>
- <url>https://dl.bintray.com/openmeetings/generic/backups</url>
- <fromFile>backup_v_2_0_0_r1361497.zip</fromFile>
- <toDir>${old-backups.dir}</toDir>
- <skip>${old-backups.dwnd.skip}</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>prepare-test-data-backup-3.0</id>
- <activation>
- <file>
- <missing>test-data/backup_v_3_0_0_r1573585.zip</missing>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>wagon-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>download-test-data-3.0</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>download-single</goal>
- </goals>
- <configuration>
- <url>https://dl.bintray.com/openmeetings/generic/backups</url>
- <fromFile>backup_v_3_0_0_r1573585.zip</fromFile>
- <toDir>${old-backups.dir}</toDir>
- <skip>${old-backups.dwnd.skip}</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
<build>
<plugins>
@@ -324,6 +76,70 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
+ <id>copy-test-backups</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${old-backups.dir}</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>test-backup</artifactId>
+ <version>1.4</version>
+ <type>zip</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>test-backup</artifactId>
+ <version>1.5</version>
+ <type>zip</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>test-backup</artifactId>
+ <version>1.6.2</version>
+ <type>zip</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>test-backup</artifactId>
+ <version>1.7.0</version>
+ <type>zip</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>test-backup</artifactId>
+ <version>1.8.8</version>
+ <type>zip</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>test-backup</artifactId>
+ <version>1.9.1</version>
+ <type>zip</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>test-backup</artifactId>
+ <version>2.0.0</version>
+ <type>zip</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>test-backup</artifactId>
+ <version>3.0.0</version>
+ <type>zip</type>
+ </artifactItem>
+ </artifactItems>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>false</overWriteSnapshots>
+ <overWriteIfNewer>false</overWriteIfNewer>
+ <excludeTransitive>false</excludeTransitive>
+ </configuration>
+ </execution>
+ <execution>
<id>copy-dependencies</id>
<phase>prepare-package</phase>
<goals>
Modified: openmeetings/application/branches/3.1.x/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/pom.xml?rev=1758511&r1=1758510&r2=1758511&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/pom.xml Wed Aug 31 03:06:16 2016
@@ -82,7 +82,6 @@
<properties>
<maven.test.skip>true</maven.test.skip>
<om.quick.build>true</om.quick.build>
- <old-backups.dwnd.skip>true</old-backups.dwnd.skip>
<red5-server.dwnd.skip>true</red5-server.dwnd.skip>
<wicket.mode>DEVELOPMENT</wicket.mode>
<src.pack.skip>true</src.pack.skip>