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

Commit 59fc2fd

Browse files
[testAT] pom cleanshing & dependency bump (#735)
1 parent 1622222 commit 59fc2fd

2 files changed

Lines changed: 7 additions & 54 deletions

File tree

Jenkinsfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@ hose {
113113
| -DDCOS_CLI_HOST=%%DCOSCLI#0
114114
| -DCROSSDATA_DOCKER_IMAGE=qa.stratio.com/stratio/crossdata-scala211
115115
| -DXD_PG_POLICIES=true
116-
| -DXD_METRICS=true
117-
| -DXD_HASH_COLUMNS=true
118-
| -DXD_CUSTOM_USERS=crossdata-1.marathon.mesos,crossdata.marathon.mesos
119-
| -DXD_ELASTIC=true
120-
| -DPOSTGRES_FRAMEWORK_ID_XD=postgrestls
121-
| """.stripMargin().stripIndent()
116+
| -DXD_METRICS=true
117+
| -DXD_HASH_COLUMNS=true
118+
| -DXD_CUSTOM_USERS=crossdata-1.marathon.mesos,crossdata.marathon.mesos
119+
| -DXD_ELASTIC=true
120+
| -DPOSTGRES_FRAMEWORK_ID_XD=postgrestls
121+
| """.stripMargin().stripIndent()
122122

123123
DEV = { config ->
124124
doCompile(conf: config, crossbuild: 'scala-2.11')

testsAT/pom.xml

Lines changed: 1 addition & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616

1717
<properties>
1818
<stratio-test-bdd.version>0.9.0</stratio-test-bdd.version>
19-
<crossdata.version>${project.version}</crossdata.version>
20-
<crossdata.driverxs.version>0.2.0-SNAPSHOT</crossdata.driverxs.version>
21-
<!-- crossdata.driverxs.version>0.1.3-ca906cf</crossdata.driverxs.version -->
19+
<crossdata.driverxs.version>0.2.2-fabbfa7</crossdata.driverxs.version>
2220
<apache.spark.version>2.2.0</apache.spark.version>
2321
<stratio.spark.version>2.3.0-7180ac5</stratio.spark.version>
2422
<commons-lang3.version>3.7</commons-lang3.version>
@@ -174,29 +172,6 @@
174172
<artifactId>hamcrest-all</artifactId>
175173
<version>1.3</version>
176174
</dependency>
177-
<!-- dependency>
178-
<groupId>com.stratio.crossdata</groupId>
179-
<artifactId>crossdata-core_2.11</artifactId>
180-
<version>${crossdata.version}</version>
181-
<exclusions>
182-
<exclusion>
183-
<groupId>org.apache.spark</groupId>
184-
<artifactId>spark-core-${apache.spark.version}_${scala.binary.version}</artifactId>
185-
</exclusion>
186-
<exclusion>
187-
<groupId>org.apache.spark</groupId>
188-
<artifactId>spark-sql-${apache.spark.version}_${scala.binary.version}</artifactId>
189-
</exclusion>
190-
<exclusion>
191-
<groupId>org.slf4j</groupId>
192-
<artifactId>slf4j-log4j12</artifactId>
193-
</exclusion>
194-
<exclusion>
195-
<groupId>org.apache.logging.log4j</groupId>
196-
<artifactId>log4j-1.2-api</artifactId>
197-
</exclusion>
198-
</exclusions>
199-
</dependency -->
200175
<dependency>
201176
<groupId>com.stratio.crossdata</groupId>
202177
<artifactId>crossdata-driverxs_2.11</artifactId>
@@ -218,27 +193,5 @@
218193
<version>11.0.2</version>
219194
<scope>test</scope>
220195
</dependency>
221-
<!-- dependency>
222-
<groupId>com.stratio.spark</groupId>
223-
<artifactId>spark-sql-${apache.spark.version}_${scala.binary.version}</artifactId>
224-
<version>${stratio.spark.version}</version>
225-
<scope>test</scope>
226-
</dependency>
227-
<dependency>
228-
<groupId>com.stratio.spark</groupId>
229-
<artifactId>spark-core-${apache.spark.version}_${scala.binary.version}</artifactId>
230-
<version>${stratio.spark.version}</version>
231-
<scope>test</scope>
232-
<exclusions>
233-
<exclusion>
234-
<groupId>com.ning</groupId>
235-
<artifactId>compress-lzf</artifactId>
236-
</exclusion>
237-
<exclusion>
238-
<groupId>io.netty</groupId>
239-
<artifactId>netty</artifactId>
240-
</exclusion>
241-
</exclusions>
242-
</dependency -->
243196
</dependencies>
244197
</project>

0 commit comments

Comments
 (0)