You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by xx...@apache.org on 2022/08/26 05:44:48 UTC

[kylin] 03/05: KYLIN-5225 add pre-commit property to spark3 profile

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

xxyu pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit b9cb3d682c41cc60ffe41c6035e947575c256dd7
Author: Shaofeng Shi <sh...@apache.org>
AuthorDate: Thu Aug 11 10:29:10 2022 +0800

    KYLIN-5225 add pre-commit property to spark3 profile
---
 pom.xml | 219 +++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 107 insertions(+), 112 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6ddc395668..77fe958082 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1502,7 +1502,113 @@
   </reporting>
 
   <profiles>
-<profile>
+    <profile>
+      <id>spark3</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+        <property>
+          <name>pre-commit</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <fork>true</fork>
+              <meminitial>1024m</meminitial>
+              <maxmem>2048m</maxmem>
+            </configuration>
+          </plugin>
+
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>copy-jamm</id>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+                <phase>generate-test-resources</phase>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>com.github.jbellis</groupId>
+                      <artifactId>jamm</artifactId>
+                      <outputDirectory>${project.build.testOutputDirectory}
+                      </outputDirectory>
+                      <destFileName>jamm.jar</destFileName>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+
+          <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <configuration>
+              <append>true</append>
+              <destFile>
+                ${sonar.jacoco.reportPaths}
+              </destFile>
+            </configuration>
+            <executions>
+              <execution>
+                <id>pre-test</id>
+                <goals>
+                  <goal>prepare-agent</goal>
+                </goals>
+                <configuration>
+                  <propertyName>surefireArgLine</propertyName>
+                </configuration>
+              </execution>
+              <execution>
+                <id>post-test</id>
+                <phase>test</phase>
+                <goals>
+                  <goal>report</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>2.21.0</version>
+            <configuration>
+              <reportsDirectory>${project.basedir}/../target/surefire-reports
+              </reportsDirectory>
+              <excludes>
+                <exclude>**/IT*.java</exclude>
+                <exclude>org.apache.kylin.engine.spark2.NManualBuildAndQueryCuboidTest</exclude>
+                <exclude>org.apache.kylin.engine.spark2.NBuildAndQueryTest</exclude>
+                <exclude>org.apache.kylin.engine.spark2.NBadQueryAndPushDownTest</exclude>
+              </excludes>
+              <systemProperties>
+                <property>
+                  <name>buildCubeUsingProvidedData</name>
+                  <value>false</value>
+                </property>
+                <property>
+                  <name>log4j.configuration</name>
+                  <value>
+                    file:${project.basedir}/../build/conf/kylin-tools-log4j.properties
+                  </value>
+                </property>
+              </systemProperties>
+              <argLine>-javaagent:${project.build.testOutputDirectory}/jamm.jar
+                ${argLine} ${surefireArgLine}
+              </argLine>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
 <!-- This profile adds/overrides few features of the 'apache-release'
      profile in the parent pom. -->
       <id>apache-release</id>
@@ -1783,116 +1889,5 @@
         </pluginManagement>
       </build>
     </profile>
-    <profile>
-      <id>spark3</id>
-      <properties>
-        <scala.version>2.12.10</scala.version>
-        <scala.binary.version>2.12</scala.binary.version>
-        <spark.version>3.1.3</spark.version>
-        <spark.version.dir>spark31</spark.version.dir>
-        <jackson.version>2.10.0</jackson.version>
-        <slf4j.version>1.7.30</slf4j.version>
-      </properties>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-              <fork>true</fork>
-              <meminitial>1024m</meminitial>
-              <maxmem>2048m</maxmem>
-            </configuration>
-          </plugin>
-
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>copy-jamm</id>
-                <goals>
-                  <goal>copy</goal>
-                </goals>
-                <phase>generate-test-resources</phase>
-                <configuration>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>com.github.jbellis</groupId>
-                      <artifactId>jamm</artifactId>
-                      <outputDirectory>${project.build.testOutputDirectory}
-                      </outputDirectory>
-                      <destFileName>jamm.jar</destFileName>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-
-          <plugin>
-            <groupId>org.jacoco</groupId>
-            <artifactId>jacoco-maven-plugin</artifactId>
-            <configuration>
-              <append>true</append>
-              <destFile>
-                ${sonar.jacoco.reportPaths}
-              </destFile>
-            </configuration>
-            <executions>
-              <execution>
-                <id>pre-test</id>
-                <goals>
-                  <goal>prepare-agent</goal>
-                </goals>
-                <configuration>
-                  <propertyName>surefireArgLine</propertyName>
-                </configuration>
-              </execution>
-              <execution>
-                <id>post-test</id>
-                <phase>test</phase>
-                <goals>
-                  <goal>report</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <version>2.21.0</version>
-            <configuration>
-              <reportsDirectory>${project.basedir}/../target/surefire-reports
-              </reportsDirectory>
-              <excludes>
-                <exclude>**/IT*.java</exclude>
-                <exclude>org.apache.kylin.engine.spark2.NManualBuildAndQueryCuboidTest</exclude>
-                <exclude>org.apache.kylin.engine.spark2.NBuildAndQueryTest</exclude>
-                <exclude>org.apache.kylin.engine.spark2.NBadQueryAndPushDownTest</exclude>
-              </excludes>
-              <systemProperties>
-                <property>
-                  <name>buildCubeUsingProvidedData</name>
-                  <value>false</value>
-                </property>
-                <property>
-                  <name>log4j.configuration</name>
-                  <value>
-                    file:${project.basedir}/../build/conf/kylin-tools-log4j.properties
-                  </value>
-                </property>
-              </systemProperties>
-              <argLine>-javaagent:${project.build.testOutputDirectory}/jamm.jar
-                ${argLine} ${surefireArgLine}
-              </argLine>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-    </profile>
   </profiles>
 </project>