Skip to content

Commit 09eface

Browse files
[!438] - Update sbt plugins to avoid eviction errors
# New features and improvements - Upgrade scoverage to 1.9.3 - upgrade sbt-native-packager to 1.11.0 - upgrade sbt-buildinfo to 1.13.1 - upgrade sbt-sonatype to 3.9.21 - upgrade sbt-gpg to 2.3.1 # Breaking changes None. # Migration None. # Bug fixes Fix coverage report to gitlab # How this feature was tested Pipelines. # Related issue None.
1 parent 669b347 commit 09eface

File tree

4 files changed

+24
-23
lines changed

4 files changed

+24
-23
lines changed

.gitlab-ci.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ test-kernel:
3232
matrix:
3333
- WASP_FLAVOR: [ "VANILLA2", "VANILLA2_2_12", "CDP719", "EMR_6_13" ]
3434
script:
35-
- ./run-sbt-unprivileged.sh "clean coverageOn wasp-kernel/test coverageOff wasp-kernel/coverageReport wasp-kernel/coverageAggregate"
35+
- ./run-sbt-unprivileged.sh "clean coverage wasp-kernel/test wasp-kernel/coverageAggregate"
3636
after_script:
3737
- mkdir test-output
3838
- find . -path '*/test-reports/*.xml' -exec cp '{}' ./test-output/ \;
39+
coverage: '/Aggregation complete. Coverage was \[(\d+.\d+)\]/'
3940
artifacts:
4041
reports:
4142
junit: 'test-output/*.xml'
@@ -58,11 +59,12 @@ test-plugin:
5859
matrix:
5960
- WASP_FLAVOR: [ "VANILLA2", "VANILLA2_2_12", "CDP719", "EMR_6_13" ]
6061
script:
61-
- ./run-sbt-unprivileged.sh "clean coverageOn wasp-plugin/test coverageOff wasp-plugin/coverageReport wasp-plugin/coverageAggregate"
62+
- ./run-sbt-unprivileged.sh "clean coverage wasp-plugin/test wasp-plugin/coverageAggregate"
6263
after_script:
6364
- ls -R ${CI_PROJECT_DIR}/sbt-cache/ivy/jars/
6465
- mkdir test-output
6566
- find . -path '*/test-reports/*.xml' -exec cp '{}' ./test-output/ \;
67+
coverage: '/Aggregation complete. Coverage was \[(\d+.\d+)\]/'
6668
artifacts:
6769
reports:
6870
junit: 'test-output/*.xml'
@@ -85,10 +87,11 @@ test-repo:
8587
matrix:
8688
- WASP_FLAVOR: [ "VANILLA2", "VANILLA2_2_12", "CDP719", "EMR_6_13" ]
8789
script:
88-
- ./run-sbt-unprivileged.sh "clean coverageOn wasp-repository/test coverageOff wasp-repository/coverageReport wasp-repository/coverageAggregate"
90+
- ./run-sbt-unprivileged.sh "clean coverage wasp-repository/test wasp-repository/coverageAggregate"
8991
after_script:
9092
- mkdir test-output
9193
- find . -path '*/test-reports/*.xml' -exec cp '{}' ./test-output/ \;
94+
coverage: '/Aggregation complete. Coverage was \[(\d+.\d+)\]/'
9295
artifacts:
9396
reports:
9497
junit: 'test-output/*.xml'

consumers-spark/src/main/scala/it/agilelab/bigdata/wasp/consumers/spark/streaming/actor/master/SparkConsumersStreamingMasterGuardian.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ class SparkConsumersStreamingMasterGuardian(
145145
case (Initializing, Initialized) =>
146146
unstashAll()
147147
log.debug("Unstashing")
148-
log.info(s"Setting ${Timers.unschedulableCheck} to recover unshedulable pipegraphs")
148+
log.info(s"Setting ${Timers.unschedulableCheck} to recover unschedulable pipegraphs")
149149
setTimer(Timers.unschedulableCheck, RecoverUnschedulable, unschedulableCheckInterval, repeat = true)
150150
}
151151

project/Settings.scala

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,17 @@ class BasicResolvers extends Resolvers {
3636
val confluent = "confluent" at "https://packages.confluent.io/maven/"
3737
val google = "Google Maven" at "https://maven.google.com/"
3838

39-
val sonatypeReleaseRepos = Resolver.sonatypeRepo("releases")
40-
val sonatypeSnapshotsRepos = Resolver.sonatypeRepo("snapshots")
39+
val sonatypeReleaseRepos = Resolver.sonatypeOssRepos("releases")
40+
val sonatypeSnapshotsRepos = Resolver.sonatypeOssRepos("snapshots")
4141

4242
/** custom resolvers for dependencies */
4343
val resolvers = Seq(
4444
repo1Maven2,
4545
confluent,
46-
sonatypeReleaseRepos,
47-
sonatypeSnapshotsRepos,
4846
google,
49-
mavenLocalRepo,
50-
)
47+
mavenLocalRepo
48+
) ++ sonatypeReleaseRepos ++ sonatypeSnapshotsRepos
49+
5150
}
5251

5352
class BasicSettings(
@@ -118,15 +117,14 @@ class BasicSettings(
118117
compilerPlugin("com.github.ghik" % "silencer-plugin" % silencerVersion cross CrossVersion.full),
119118
"com.github.ghik" % "silencer-lib" % silencerVersion % Provided cross CrossVersion.full
120119
)
121-
} else if(scalaVersionValue.isMajorMinor(2, 12) && scalaVersionValue.revision >= 13){
120+
} else if (scalaVersionValue.isMajorMinor(2, 12) && scalaVersionValue.revision >= 13) {
122121
val silencerVersion = "1.17.13" // compatible with 2.11.12 and 2.12.10
123122

124123
Seq(
125124
compilerPlugin("com.github.ghik" % "silencer-plugin" % silencerVersion cross CrossVersion.full),
126125
"com.github.ghik" % "silencer-lib" % silencerVersion % Provided cross CrossVersion.full
127-
) }
128-
else
129-
{
126+
)
127+
} else {
130128
Seq()
131129
}
132130
},

project/plugins.sbt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
// This is needed because the meta-build (i.e. the build of sbt code to actually build the project)
2-
// has some incosistent scala_xml dependencies (due to plugins) but luckily they don't cause
3-
// any issue
4-
ThisBuild / evictionErrorLevel := Level.Info
51
// sbt-buildinfo, for accessing build information in the code - https://github.com/sbt/sbt-buildinfo/
6-
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
2+
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
73
// sbt-native-packager, used for assembly jars for the start-wasp script
8-
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1")
4+
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.0")
95
// test coverage
10-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.0")
6+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3")
117
// perform release on sonatype
12-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10")
8+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21")
139
// sign artifacts
14-
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
10+
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")
1511
addDependencyTreePlugin
12+
13+
// in this way it does not complain if we have two different versions of scala-xml (sbt-scoverage here is the issue)
14+
// but we can't upgrade it to 2.x because it drops scala 2.11 support
15+
libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always

0 commit comments

Comments
 (0)