Skip to content

Commit

Permalink
Removed unused build setting on sbt file
Browse files Browse the repository at this point in the history
  • Loading branch information
xingzhang-suse authored and BinX-Suse committed Nov 21, 2024
1 parent c9ab4dc commit cf9ae67
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ export class GlobalNotificationsComponent implements OnInit {
.getVersion()
.pipe(
map(version => {
let _version = version.replace(/^\"|\"$/g, "");
let _version = version.replace(/^\"|\"$/g, '');
if (_version && _version[0] === 'v') {
return _version.substring(1);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -835,11 +835,13 @@ export class SecurityEventsComponent
editSecEventTime - getIpGeoInfoTime
);

let mergedSecEvents = [].concat(this.threatList)
let mergedSecEvents = []
.concat(this.threatList)
.concat(this.violationList)
.concat(this.incidentList);

this.securityEventsService.cachedSecurityEvents = _.cloneDeep(mergedSecEvents);
this.securityEventsService.cachedSecurityEvents =
_.cloneDeep(mergedSecEvents);

let mergeSecEventTime = new Date().getTime();
console.log(
Expand Down Expand Up @@ -882,7 +884,9 @@ export class SecurityEventsComponent
)!
);
} else {
this.securityEventsService.displayedSecurityEvents = _.cloneDeep(this.securityEventsService.cachedSecurityEvents);
this.securityEventsService.displayedSecurityEvents = _.cloneDeep(
this.securityEventsService.cachedSecurityEvents
);
this.printableData = this.getPrintableData(
this.securityEventsService.displayedSecurityEvents
);
Expand Down
20 changes: 10 additions & 10 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,16 @@ lazy val commonSettings = Seq(
)
)

lazy val buil1dSettings = Defaults.coreDefaultSettings ++ Seq(
scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature", "-target:jvm-1.7"),
libraryDependencies := Seq(scalaTest),
libraryDependencies += "javax.activation" % "activation" % "1.1.1",
libraryDependencies += "org.glassfish.jaxb" % "jaxb-runtime" % "4.0.5",
libraryDependencies += "javax.xml.bind" % "jaxb-api" % "2.3.1",
libraryDependencies += "com.sun.xml.ws" % "jaxws-ri" % "4.0.2",
libraryDependencies += "javax.xml.soap" % "javax.xml.soap-api" % "1.4.0",
libraryDependencies += "org.json4s" %% "json4s-native" % "4.0.7"
)
// lazy val buil1dSettings = Defaults.coreDefaultSettings ++ Seq(
// scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature", "-target:jvm-1.7"),
// libraryDependencies := Seq(scalaTest),
// libraryDependencies += "javax.activation" % "activation" % "1.1.1",
// libraryDependencies += "org.glassfish.jaxb" % "jaxb-runtime" % "4.0.5",
// libraryDependencies += "javax.xml.bind" % "jaxb-api" % "2.3.1",
// libraryDependencies += "com.sun.xml.ws" % "jaxws-ri" % "4.0.2",
// libraryDependencies += "javax.xml.soap" % "javax.xml.soap-api" % "1.4.0",
// libraryDependencies += "org.json4s" %% "json4s-native" % "4.0.7"
// )

lazy val manager = (project in file("."))
.aggregate(common, admin)
Expand Down

0 comments on commit cf9ae67

Please sign in to comment.