Skip to content

Commit a99af17

Browse files
agilelab-tmnd1991agilelab-tmnd1991
committed
[#508] Scala 2.12 vanilla build of wasp
# New features and improvements New flavor of Wasp: vanilla 2.12 which is exactly like vanilla but with scala 2.12 dependencies and sources. # Breaking changes None. # Migration None. # Bug fixes None. # Related issue Closes #508
1 parent 19e9c98 commit a99af17

File tree

134 files changed

+2936
-92
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+2936
-92
lines changed

‎.gitlab-ci.yml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ test-kernel:
3030
image: "hseeberger/scala-sbt:8u282_1.5.5_2.11.12"
3131
parallel:
3232
matrix:
33-
- WASP_FLAVOR: [ "VANILLA2", "CDH6" ]
33+
- WASP_FLAVOR: [ "VANILLA2", "CDH6", "VANILLA2_2_12" ]
3434
script:
3535
- ./run-sbt-unprivileged.sh "clean coverageOn wasp-kernel/test coverageOff wasp-kernel/coverageReport wasp-kernel/coverageAggregate"
3636
after_script:
@@ -39,7 +39,7 @@ test-kernel:
3939
artifacts:
4040
reports:
4141
junit: 'test-output/*.xml'
42-
cobertura: 'target/scala-2.11/coverage-report/cobertura.xml'
42+
cobertura: 'target/scala-2.*/coverage-report/cobertura.xml'
4343
tags:
4444
- gitlab-org
4545
only:
@@ -54,7 +54,7 @@ test-plugin:
5454
image: "hseeberger/scala-sbt:8u282_1.5.5_2.11.12"
5555
parallel:
5656
matrix:
57-
- WASP_FLAVOR: [ "VANILLA2", "CDH6" ]
57+
- WASP_FLAVOR: [ "VANILLA2", "CDH6", "VANILLA2_2_12" ]
5858
script:
5959
- ./run-sbt-unprivileged.sh "clean coverageOn wasp-plugin/test coverageOff wasp-plugin/coverageReport wasp-plugin/coverageAggregate"
6060
after_script:
@@ -63,7 +63,7 @@ test-plugin:
6363
artifacts:
6464
reports:
6565
junit: 'test-output/*.xml'
66-
cobertura: 'target/scala-2.11/coverage-report/cobertura.xml'
66+
cobertura: 'target/scala-2.*/coverage-report/cobertura.xml'
6767
tags:
6868
- gitlab-org
6969
only:
@@ -78,7 +78,7 @@ test-repo:
7878
image: "hseeberger/scala-sbt:8u282_1.5.5_2.11.12"
7979
parallel:
8080
matrix:
81-
- WASP_FLAVOR: ["VANILLA2", "CDH6"]
81+
- WASP_FLAVOR: ["VANILLA2", "CDH6", "VANILLA2_2_12"]
8282
script:
8383
- ./run-sbt-unprivileged.sh "clean coverageOn wasp-repository/test coverageOff wasp-repository/coverageReport wasp-repository/coverageAggregate"
8484
after_script:
@@ -87,7 +87,7 @@ test-repo:
8787
artifacts:
8888
reports:
8989
junit: 'test-output/*.xml'
90-
cobertura: 'target/scala-2.11/coverage-report/cobertura.xml'
90+
cobertura: 'target/scala-2.*/coverage-report/cobertura.xml'
9191
tags:
9292
- gitlab-org
9393
only:
@@ -127,7 +127,7 @@ snapshot:
127127
image: "hseeberger/scala-sbt:8u282_1.5.5_2.11.12"
128128
parallel:
129129
matrix:
130-
- WASP_FLAVOR: [ "VANILLA2", "CDH6" ]
130+
- WASP_FLAVOR: [ "VANILLA2", "CDH6", "VANILLA2_2_12" ]
131131
script:
132132
- "mkdir -p $HOME/.sbt/gpg"
133133
- "echo $GPG_PUB | base64 -d > $HOME/.sbt/gpg/pubring.asc"
@@ -149,9 +149,8 @@ release:
149149
image: "hseeberger/scala-sbt:8u282_1.5.5_2.11.12"
150150
parallel:
151151
matrix:
152-
- WASP_FLAVOR: [ "VANILLA2", "CDH6" ]
152+
- WASP_FLAVOR: [ "VANILLA2", "CDH6", "VANILLA2_2_12" ]
153153
script:
154-
- export WASP_FLAVOR=VANILLA2
155154
- "mkdir -p $HOME/.sbt/gpg"
156155
- "echo $GPG_PUB | base64 -d > $HOME/.sbt/gpg/pubring.asc"
157156
- "echo $GPG_PRIV | base64 -d > $HOME/.sbt/gpg/secring.asc"

‎build.sbt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,8 @@ lazy val plugin = project
235235
plugin_mailer_spark,
236236
plugin_http_spark,
237237
plugin_mongo_spark,
238-
microservice_catalog
238+
microservice_catalog,
239+
plugin_elastic_spark
239240
)
240241

241242
/* Framework + Plugins */

‎compiler/build.sbt‎

Whitespace-only changes.

compiler/src/main/scala/tools/nsc/symtab/classfile/ClassfileParser.scala renamed to compiler/src/main/scala-2.11/scala/tools/nsc/symtab/classfile/ClassfileParser.scala

File renamed without changes.

‎compiler/src/test/resources/log4j.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
3+
<log4j:configuration debug="true"
4+
xmlns:log4j='http://jakarta.apache.org/log4j/'>
5+
<appender name="console" class="org.apache.log4j.ConsoleAppender">
6+
<layout class="org.apache.log4j.PatternLayout">
7+
<param name="ConversionPattern"
8+
value="%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n" />
9+
</layout>
10+
</appender>
11+
<root>
12+
<level value="ERROR" />
13+
<appender-ref ref="console" />
14+
</root>
15+
</log4j:configuration>

consumers-spark/src/test/resources/log4j2-test.xml renamed to compiler/src/test/resources/log4j2.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
</Console>
77
</Appenders>
88
<Loggers>
9-
<Logger name="it.agilelab" level="TRACE" additivity="false">
10-
<AppenderRef ref="Console"/>
11-
</Logger>
129
<Root level="ERROR">
1310
<AppenderRef ref="Console"/>
1411
</Root>

‎consumers-rt/src/test/resources/log4j.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
3+
<log4j:configuration debug="true"
4+
xmlns:log4j='http://jakarta.apache.org/log4j/'>
5+
<appender name="console" class="org.apache.log4j.ConsoleAppender">
6+
<layout class="org.apache.log4j.PatternLayout">
7+
<param name="ConversionPattern"
8+
value="%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n" />
9+
</layout>
10+
</appender>
11+
<root>
12+
<level value="ERROR" />
13+
<appender-ref ref="console" />
14+
</root>
15+
</log4j:configuration>

‎consumers-rt/src/test/resources/log4j2.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Configuration status="WARN">
3+
<Appenders>
4+
<Console name="Console" target="SYSTEM_OUT">
5+
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
6+
</Console>
7+
</Appenders>
8+
<Loggers>
9+
<Root level="ERROR">
10+
<AppenderRef ref="Console"/>
11+
</Root>
12+
</Loggers>
13+
</Configuration>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,9 @@ case class InnerEventStrategy(configuration: Config, clock: Clock, idGen: IDGene
4141

4242
private def randomStr(len: Int): String = RandomStringUtils.randomAlphanumeric(len) //Special char free
4343

44-
private val generateId: () => String = () => idGen.generate()
45-
private val generateId_UFD = udf(generateId)
44+
private val generateId_UFD = udf(() => idGen.generate())
4645

47-
private val currentTimeMillis: () => Long = () => clock.millis()
48-
private val currentTimeMillisUDF = udf(currentTimeMillis)
46+
private val currentTimeMillisUDF = udf(() => clock.millis())
4947

5048

5149
/**

‎consumers-spark/src/main/scala/it/agilelab/bigdata/wasp/consumers/spark/strategies/EnrichmentStrategy.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ trait EnrichmentStrategy extends Strategy {
1717
case _ => Class.forName(sourceInfo.kind).newInstance().asInstanceOf[Enricher]
1818
}
1919

20-
TaskContext.get().addTaskCompletionListener(task => {
20+
TaskContext.get().addTaskCompletionListener[Unit](task => {
2121
enricher.close()
2222
})
2323

0 commit comments

Comments
 (0)