[paypal#247] [spark] Bump Spark Version to 2.4.7 | Bump Spark Version…

… to 2.4.7 along with other stack to align with gcp_dataproc_1.5.x
Dee-Pac · Nov 7, 2020 · cc228a9 · cc228a9
1 parent e957499
commit cc228a9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,4 +29,4 @@ before_install:
 
 # Build
 install: 
-- sh build/gimel -Dmaven.test.skip=true -pl gimel-dataapi/gimel-tools -am | egrep -v "Download|Copy|Including|WARNING"
+- sh -x build/gimel -Dmaven.test.skip=true -pl gimel-dataapi/gimel-tools -am | egrep -v "Download|Copy|Including|WARNING"
diff --git a/build/gimel b/build/gimel
@@ -103,9 +103,11 @@ else
 fi
 
 
-build/install_dependencies
+write_log "Installing dependencies [sh -x build/install_dependencies]"
+sh -x build/install_dependencies
 check_error $? "build/install_dependencies"
 
+write_log "Building the project [mvn install ${user_args}]"
 mvn install "$@"
 check_error $? "mvn install $@"
 

diff --git a/gimel-dataapi/gimel-connectors/gimel-restapi/pom.xml b/gimel-dataapi/gimel-connectors/gimel-restapi/pom.xml
@@ -47,12 +47,11 @@ under the License.
 
   <build>
     <sourceDirectory>src/main/scala</sourceDirectory>
-    <testSourceDirectory>src/test/scala</testSourceDirectory>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>${maven.shade.plugin.version}</version>
         <configuration>
           <relocations>
             <relocation>

diff --git a/gimel-dataapi/gimel-connectors/gimel-s3/pom.xml b/gimel-dataapi/gimel-connectors/gimel-s3/pom.xml
@@ -69,7 +69,6 @@ under the License.
 
   <build>
     <sourceDirectory>src/main/scala</sourceDirectory>
-    <testSourceDirectory>src/test/scala</testSourceDirectory>
     <plugins>
       <plugin>
         <groupId>net.alchim31.maven</groupId>
@@ -111,7 +110,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>${maven.shade.plugin.version}</version>
         <configuration>
           <relocations>
             <relocation>

diff --git a/gimel-dataapi/pom.xml b/gimel-dataapi/pom.xml
@@ -41,14 +41,14 @@ under the License.
         <module>gimel-connectors/gimel-sftp</module>
         <module>gimel-connectors/gimel-elasticsearch</module>
         <module>gimel-connectors/gimel-hive</module>
+        <module>gimel-connectors/gimel-restapi</module>
+        <module>gimel-connectors/gimel-s3</module>
         <module>gimel-connectors/gimel-jdbc</module>
         <module>gimel-connectors/gimel-hbase</module>
         <module>gimel-connectors/gimel-cassandra-2.0</module>
         <module>gimel-connectors/gimel-aerospike-3.14</module>
         <module>gimel-connectors/gimel-kafka-2.2</module>
         <module>gimel-connectors/gimel-druid-0.82</module>
-        <module>gimel-connectors/gimel-restapi</module>
-        <module>gimel-connectors/gimel-s3</module>
         <module>gimel-core</module>
         <module>gimel-sql</module>
         <module>gimel-tools</module>