no jira: source bundle is improved, build warnings are fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/914da1d6 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/914da1d6 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/914da1d6 Branch: refs/heads/3.2.x Commit: 914da1d6262fc5721161fb5c437b6dc4879c8381 Parents: bb8340b Author: Maxim Solodovnik <[email protected]> Authored: Fri Mar 17 08:56:06 2017 +0000 Committer: Maxim Solodovnik <[email protected]> Committed: Fri Mar 17 08:56:06 2017 +0000 ---------------------------------------------------------------------- .../src/main/assembly/assembly.xml | 4 +-- openmeetings-server/pom.xml | 24 ++++++++++++++ openmeetings-server/src/main/assembly/src.xml | 7 +++++ pom.xml | 33 ++++++++++++++++++++ 4 files changed, 66 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/914da1d6/openmeetings-screenshare/src/main/assembly/assembly.xml ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/assembly/assembly.xml b/openmeetings-screenshare/src/main/assembly/assembly.xml index 94980c9..71c2794 100644 --- a/openmeetings-screenshare/src/main/assembly/assembly.xml +++ b/openmeetings-screenshare/src/main/assembly/assembly.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/914da1d6/openmeetings-server/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml index e70feb6..b64cd5b 100644 --- a/openmeetings-server/pom.xml +++ b/openmeetings-server/pom.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/914da1d6/openmeetings-server/src/main/assembly/src.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/main/assembly/src.xml b/openmeetings-server/src/main/assembly/src.xml index 091084b..27e9726 100644 --- a/openmeetings-server/src/main/assembly/src.xml +++ b/openmeetings-server/src/main/assembly/src.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/914da1d6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 85461aa..a993c9a 100644 --- a/pom.xml +++ b/pom.xml @@ -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>
