Upgraded to bazel 3.7.2 and rules_nodejs 2.3.2
Change-Id: If53686f2475c4f367909de577b4da95de8e16768
diff --git a/apps/cpman/app/src/main/java/org/onosproject/cpman/gui/CpmanViewMessageHandler.java b/apps/cpman/app/src/main/java/org/onosproject/cpman/gui/CpmanViewMessageHandler.java
index 873d23d..b3c1038 100644
--- a/apps/cpman/app/src/main/java/org/onosproject/cpman/gui/CpmanViewMessageHandler.java
+++ b/apps/cpman/app/src/main/java/org/onosproject/cpman/gui/CpmanViewMessageHandler.java
@@ -100,6 +100,7 @@
DeviceId deviceId = DeviceId.deviceId(uri);
if (cpms.availableResourcesSync(localNodeId, CONTROL_MESSAGE).contains(deviceId.toString())) {
Map<ControlMetricType, Long[]> data = generateMatrix(cpms, cs, deviceId);
+ @SuppressWarnings("FromTemporalAccessor")
LocalDateTime ldt = LocalDateTime.from(Instant.ofEpochMilli(timestamp * MILLI_CONV_UNIT));
populateMetrics(cm, data, ldt, NUM_OF_DATA_POINTS);
diff --git a/apps/faultmanagement/fm-gui2-lib/BUILD.bazel b/apps/faultmanagement/fm-gui2-lib/BUILD.bazel
index 6696777..2a3fa35 100644
--- a/apps/faultmanagement/fm-gui2-lib/BUILD.bazel
+++ b/apps/faultmanagement/fm-gui2-lib/BUILD.bazel
@@ -14,11 +14,11 @@
limitations under the License.
"""
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
+
package(default_visibility = ["//:__subpackages__"])
-load("@npm_angular_bazel//:index.bzl", "ng_module")
-
-ng_module(
+ts_library(
name = "fm-gui2-lib",
srcs = glob(
include = [
@@ -28,14 +28,18 @@
"**/*.spec.ts",
],
),
- assets = glob([
+ angular_assets = [
+ "//web/gui2-fw-lib:extra_css",
+ ] + glob([
"**/*.css",
"**/*.html",
]),
tsconfig = "//web/gui2:tsconfig.json",
+ use_angular_plugin = True,
deps = [
"//web/gui2-fw-lib",
"@npm//@angular/animations",
+ "@npm//@angular/common",
"@npm//@angular/core",
"@npm//@angular/forms",
"@npm//@angular/platform-browser-dynamic",
diff --git a/apps/inbandtelemetry/intApp-gui2/intApp/BUILD.bazel b/apps/inbandtelemetry/intApp-gui2/intApp/BUILD.bazel
index aecef14..dd62c08 100644
--- a/apps/inbandtelemetry/intApp-gui2/intApp/BUILD.bazel
+++ b/apps/inbandtelemetry/intApp-gui2/intApp/BUILD.bazel
@@ -14,11 +14,11 @@
limitations under the License.
"""
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
+
package(default_visibility = ["//:__subpackages__"])
-load("@npm_angular_bazel//:index.bzl", "ng_module")
-
-ng_module(
+ts_library(
name = "intapp-gui2-lib",
srcs = glob(
include = [
@@ -28,14 +28,18 @@
"**/*.spec.ts",
],
),
- assets = glob([
+ angular_assets = [
+ "//web/gui2-fw-lib:extra_css",
+ ] + glob([
"**/*.css",
"**/*.html",
]),
tsconfig = "//web/gui2:tsconfig.json",
+ use_angular_plugin = True,
deps = [
"//web/gui2-fw-lib",
"@npm//@angular/animations",
+ "@npm//@angular/common",
"@npm//@angular/core",
"@npm//@angular/forms",
"@npm//@angular/platform-browser-dynamic",
diff --git a/apps/roadm/web/roadm-gui/BUILD.bazel b/apps/roadm/web/roadm-gui/BUILD.bazel
index dd6bd33..b489b62 100644
--- a/apps/roadm/web/roadm-gui/BUILD.bazel
+++ b/apps/roadm/web/roadm-gui/BUILD.bazel
@@ -14,11 +14,11 @@
limitations under the License.
"""
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
+
package(default_visibility = ["//:__subpackages__"])
-load("@npm_angular_bazel//:index.bzl", "ng_module")
-
-ng_module(
+ts_library(
name = "roadm-gui",
srcs = glob(
include = [
@@ -28,14 +28,18 @@
"**/*.spec.ts",
],
),
- assets = glob([
+ angular_assets = [
+ "//web/gui2-fw-lib:extra_css",
+ ] + glob([
"**/*.css",
"**/*.html",
]),
tsconfig = "//web/gui2:tsconfig.json",
+ use_angular_plugin = True,
deps = [
"//web/gui2-fw-lib",
"@npm//@angular/animations",
+ "@npm//@angular/common",
"@npm//@angular/core",
"@npm//@angular/forms",
"@npm//@angular/platform-browser-dynamic",
diff --git a/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkDeviceManager.java b/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkDeviceManager.java
index 21ba3b9..d64b5b8 100644
--- a/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkDeviceManager.java
+++ b/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkDeviceManager.java
@@ -142,7 +142,7 @@
public PortStatistics getStatisticsForPort(DeviceId deviceId,
PortNumber portNumber) {
checkNotNull(deviceId, DEVICE_NULL);
- checkNotNull(deviceId, PORT_NUMBER_NULL);
+ checkNotNull(portNumber, PORT_NUMBER_NULL);
// TODO not supported at the moment.
return null;
}
@@ -151,7 +151,7 @@
public PortStatistics getDeltaStatisticsForPort(DeviceId deviceId,
PortNumber portNumber) {
checkNotNull(deviceId, DEVICE_NULL);
- checkNotNull(deviceId, PORT_NUMBER_NULL);
+ checkNotNull(portNumber, PORT_NUMBER_NULL);
// TODO not supported at the moment.
return null;
}
diff --git a/apps/yang-gui/yang-gui2-lib/BUILD.bazel b/apps/yang-gui/yang-gui2-lib/BUILD.bazel
index 2ba3714..38d2e14 100644
--- a/apps/yang-gui/yang-gui2-lib/BUILD.bazel
+++ b/apps/yang-gui/yang-gui2-lib/BUILD.bazel
@@ -14,9 +14,10 @@
limitations under the License.
"""
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
+
package(default_visibility = ["//:__subpackages__"])
-load("@npm_angular_bazel//:index.bzl", "ng_module")
load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
sass_binary(
@@ -39,7 +40,7 @@
src = ":lib/yangdetails/yangdetails.theme.scss",
)
-ng_module(
+ts_library(
name = "yang-gui2-lib",
srcs = glob(
include = [
@@ -49,18 +50,21 @@
"**/*.spec.ts",
],
),
- assets = [
+ angular_assets = [
":yangtable-styles",
":yangdetails-styles",
":yangtable-theme",
":yangdetails-theme",
+ "//web/gui2-fw-lib:extra_css",
] + glob([
"**/*.html",
]),
tsconfig = "//web/gui2:tsconfig.json",
+ use_angular_plugin = True,
deps = [
"//web/gui2-fw-lib",
"@npm//@angular/animations",
+ "@npm//@angular/common",
"@npm//@angular/core",
"@npm//@angular/forms",
"@npm//@angular/platform-browser-dynamic",