Repository: openmeetings Updated Branches: refs/heads/master dd651cf41 -> e8a3e764e
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/e8a3e764 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/e8a3e764 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/e8a3e764 Branch: refs/heads/master Commit: e8a3e764eca6c7ef89119d2292560446ec88d51b Parents: dd651cf Author: Maxim Solodovnik <[email protected]> Authored: Sun Oct 1 00:30:07 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sun Oct 1 00:30:07 2017 +0700 ---------------------------------------------------------------------- openmeetings-server/pom.xml | 24 ------------------- openmeetings-server/src/main/assembly/src.xml | 7 ------ pom.xml | 27 ++++++++++++++++++---- 3 files changed, 22 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e8a3e764/openmeetings-server/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml index eb2d5ee..c824813 100644 --- a/openmeetings-server/pom.xml +++ b/openmeetings-server/pom.xml @@ -148,30 +148,6 @@ <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> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <version>1.6.0</version> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e8a3e764/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 0c5b353..210746a 100644 --- a/openmeetings-server/src/main/assembly/src.xml +++ b/openmeetings-server/src/main/assembly/src.xml @@ -48,12 +48,5 @@ <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/e8a3e764/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a13f2b7..60b6c6f 100644 --- a/pom.xml +++ b/pom.xml @@ -834,6 +834,18 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <executions> + <execution> + <id>prepare-agent</id> + <goals> + <goal>prepare-agent</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> <pluginManagement> <plugins> @@ -1014,6 +1026,16 @@ <artifactId>maven-jarsigner-plugin</artifactId> <version>1.4</version> </plugin> + <plugin> + <groupId>org.sonarsource.scanner.maven</groupId> + <artifactId>sonar-maven-plugin</artifactId> + <version>3.3.0.603</version> + </plugin> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.7.9</version> + </plugin> <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> <plugin> @@ -1225,11 +1247,6 @@ </lifecycleMappingMetadata> </configuration> </plugin> - <plugin> - <groupId>org.sonarsource.scanner.maven</groupId> - <artifactId>sonar-maven-plugin</artifactId> - <version>3.3.0.603</version> - </plugin> </plugins> </pluginManagement> </build>
