Repository: openmeetings Updated Branches: refs/heads/3.3.x 4850a8191 -> 7bac63dd2
[OPENMEETINGS-1665] build clean-up, attempt to fix tests Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/7bac63dd Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/7bac63dd Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/7bac63dd Branch: refs/heads/3.3.x Commit: 7bac63dd2bf88a32bf7c829d840b9a53af6f1b25 Parents: 4850a81 Author: Maxim Solodovnik <[email protected]> Authored: Sat Jul 8 22:10:56 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sat Jul 8 22:10:56 2017 +0700 ---------------------------------------------------------------------- openmeetings-util/pom.xml | 16 ---------------- pom.xml | 22 ++++++++++++++-------- 2 files changed, 14 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7bac63dd/openmeetings-util/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml index 2f5b428..b128d3e 100644 --- a/openmeetings-util/pom.xml +++ b/openmeetings-util/pom.xml @@ -60,22 +60,6 @@ </resource> </resources> </build> - <profiles> - <profile> - <id>Jenkins</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludedGroups>org.apache.openmeetings.util.NonJenkinsTests</excludedGroups> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> <dependencies> <dependency> <groupId>org.red5</groupId> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7bac63dd/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d079f31..82cbf94 100644 --- a/pom.xml +++ b/pom.xml @@ -192,6 +192,20 @@ <module>openmeetings-db</module> </modules> </profile> + <profile> + <id>Jenkins</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludedGroups>org.apache.openmeetings.util.NonJenkinsTests</excludedGroups> + </configuration> + </plugin> + </plugins> + </build> + </profile> </profiles> <url>http://openmeetings.apache.org</url> <inceptionYear>2012</inceptionYear> @@ -214,9 +228,6 @@ <system>jenkins</system> <url>https://builds.apache.org/view/M-R/view/OpenMeetings/job/openmeetings/</url> </ciManagement> - <prerequisites> - <maven>3.2.1</maven> - </prerequisites> <developers> <developer> <id>sebawagner</id> @@ -916,11 +927,6 @@ <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>
