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 2017/03/17 08:56:07 UTC
svn commit: r1787305 - in /openmeetings/application: branches/3.2.x/
branches/3.2.x/openmeetings-screenshare/src/main/assembly/
branches/3.2.x/openmeetings-server/
branches/3.2.x/openmeetings-server/src/main/assembly/ trunk/
trunk/openmeetings-screensh...
Author: solomax
Date: Fri Mar 17 08:56:06 2017
New Revision: 1787305
URL: http://svn.apache.org/viewvc?rev=1787305&view=rev
Log:
no jira: source bundle is improved, build warnings are fixed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/assembly/assembly.xml
openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml
openmeetings/application/branches/3.2.x/openmeetings-server/src/main/assembly/src.xml
openmeetings/application/branches/3.2.x/pom.xml
openmeetings/application/trunk/openmeetings-screenshare/src/main/assembly/assembly.xml
openmeetings/application/trunk/openmeetings-server/pom.xml
openmeetings/application/trunk/openmeetings-server/src/main/assembly/src.xml
openmeetings/application/trunk/pom.xml
Modified: openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/assembly/assembly.xml?rev=1787305&r1=1787304&r2=1787305&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/assembly/assembly.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/assembly/assembly.xml Fri Mar 17 08:56:06 2017
@@ -27,7 +27,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>commons-codec:commons-codec</include>
<include>commons-beanutils:commons-beanutils</include>
@@ -58,7 +58,7 @@
<fileSets>
<fileSet>
<directory>${project.build.outputDirectory}</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
</fileSet>
</fileSets>
</assembly>
Modified: openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml?rev=1787305&r1=1787304&r2=1787305&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml Fri Mar 17 08:56:06 2017
@@ -148,6 +148,30 @@
<build>
<plugins>
<plugin>
+ <groupId>com.internetitem</groupId>
+ <artifactId>write-properties-file-maven-plugin</artifactId>
+ <version>1.0.1</version>
+ <executions>
+ <execution>
+ <id>write build number</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>write-properties-file</goal>
+ </goals>
+ <configuration>
+ <filename>build.properties</filename>
+ <comment>Licensed under Apache License 2.0. http://www.apache.org/licenses/LICENSE-2.0</comment>
+ <properties>
+ <property>
+ <name>buildnumber</name>
+ <value>${buildNumber}</value>
+ </property>
+ </properties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
Modified: openmeetings/application/branches/3.2.x/openmeetings-server/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/src/main/assembly/src.xml?rev=1787305&r1=1787304&r2=1787305&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-server/src/main/assembly/src.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-server/src/main/assembly/src.xml Fri Mar 17 08:56:06 2017
@@ -48,5 +48,12 @@
<exclude>**/.settings/**</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/classes</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>build.properties</include>
+ </includes>
+ </fileSet>
</fileSets>
</assembly>
Modified: openmeetings/application/branches/3.2.x/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/pom.xml?rev=1787305&r1=1787304&r2=1787305&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/pom.xml (original)
+++ openmeetings/application/branches/3.2.x/pom.xml Fri Mar 17 08:56:06 2017
@@ -183,6 +183,33 @@
<module>openmeetings-db</module>
</modules>
</profile>
+ <profile>
+ <id>read-build-number</id>
+ <activation>
+ <file><exists>build.properties</exists></file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>read-project-properties</goal>
+ </goals>
+ <configuration>
+ <files>
+ <file>build.properties</file>
+ </files>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<url>http://openmeetings.apache.org</url>
<inceptionYear>2012</inceptionYear>
@@ -704,6 +731,7 @@
</executions>
<configuration>
<getRevisionOnlyOnce>true</getRevisionOnlyOnce>
+ <revisionOnScmFailure>${buildnumber}</revisionOnScmFailure>
</configuration>
</plugin>
<plugin>
@@ -891,6 +919,11 @@
<artifactId>maven-jarsigner-plugin</artifactId>
<version>1.4</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0.0</version>
+ </plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
Modified: openmeetings/application/trunk/openmeetings-screenshare/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/assembly/assembly.xml?rev=1787305&r1=1787304&r2=1787305&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-screenshare/src/main/assembly/assembly.xml (original)
+++ openmeetings/application/trunk/openmeetings-screenshare/src/main/assembly/assembly.xml Fri Mar 17 08:56:06 2017
@@ -27,7 +27,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>commons-codec:commons-codec</include>
<include>commons-beanutils:commons-beanutils</include>
@@ -58,7 +58,7 @@
<fileSets>
<fileSet>
<directory>${project.build.outputDirectory}</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
</fileSet>
</fileSets>
</assembly>
Modified: openmeetings/application/trunk/openmeetings-server/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/pom.xml?rev=1787305&r1=1787304&r2=1787305&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-server/pom.xml (original)
+++ openmeetings/application/trunk/openmeetings-server/pom.xml Fri Mar 17 08:56:06 2017
@@ -148,6 +148,30 @@
<build>
<plugins>
<plugin>
+ <groupId>com.internetitem</groupId>
+ <artifactId>write-properties-file-maven-plugin</artifactId>
+ <version>1.0.1</version>
+ <executions>
+ <execution>
+ <id>write build number</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>write-properties-file</goal>
+ </goals>
+ <configuration>
+ <filename>build.properties</filename>
+ <comment>Licensed under Apache License 2.0. http://www.apache.org/licenses/LICENSE-2.0</comment>
+ <properties>
+ <property>
+ <name>buildnumber</name>
+ <value>${buildNumber}</value>
+ </property>
+ </properties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
Modified: openmeetings/application/trunk/openmeetings-server/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/main/assembly/src.xml?rev=1787305&r1=1787304&r2=1787305&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-server/src/main/assembly/src.xml (original)
+++ openmeetings/application/trunk/openmeetings-server/src/main/assembly/src.xml Fri Mar 17 08:56:06 2017
@@ -48,5 +48,12 @@
<exclude>**/.settings/**</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/classes</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>build.properties</include>
+ </includes>
+ </fileSet>
</fileSets>
</assembly>
Modified: openmeetings/application/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/pom.xml?rev=1787305&r1=1787304&r2=1787305&view=diff
==============================================================================
--- openmeetings/application/trunk/pom.xml (original)
+++ openmeetings/application/trunk/pom.xml Fri Mar 17 08:56:06 2017
@@ -183,6 +183,33 @@
<module>openmeetings-db</module>
</modules>
</profile>
+ <profile>
+ <id>read-build-number</id>
+ <activation>
+ <file><exists>build.properties</exists></file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>read-project-properties</goal>
+ </goals>
+ <configuration>
+ <files>
+ <file>build.properties</file>
+ </files>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<url>http://openmeetings.apache.org</url>
<inceptionYear>2012</inceptionYear>
@@ -704,6 +731,7 @@
</executions>
<configuration>
<getRevisionOnlyOnce>true</getRevisionOnlyOnce>
+ <revisionOnScmFailure>${buildnumber}</revisionOnScmFailure>
</configuration>
</plugin>
<plugin>
@@ -891,6 +919,11 @@
<artifactId>maven-jarsigner-plugin</artifactId>
<version>1.4</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0.0</version>
+ </plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>