Skip to content

Commit 6bd88f4

Browse files
author
mpenate
authored
added dependency fix and scalastyle profile
1 parent 659201c commit 6bd88f4

File tree

2 files changed

+81
-25
lines changed

2 files changed

+81
-25
lines changed

distribution/pom.xml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,58 @@
99
<packaging>pom</packaging>
1010
<name>Spark tgz distribution</name>
1111
<dependencies>
12+
<!--Trying to make reactor build this module the last one-->
1213
<dependency>
1314
<groupId>com.stratio.spark</groupId>
1415
<artifactId>spark-mesos_2.11</artifactId>
1516
<version>${project.version}</version>
1617
</dependency>
18+
<dependency>
19+
<groupId>com.stratio.spark</groupId>
20+
<artifactId>spark-streaming-kafka-0-10_2.11</artifactId>
21+
<version>${project.version}</version>
22+
</dependency>
23+
<dependency>
24+
<groupId>com.stratio.spark</groupId>
25+
<artifactId>spark-core_${scala.binary.version}</artifactId>
26+
<version>${project.version}</version>
27+
</dependency>
28+
<dependency>
29+
<groupId>com.stratio.spark</groupId>
30+
<artifactId>spark-mllib_${scala.binary.version}</artifactId>
31+
<version>${project.version}</version>
32+
</dependency>
33+
<dependency>
34+
<groupId>com.stratio.spark</groupId>
35+
<artifactId>spark-streaming_${scala.binary.version}</artifactId>
36+
<version>${project.version}</version>
37+
</dependency>
38+
<dependency>
39+
<groupId>com.stratio.spark</groupId>
40+
<artifactId>spark-graphx_${scala.binary.version}</artifactId>
41+
<version>${project.version}</version>
42+
</dependency>
43+
<dependency>
44+
<groupId>com.stratio.spark</groupId>
45+
<artifactId>spark-sql_${scala.binary.version}</artifactId>
46+
<version>${project.version}</version>
47+
</dependency>
48+
<dependency>
49+
<groupId>com.stratio.spark</groupId>
50+
<artifactId>spark-repl_${scala.binary.version}</artifactId>
51+
<version>${project.version}</version>
52+
</dependency>
53+
<dependency>
54+
<groupId>com.stratio.spark</groupId>
55+
<artifactId>spark-assembly_2.11</artifactId>
56+
<version>${project.version}</version>
57+
<type>pom</type>
58+
</dependency>
59+
<dependency>
60+
<groupId>com.stratio.spark</groupId>
61+
<artifactId>spark-examples_2.11</artifactId>
62+
<version>${project.version}</version>
63+
</dependency>
1764
</dependencies>
1865
<build>
1966
<plugins>

pom.xml

Lines changed: 34 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2330,31 +2330,7 @@
23302330
<groupId>org.apache.maven.plugins</groupId>
23312331
<artifactId>maven-source-plugin</artifactId>
23322332
</plugin>
2333-
<plugin>
2334-
<groupId>org.scalastyle</groupId>
2335-
<artifactId>scalastyle-maven-plugin</artifactId>
2336-
<version>0.8.0</version>
2337-
<configuration>
2338-
<verbose>false</verbose>
2339-
<failOnViolation>false</failOnViolation>
2340-
<includeTestSourceDirectory>false</includeTestSourceDirectory>
2341-
<failOnWarning>false</failOnWarning>
2342-
<sourceDirectory>${basedir}/src/main/scala</sourceDirectory>
2343-
<testSourceDirectory>${basedir}/src/test/scala</testSourceDirectory>
2344-
<configLocation>scalastyle-config.xml</configLocation>
2345-
<outputFile>${basedir}/target/scalastyle-output.xml</outputFile>
2346-
<inputEncoding>${project.build.sourceEncoding}</inputEncoding>
2347-
<outputEncoding>${project.reporting.outputEncoding}</outputEncoding>
2348-
</configuration>
2349-
<executions>
2350-
<execution>
2351-
<phase>test-compile</phase>
2352-
<goals>
2353-
<goal>check</goal>
2354-
</goals>
2355-
</execution>
2356-
</executions>
2357-
</plugin>
2333+
23582334

23592335
<plugin>
23602336
<groupId>org.apache.maven.plugins</groupId>
@@ -2412,6 +2388,39 @@
24122388
This profile is enabled automatically by the sbt built. It changes the scope for the guava
24132389
dependency, since we don't shade it in the artifacts generated by the sbt build.
24142390
-->
2391+
<profile>
2392+
<id>scalastyle</id>
2393+
<build>
2394+
<plugins>
2395+
<plugin>
2396+
<groupId>org.scalastyle</groupId>
2397+
<artifactId>scalastyle-maven-plugin</artifactId>
2398+
<version>0.8.0</version>
2399+
<configuration>
2400+
<verbose>false</verbose>
2401+
<failOnViolation>false</failOnViolation>
2402+
<includeTestSourceDirectory>false</includeTestSourceDirectory>
2403+
<failOnWarning>false</failOnWarning>
2404+
<sourceDirectory>${basedir}/src/main/scala</sourceDirectory>
2405+
<testSourceDirectory>${basedir}/src/test/scala</testSourceDirectory>
2406+
<configLocation>scalastyle-config.xml</configLocation>
2407+
<outputFile>${basedir}/target/scalastyle-output.xml</outputFile>
2408+
<inputEncoding>${project.build.sourceEncoding}</inputEncoding>
2409+
<outputEncoding>${project.reporting.outputEncoding}</outputEncoding>
2410+
</configuration>
2411+
<executions>
2412+
<execution>
2413+
<phase>test-compile</phase>
2414+
<goals>
2415+
<goal>check</goal>
2416+
</goals>
2417+
</execution>
2418+
</executions>
2419+
</plugin>
2420+
</plugins>
2421+
</build>
2422+
</profile>
2423+
24152424
<profile>
24162425
<id>sbt</id>
24172426
<dependencies>

0 commit comments

Comments
 (0)