Skip to content
This repository was archived by the owner on Aug 22, 2025. It is now read-only.

[CROSSDATA-709]Crossdata shell includes server dependencies when installing the deb #735

Open
jjlopezm wants to merge 6 commits into
base: master
Choose a base branch
from
Open

[CROSSDATA-709]Crossdata shell includes server dependencies when installing the deb #735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f70275f
Separate directory for driber and server libs
Oct 11, 2016
d68992d
Merge branch 'master' into ReorganizeLibs
mafernandez-stratio Oct 18, 2016
c0ef8fd
Merge branch 'master' of github.com:Stratio/Crossdata into Reorganize…
Oct 25, 2016
5662087
Merge branch 'master' into ReorganizeLibs
mafernandez-stratio Oct 25, 2016
981d3aa
Change spark jars path in server-application.conf
Oct 25, 2016
c801cac
Merge branch 'ReorganizeLibs' of github.com:jjlopezm/crossdata into R…
Oct 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,13 +188,13 @@
<from>
${project.build.directory}/crossdata-dist-${project.parent.version}/lib/com/stratio/crossdata/crossdata-server_${scala.binary.version}/${project.parent.version}
</from>
<to>/opt/sds/crossdata/lib</to>
<to>/opt/sds/crossdata/lib/server</to>
</copyDirectory>
<copyDirectory>
<from>
${project.build.directory}/crossdata-dist-${project.parent.version}/lib/com/stratio/crossdata/crossdata-driver_${scala.binary.version}/${project.parent.version}
</from>
<to>/opt/sds/crossdata/lib</to>
<to>/opt/sds/crossdata/lib/shell</to>
</copyDirectory>
<copyDirectory>
<from>
Expand Down
2 changes: 1 addition & 1 deletion dist/src/main/resources/server/crossdata-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if [ -z $CROSSDATA_LOGS ];then
CROSSDATA_LOGS=$(pwd)
fi
# CROSSDATA_LIB
CROSSDATA_LIB="${CROSSDATA_HOME}/lib"
CROSSDATA_LIB="${CROSSDATA_HOME}/lib/server"
# CROSSDATA_BIN
CROSSDATA_BIN="${CROSSDATA_HOME}/bin"
# CROSSDATA_LOG_OUT
Expand Down
2 changes: 1 addition & 1 deletion dist/src/main/resources/server/server-application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#crossdata-server.config.spark.app.name = "CrossdataServer"
#crossdata-server.config.spark.master = "local[*]"
#crossdata-server.config.spark.akka.heartbeat.interval = 5000
#crossdata-server.config.spark.jars = "/opt/sds/crossdata/lib/crossdata-server_${scala.binary.version}-${project.version}-jar-with-dependencies.jar"
#crossdata-server.config.spark.jars = "/opt/sds/crossdata/lib/server/crossdata-server_${scala.binary.version}-${project.version}-jar-with-dependencies.jar"
#crossdata-server.config.spark.driver.maxResultSize = 1G
#crossdata-server.config.spark.scheduler.mode = "FAIR"

Expand Down
2 changes: 1 addition & 1 deletion dist/src/main/resources/shell/crossdata-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if [ -z $CROSSDATA_SHELL_LOGS ];then
CROSSDATA_SHELL_LOGS=$(pwd)
fi
# CROSSDATA_LIB
CROSSDATA_SHELL_LIB="${CROSSDATA_SHELL_HOME}/lib"
CROSSDATA_SHELL_LIB="${CROSSDATA_SHELL_HOME}/lib/shell"

# CROSSDATA_BIN
CROSSDATA_SHELL_BIN="${CROSSDATA_SHELL_HOME}/bin"
Expand Down
54 changes: 31 additions & 23 deletions driver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
<include>io.netty:netty</include>
<include>org.slf4j:slf4j-api</include>
<include>org.slf4j:slf4j-log4j12</include>
<include>log4j:log4j:jar</include>
<include>log4j:log4j</include>
<include>org.scala-lang:scala-library</include>
<include>org.scala-lang:scala-reflect</include>
<include>org.scala-lang:scala-compiler</include>
Expand Down Expand Up @@ -273,28 +273,36 @@
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>jar-with-dependencies</shadedClassifierName>
<minimizeJar>true</minimizeJar>
<artifactSet>
<includes>
<include>com.stratio.crossdata:crossdata-common_${scala.binary.version}</include>
<include>com.stratio.crossdata:crossdata-driver_${scala.binary.version}</include>
<include>org.apache.spark:spark-catalyst_${scala.binary.version}</include>
<include>com.typesafe.akka:akka-actor_${scala.binary.version}</include>
<include>com.typesafe.akka:akka-cluster_${scala.binary.version}</include>
<include>com.typesafe.akka:akka-contrib_${scala.binary.version}</include>
<include>com.typesafe.akka:akka-remote_${scala.binary.version}</include>
<include>com.typesafe.akka:akka-slf4j_${scala.binary.version}</include>
<include>com.google.guava:guava</include>
<include>io.netty:netty-all</include>
<include>io.netty:netty</include>
<include>log4j:log4j:jar</include>
<include>org.scala-lang:scala-library</include>
<include>org.scala-lang:scala-reflect</include>
<include>org.scala-lang:scala-compiler</include>
<include>org.scala-lang:scalap</include>
<include>jline:jline</include>
</includes>
</artifactSet>
<minimizeJar>false</minimizeJar>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>reference.conf</resource>
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>
META-INF/services/com.stratio.crossdata.connector.FunctionInventory
</resource>
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>
META-INF/services/org.apache.spark.sql.sources.DataSourceRegister
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
<executions>
<execution>
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/resources/server-reference.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ crossdata-server.config.spark.app.name = "CrossdataServer"
crossdata-server.config.spark.master = "local[*]"
crossdata-server.config.spark.master = ${?CROSSDATA_SERVER_CONFIG_SPARK_MASTER}
crossdata-server.config.spark.akka.heartbeat.interval = 5000
crossdata-server.config.spark.jars = "/opt/sds/crossdata/lib/crossdata-server_${scala.binary.version}-${project.version}-jar-with-dependencies.jar"
crossdata-server.config.spark.jars = "/opt/sds/crossdata/lib/server/crossdata-server_${scala.binary.version}-${project.version}-jar-with-dependencies.jar"
crossdata-server.config.spark.jars = ${?CROSSDATA_SERVER_CONFIG_SPARK_JARS}
crossdata-server.config.spark.driver.maxResultSize = 1G
crossdata-server.config.spark.driver.maxResultSize = ${?CROSSDATA_SERVER_CONFIG_SPARK_DRIVER_MAXRESULTSIZE}
Expand Down