This is an automated email from the ASF dual-hosted git repository.
apalumbo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mahout.git
The following commit(s) were added to refs/heads/master by this push:
new c6235ec (nojira)[release] small fix to compute-classpath.sh, delete
outdated descriptors. cutting RC now.
c6235ec is described below
commit c6235ece23164ea63aced4f6cb1a92876caf86ed
Author: Andrew Palumbo <[email protected]>
AuthorDate: Fri Jan 31 06:07:42 2020 -0800
(nojira)[release] small fix to compute-classpath.sh, delete outdated
descriptors. cutting RC now.
---
bin/compute-classpath.sh | 6 +-
buildtools/assembly/bin.xml | 92 ---------------------
buildtools/assembly/bin_2.xml | 188 ------------------------------------------
buildtools/assembly/bin_3.xml | 101 -----------------------
buildtools/assembly/src.xml | 78 ------------------
5 files changed, 3 insertions(+), 462 deletions(-)
diff --git a/bin/compute-classpath.sh b/bin/compute-classpath.sh
index 4ec4eb9..be96969 100755
--- a/bin/compute-classpath.sh
+++ b/bin/compute-classpath.sh
@@ -34,7 +34,7 @@ FWDIR="$SPARK_HOME"
if [ -z "$SPARK_SCALA_VERSION" ]; then
ASSEMBLY_DIR1="$FWDIR/assembly/target/scala-2.10"
- ASSEMBLY_DIR2="$FWDIR/assembly/target/scala-2.12"
+ ASSEMBLY_DIR2="$FWDIR/assembly/target/scala-2.11"
ASSEMBLY_DIR3="$FWDIR/assembly/target/scala-2.12"
@@ -47,8 +47,8 @@ if [ -z "$SPARK_SCALA_VERSION" ]; then
if [[ -d "$ASSEMBLY_DIR1" ]]; then
export SPARK_SCALA_VERSION="2.10"
- elif [[ -d "$ASSEMBLY_DIR1" ]]; then
- export SPARK_SCALA_VERSION="2.12"
+ elif [[ -d "$ASSEMBLY_DIR2" ]]; then
+ export SPARK_SCALA_VERSION="2.11"
else
export SPARK_SCALA_VERSION="2.12"
fi
diff --git a/buildtools/assembly/bin.xml b/buildtools/assembly/bin.xml
deleted file mode 100644
index 3cb6c92..0000000
--- a/buildtools/assembly/bin.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
http://maven.apache.org/xsd/assembly-2.0.0.xsd";>
-<id>bin</id>
-
-<formats>
- <format>tar.gz</format>
- <format>tar.bz2</format>
- <format>zip</format>
-</formats>
-
-<fileSets>
- <fileSet>
- <directory>${project.base.directory}</directory>
- <outputDirectory>${project.base.directory}</outputDirectory>
- <includes>
- <include>README*</include>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
- <include>pom.xml</include>
- <include>Dockerfile</include>
- <include>entrypoint.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${project.base.directory}/lib</directory>
- <outputDirectory>${project.base.directory}/lib/</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- <includes>
- <include>*.jar</include>
- </includes>
- <excludes>
- <exclude>work</exclude>
- <exclude>work/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${project.base.directory}/site</directory>
- <outputDirectory>docs</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${project.base.directory}/bin</directory>
- <fileMode>755</fileMode>
- <directoryMode>755</directoryMode>
- <outputDirectory>bin</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <excludes>
- <exclude>work</exclude>
- <exclude>work/**</exclude>
- </excludes>
- </fileSet>
-
- <fileSet>
- <directory>${project.base.directory}/**/**/target/</directory>
- <outputDirectory>${project.base.directory}/lib</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- <includes>
- <include>*.jar</include>
- </includes>
- <excludes>
- <exclude>work</exclude>
- <exclude>work/**</exclude>
- </excludes>
-
- </fileSet>
-
- <fileSet>
- <directory>${project.base.directory}/examples/bin</directory>
-
<outputDirectory>${project.base.directory}/examples/bin/</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- <excludes>
- <exclude>work</exclude>
- <exclude>work/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${project.base.directory}/examples/bin/resources</directory>
-
<outputDirectory>${project.base.directory}/examples/bin/resources</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- </fileSets>
-</assembly>
-
diff --git a/buildtools/assembly/bin_2.xml b/buildtools/assembly/bin_2.xml
deleted file mode 100644
index 8429b1a..0000000
--- a/buildtools/assembly/bin_2.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
- <id>bin</id>
- <formats>
- <format>dir</format>
- <format>tar.gz</format>
- <format>tar.bz2</format>
- </formats>
-
-
-<!-- <dependencySets>-->
-<!-- <dependencySet>-->
-<!-- <scope>runtime</scope>-->
-<!-- <unpack>false</unpack>-->
-<!-- <useProjectArtifact>true</useProjectArtifact>-->
-<!-- <fileMode>644</fileMode>-->
-<!-- <directoryMode>755</directoryMode>-->
-<!-- <outputDirectory>lib</outputDirectory>-->
-<!-- <useTransitiveDependencies>true</useTransitiveDependencies>-->
-<!-- </dependencySet>-->
-<!-- </dependencySets>-->
-
- <fileSets>
- <fileSet>
- <directory>examples</directory>
- <includes>
- <include>*.jar</include>
- </includes>
- <excludes>
- <exclude>mahout-*</exclude>
- <exclude>junit-*</exclude>
- </excludes>
- <outputDirectory>lib</outputDirectory>
- </fileSet>
-
-<!-- <fileSet>-->
-<!-- <directory>core/target</directory>-->
-<!-- <includes>-->
-<!-- <include>mahout-core*.jar</include>-->
-<!-- </includes>-->
-<!-- <excludes>-->
-<!-- <exclude>*sources.jar</exclude>-->
-<!-- <exclude>*javadoc.jar</exclude>-->
-<!-- <exclude>*tests.jar</exclude>-->
-<!-- </excludes>-->
-<!-- <outputDirectory>lib</outputDirectory>-->
-<!-- </fileSet>-->
-
-<!-- <fileSet>-->
-<!-- <directory>engine/hdfs/target</directory>-->
-<!-- <includes>-->
-<!-- <include>mahout-*.jar</include>-->
-<!-- </includes>-->
-<!-- <excludes>-->
-<!-- <exclude>*sources.jar</exclude>-->
-<!-- <exclude>*javadoc.jar</exclude>-->
-<!-- <exclude>*tests.jar</exclude>-->
-<!-- </excludes>-->
-<!-- <outputDirectory>lib/</outputDirectory>-->
-<!-- </fileSet>-->
-
-<!-- <fileSet>-->
-<!-- <directory>/engine/spark/target/</directory>-->
-<!-- <includes>-->
-<!-- <include>spark*.jar</include>-->
-<!-- </includes>-->
-<!-- <excludes>-->
-<!-- <exclude>*sources.jar</exclude>-->
-<!-- <exclude>*javadoc.jar</exclude>-->
-<!-- <exclude>*tests.jar</exclude>-->
-<!-- </excludes>-->
-<!-- <outputDirectory>lib/</outputDirectory>-->
-<!-- </fileSet>-->
-<!-- <fileSet>-->
-<!-- <directory>community/spark-cli-drivers/target/</directory>-->
-<!-- <includes>-->
-<!-- <include>mahout-spark*.jar</include>-->
-<!-- </includes>-->
-<!-- <excludes>-->
-<!-- <exclude>*sources.jar</exclude>-->
-<!-- <exclude>*javadoc.jar</exclude>-->
-<!-- <exclude>*tests.jar</exclude>-->
-<!-- </excludes>-->
-<!-- <outputDirectory>lib/</outputDirectory>-->
-<!-- </fileSet>-->
-
-<!-- <fileSet>-->
-<!-- <directory>/engine/hdfs/target/</directory>-->
-<!-- <includes>-->
-<!-- <include>mahout-hdfs*.jar</include>-->
-<!-- </includes>-->
-<!-- <excludes>-->
-<!-- <exclude>*sources.jar</exclude>-->
-<!-- <exclude>*javadoc.jar</exclude>-->
-<!-- <exclude>*tests.jar</exclude>-->
-<!-- </excludes>-->
-<!-- <outputDirectory>lib/</outputDirectory>-->
-<!-- </fileSet>-->
-
-<!-- <fileSet>-->
-<!-- <directory></directory>-->
-<!-- <outputDirectory>/lib</outputDirectory>-->
-<!-- <useDefaultExcludes>true</useDefaultExcludes>-->
-<!-- <includes>-->
-<!-- <include>README*</include>-->
-<!-- <include>LICENSE*</include>-->
-<!-- <include>NOTICE*</include>-->
-<!-- <include>*.properties</include>-->
-<!-- </includes>-->
-
-<!-- <excludes>-->
-<!-- <exclude>**/target/**</exclude>-->
-<!-- </excludes>-->
-<!-- </fileSet>-->
-<!-- <fileSets>-->
- <fileSet>
- <directory>bin/*</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
-
- <fileSet>
- <directory>lib/mahout-*.jar</directory>
- <outputDirectory>lib</outputDirectory>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
-
- <fileSet>
- <directory>examples/bin/</directory>
- <outputDirectory>examples/bin/</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- <excludes>
- <exclude>work</exclude>
- <exclude>work/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>examples/bin/resources</directory>
- <outputDirectory>examples/bin/resources</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <includes>
- <include>org.apache.mahout:mahout*
- </include>
-<!-- <include>org.apache.mahout:dependency-reduced*:jar</include>-->
- </includes>
- <excludes>
- <exclude>
- org.apache.mahout:*dependency-reduced*
- </exclude>
- </excludes>
-
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <useProjectArtifact>false</useProjectArtifact>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/buildtools/assembly/bin_3.xml b/buildtools/assembly/bin_3.xml
deleted file mode 100644
index 1b3865c..0000000
--- a/buildtools/assembly/bin_3.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
- <id>bin</id>
- <formats>
- <format>tar.gz</format>
- <format>tar.bz2</format>
- </formats>
-
- <includeBaseDirectory>true</includeBaseDirectory>
-
<baseDirectory>apache-mahout_${scala.compat.version}-${project.version}</baseDirectory>
-
- <dependencySets>
- <dependencySet>
- <scope>runtime</scope>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- <outputDirectory>lib</outputDirectory>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- </dependencySet>
- </dependencySets>
-
- <fileSets>
-
- <fileSet>
- <directory>${project.build.directory}/</directory>
- <outputDirectory></outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <includes>
- <include>README*</include>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
- <include>pom.xml</include>
- <include>*.properties</include>
- </includes>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- </fileSet>
-
- <!-- <fileSet>-->
- <!-- <directory>target</directory>-->
- <!-- <fileMode>644</fileMode>-->
- <!-- <directoryMode>755</directoryMode>-->
- <!-- <outputDirectory>.</outputDirectory>-->
- <!-- <includes>-->
- <!-- <include>README.html</include>-->
- <!-- </includes>-->
- <!-- </fileSet>-->
-
- <fileSet>
- <directory>bin</directory>
- <fileMode>755</fileMode>
- <directoryMode>755</directoryMode>
- <outputDirectory>bin</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>lib/*.jar</directory>
- <outputDirectory>lib</outputDirectory>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
-
- <fileSet>
- <directory>examples/bin</directory>
- <outputDirectory>examples/bin/</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- <excludes>
- <exclude>work</exclude>
- <exclude>work/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>examples/bin/resources</directory>
- <outputDirectory>examples/bin/resources</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
diff --git a/buildtools/assembly/src.xml b/buildtools/assembly/src.xml
deleted file mode 100644
index 6c74d9a..0000000
--- a/buildtools/assembly/src.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
- <id>src</id>
- <formats>
-<!--
- <format>dir</format>
--->
- <format>tar.gz</format>
- <format>tar.bz2</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>${project.base.directory}/</directory>
- <outputDirectory>${project.base.directory}/</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <includes>
- <include>**/README*</include>
- <include>**/LICENSE*</include>
- <include>**/NOTICE*</include>
- <include>**/pom.xml</include>
- <include>**/src/**</include>
- <include>src/conf/**</include>
- <include>**/build.xml</include>
- <include>**/*.properties</include>
- <include>**/Dockerfile</include>
- <include>**/entrypoint.sh</include>
- </includes>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${project.base.directory}/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- <fileSet>
- <directory>${project.base.directory}/examples/bin</directory>
- <outputDirectory>examples/bin</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- <excludes>
- <exclude>work</exclude>
- <exclude>work/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${project.base.directory}/examples/bin/resources</directory>
- <outputDirectory>examples/bin</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- <excludes>
- <exclude>work</exclude>
- <exclude>work/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
