Skip to content

Commit 935864e

Browse files
andr3a87agilelab-tmnd1991
authored andcommitted
[#563] Create flavor for cdp 719
# New features and improvements Create the flavor for CDP 7.1.9 # Related issue Closes #563
1 parent 7c7927b commit 935864e

File tree

11 files changed

+251
-275
lines changed

11 files changed

+251
-275
lines changed

.gitlab-ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ test-kernel:
3030
image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.9.8-8u402-b06-jdk-jammy"
3131
parallel:
3232
matrix:
33-
- WASP_FLAVOR: [ "VANILLA2", "VANILLA2_2_12", "EMR_2_12", "CDP717"]
33+
- WASP_FLAVOR: [ "VANILLA2", "VANILLA2_2_12", "EMR_2_12", "CDP719"]
3434
script:
3535
- ./run-sbt-unprivileged.sh "clean coverageOn wasp-kernel/test coverageOff wasp-kernel/coverageReport wasp-kernel/coverageAggregate"
3636
after_script:
@@ -56,7 +56,7 @@ test-plugin:
5656
image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.9.8-8u402-b06-jdk-jammy"
5757
parallel:
5858
matrix:
59-
- WASP_FLAVOR: [ "VANILLA2", "VANILLA2_2_12", "EMR_2_12", "CDP717"]
59+
- WASP_FLAVOR: [ "VANILLA2", "VANILLA2_2_12", "EMR_2_12", "CDP719"]
6060
script:
6161
- ./run-sbt-unprivileged.sh "clean coverageOn wasp-plugin/test coverageOff wasp-plugin/coverageReport wasp-plugin/coverageAggregate"
6262
after_script:
@@ -83,7 +83,7 @@ test-repo:
8383
image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.9.8-8u402-b06-jdk-jammy"
8484
parallel:
8585
matrix:
86-
- WASP_FLAVOR: [ "VANILLA2", "VANILLA2_2_12", "EMR_2_12", "CDP717"]
86+
- WASP_FLAVOR: [ "VANILLA2", "VANILLA2_2_12", "EMR_2_12", "CDP719"]
8787
script:
8888
- ./run-sbt-unprivileged.sh "clean coverageOn wasp-repository/test coverageOff wasp-repository/coverageReport wasp-repository/coverageAggregate"
8989
after_script:
@@ -109,7 +109,7 @@ compile-whitelabel:
109109
image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.9.8-8u402-b06-jdk-jammy"
110110
parallel:
111111
matrix:
112-
- WASP_FLAVOR: [ "VANILLA2", "VANILLA2_2_12", "EMR_2_12", "CDP717"]
112+
- WASP_FLAVOR: [ "VANILLA2", "VANILLA2_2_12", "EMR_2_12", "CDP719"]
113113
script:
114114
- ./run-sbt-unprivileged.sh "clean wasp-whitelabel/test"
115115
tags:
@@ -170,7 +170,7 @@ snapshot:
170170
image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.9.8-8u402-b06-jdk-jammy"
171171
parallel:
172172
matrix:
173-
- WASP_FLAVOR: [ "VANILLA2", "VANILLA2_2_12", "EMR_2_12", "CDP717"]
173+
- WASP_FLAVOR: [ "VANILLA2", "VANILLA2_2_12", "EMR_2_12", "CDP719"]
174174
tags:
175175
- gitlab-org
176176
script:
@@ -194,7 +194,7 @@ release:
194194
image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.9.8-8u402-b06-jdk-jammy"
195195
parallel:
196196
matrix:
197-
- WASP_FLAVOR: [ "VANILLA2", "VANILLA2_2_12", "EMR_2_12", "CDP717"]
197+
- WASP_FLAVOR: [ "VANILLA2", "VANILLA2_2_12", "EMR_2_12", "CDP719"]
198198
script:
199199
- "mkdir -p $HOME/.sbt/gpg"
200200
- "echo $GPG_PUB | base64 -d > $HOME/.sbt/gpg/pubring.asc"

consumers-spark/src/main/scala/it/agilelab/bigdata/wasp/consumers/spark/eventengine/MailStrategy.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ object VelocityTemplateComposer {
374374
// TODO: instead of null logging, redirect velocity log to wasp logging
375375
val p = new Properties()
376376
p.setProperty("runtime.log.logsystem.class", classOf[NullLogChute].getCanonicalName)
377-
if (BuildInfo.flavor != "CDP717") {
377+
if (BuildInfo.flavor != "CDP719") {
378378
p.put("runtime.log.logsystem", new NullLogChute())
379379
}
380380
p

consumers-spark/src/main/scala/it/agilelab/bigdata/wasp/consumers/spark/strategies/gdpr/config/DeletionConfig.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ object HBaseDeletionConfig extends Logging {
257257
private def scanPrefixWithTime(config: Config,
258258
keysToDelete: RDD[RowKeyWithCorrelation],
259259
matchingStrategy: PrefixAndTimeBoundKeyValueMatchingStrategy): RDD[(RowKeyWithCorrelation, Scan)] = {
260-
val formatter: DateTimeFormatter = DateTimeFormatter.ofPattern(matchingStrategy.pattern, new Locale(matchingStrategy.locale))
260+
val formatter: DateTimeFormatter = DateTimeFormatter.ofPattern(matchingStrategy.pattern, Locale.forLanguageTag(matchingStrategy.locale))
261261

262262
val startDate = wrapConfigException(config.getLong(START_PERIOD_KEY))
263263
val endDate = wrapConfigException(config.getLong(END_PERIOD_KEY))

core/src/main/java/org/apache/avro/io/NoWrappingJsonEncoder.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,6 @@ public NoWrappingJsonEncoder(Schema sc, OutputStream out) throws IOException {
1212
super(sc, out);
1313
}
1414

15-
public NoWrappingJsonEncoder(Schema sc, OutputStream out, boolean pretty) throws IOException {
16-
super(sc, out, pretty);
17-
}
18-
19-
public NoWrappingJsonEncoder(Schema sc, JsonGenerator out) throws IOException {
20-
super(sc, out);
21-
}
22-
2315
@Override
2416
public void writeIndex(int unionIndex) throws IOException {
2517
parser.advance(Symbol.UNION);

documentation/building.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
Wasp is built and tested under different flavours:
44

5-
| FLAVOR | Spark | Scala | Hadoop | Transitive dependencies | postfix |
6-
| ---- | ---- | ---- | ---- | ---- | ---- |
7-
| VANILLA2 | 2.4.8 | 2.11 | 2.x || None |
8-
| VANILLA2_2_12 | 2.4.8 | 2.12 | 2.x || None |
9-
| CDH6 | 2.4cdh6.3.2 | 2.11 | 3.0.0cdh6.3.2 || cdh6 |
10-
| CDP711 | 2.4.7.7.1.7.0-551 | 2.11 | 3.1.1.7.1.7.0-551|| cdp711 |
5+
| FLAVOR | Spark | Scala | Hadoop | Transitive dependencies | postfix |
6+
| ---- |-------------------| ---- |-------------------| ---- | ---- |
7+
| VANILLA2 | 2.4.8 | 2.11 | 2.x || None |
8+
| VANILLA2_2_12 | 2.4.8 | 2.12 | 2.x || None |
9+
| CDH6 | 2.4cdh6.3.2 | 2.11 | 3.0.0cdh6.3.2 || cdh6 |
10+
| CDP711 | 2.4.8.7.1.9.0-387 | 2.11 | 3.1.1.7.1.9.0-387 || cdp719 |
1111

1212
Flavors should change the artifact version (or the artifactId) so that they can all be published without conflicts.
1313
For that reason, the "postfix" of the flavor is appended to the version of the artifact (before the SNAPSHOT qualifier, if present).

project/CDP717Versions.scala

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)