Fix release and delete log4j2 (apache#447)

* Spark Release * delete LocalFileAppender Co-authored-by: Enwei Jiao <enwei.jiao@kyligence.io>
RolatZhang · Apr 14, 2022 · 049ef70 · 049ef70
1 parent c4c41fa
commit 049ef70
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 238 deletions.
diff --git a/build/mvn b/build/mvn
@@ -36,7 +36,7 @@ _DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # Preserve the calling directory
 _CALLING_DIR="$(pwd)"
 # Options used during compilation
-_COMPILE_JVM_OPTS="-Xmx2g -XX:ReservedCodeCacheSize=1g -Xss128m"
+_COMPILE_JVM_OPTS="-Xmx4g -XX:ReservedCodeCacheSize=1g -Xss512m"
 
 # Installs any application tarball given a URL, the expected tarball name,
 # and, optionally, a checkable binary path to determine if the binary has

diff --git a/core/src/main/scala/org/apache/spark/log4j/LocalFileAppender.java b/core/src/main/scala/org/apache/spark/log4j/LocalFileAppender.java
diff --git a/core/src/main/scala/org/apache/spark/log4j/SensitivePatternLayout.java b/core/src/main/scala/org/apache/spark/log4j/SensitivePatternLayout.java
diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh
@@ -126,19 +126,19 @@ if [ ! "$(command -v "$MVN")" ] ; then
     exit -1;
 fi
 
-VERSION=$("$MVN" help:evaluate -Dexpression=project.version $@ \
+VERSION=$("$MVN" help:evaluate -Dexpression=project.version \
     | grep -v "INFO"\
     | grep -v "WARNING"\
     | tail -n 1)
-SCALA_VERSION=$("$MVN" help:evaluate -Dexpression=scala.binary.version $@ \
+SCALA_VERSION=$("$MVN" help:evaluate -Dexpression=scala.binary.version \
     | grep -v "INFO"\
     | grep -v "WARNING"\
     | tail -n 1)
-SPARK_HADOOP_VERSION=$("$MVN" help:evaluate -Dexpression=hadoop.version $@ \
+SPARK_HADOOP_VERSION=$("$MVN" help:evaluate -Dexpression=hadoop.version \
     | grep -v "INFO"\
     | grep -v "WARNING"\
     | tail -n 1)
-SPARK_HIVE=$("$MVN" help:evaluate -Dexpression=project.activeProfiles -pl sql/hive $@ \
+SPARK_HIVE=$("$MVN" help:evaluate -Dexpression=project.activeProfiles -pl sql/hive \
     | grep -v "INFO"\
     | grep -v "WARNING"\
     | fgrep --count "<id>hive</id>";\

diff --git a/pom.xml b/pom.xml
@@ -302,14 +302,14 @@
     </repository>
     <repository>
       <id>nexus</id>
-      <name>Kyligence Repository</name>
-      <url>http://repository.kyligence.io:8081/repository/maven-public/
-      </url>
+        <name>Kyligence Repository</name>
+        <url>https://repository.kyligence.io/repository/maven-public/
+        </url>
       <releases>
-        <enabled>true</enabled>
+    	<enabled>true</enabled>
       </releases>
       <snapshots>
-        <enabled>true</enabled>
+    	<enabled>true</enabled>
       </snapshots>
     </repository>
     <repository>
@@ -2669,7 +2669,7 @@
               <arg>-P:silencer:globalFilters=.*deprecated.*</arg>
             </args>
             <jvmArgs>
-              <jvmArg>-Xss128m</jvmArg>
+              <jvmArg>-Xss512m</jvmArg>
               <jvmArg>-Xms4g</jvmArg>
               <jvmArg>-Xmx4g</jvmArg>
               <jvmArg>-XX:MaxMetaspaceSize=2g</jvmArg>
@@ -3265,16 +3265,16 @@
   </build>
 
   <distributionManagement>
-    <snapshotRepository>
-      <id>user-snapshots</id>
-      <name>User Project SNAPSHOTS</name>
-      <url>http://repository.kyligence.io:8081/repository/maven-snapshots/</url>
-    </snapshotRepository>
     <repository>
-      <id>user-releases</id>
-      <name>User Project Release</name>
-      <url>http://repository.kyligence.io:8081/repository/maven-releases/</url>
+      <id>${repository.id}</id>
+      <url>${repository.url}</url>
+      <name>${repository.name}</name>
     </repository>
+    <snapshotRepository>
+      <id>${repository.id.snapshots}</id>
+      <url>${repository.url.snapshots}</url>
+      <name>${repository.name.snapshots}</name>
+    </snapshotRepository>
   </distributionManagement>
 
   <profiles>