This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 253f12b  [OPENMEETINGS-2701] tests should be fixed
253f12b is described below

commit 253f12b76b44da0266d1d53a29c80e74223f7492
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Sun Nov 14 22:51:36 2021 +0700

    [OPENMEETINGS-2701] tests should be fixed
---
 openmeetings-web/pom.xml |  1 -
 pom.xml                  | 16 +++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index d4def4e..02fe510 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -442,7 +442,6 @@
                                <inherited>true</inherited>
                                <configuration>
                                        
<workingDirectory>${project.build.directory}</workingDirectory>
-                                       
<excludedGroups>heavy-test</excludedGroups>
                                        <systemPropertyVariables>
                                                
<om.home>${project.build.directory}/test-root</om.home>
                                                
<languages.home>${project.build.directory}/test-root/languages</languages.home>
diff --git a/pom.xml b/pom.xml
index 11a1abc..e7ba1a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,6 +137,7 @@
                <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
                
<sonar.junit.reportPaths>target/surefire-reports</sonar.junit.reportPaths>
                
<jacoco.binary.path>${project.basedir}/../target/jacoco.exec</jacoco.binary.path>
+               <excluded.test.groups>heavy-test</excluded.test.groups>
                <db_user></db_user>
                <db_pass></db_pass>
        </properties>
@@ -1251,6 +1252,7 @@
                                        <configuration>
                                                <forkCount>1</forkCount>
                                                <reuseForks>true</reuseForks>
+                                               
<excludedGroups>${excluded.test.groups}</excludedGroups>
                                                <includes>
                                                        
<include>**/Test*.java</include>
                                                </includes>
@@ -1859,17 +1861,9 @@
                </profile>
                <profile>
                        <id>Jenkins</id>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               
<groupId>org.apache.maven.plugins</groupId>
-                                               
<artifactId>maven-surefire-plugin</artifactId>
-                                               <configuration>
-                                                       
<excludedGroups>heavy-test,non-jenkins</excludedGroups>
-                                               </configuration>
-                                       </plugin>
-                               </plugins>
-                       </build>
+                       <properties>
+                               
<excluded.test.groups>heavy-test,non-jenkins</excluded.test.groups>
+                       </properties>
                </profile>
                <profile>
                        <id>only-eclipse</id>

Reply via email to