Use 4.0.1 version of the swim backend

Update Copyright
swimos · Jul 26, 2022 · fe18133 · fe18133
1 parent 2ffabb1
commit fe18133
Show file tree

Hide file tree

Showing 33 changed files with 46 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ See [Traffic in action](https://traffic.swim.ai).
 
 ## Prerequisites
 
-* [Install JDK 9+](https://www.oracle.com/technetwork/java/javase/downloads/index.html).
+* [Install JDK 11+](https://www.oracle.com/technetwork/java/javase/downloads/index.html).
   * Ensure that your `JAVA_HOME` environment variable is pointed to your Java installation location.
   * Ensure that your `PATH` includes `$JAVA_HOME`.
 

diff --git a/server/build.gradle b/server/build.gradle
@@ -23,7 +23,7 @@ ext.compilerArgs = ['-Xlint:all']
 // Build with `gradle -Pno-modules` to force compatibility with legacy JVMs.
 def javaVersion = System.getProperty('java.version').split('\\.')
 ext.jvmVersion = (javaVersion[0] as Integer) > 1 ? javaVersion[0] as Integer : javaVersion[1] as Integer
-ext.useModules = jvmVersion >= 9 && !hasProperty('no-modules')
+ext.useModules = !hasProperty('no-modules')
 ext.moduleArgs = []
 
 repositories {
@@ -38,8 +38,8 @@ dependencies {
 afterEvaluate {
   configurations {
     apiElements {
-      sourceCompatibility = JavaVersion.VERSION_1_9
-      targetCompatibility = JavaVersion.VERSION_1_9
+      sourceCompatibility = JavaVersion.VERSION_11
+      targetCompatibility = JavaVersion.VERSION_11
     }
   }
 
@@ -57,9 +57,9 @@ afterEvaluate {
       options.encoding = 'UTF-8'
       classpath = files()
       source = sourceSets.main.allJava
-      sourceCompatibility = JavaVersion.VERSION_1_9
-      targetCompatibility = JavaVersion.VERSION_1_9
-      destinationDir = compileJava.destinationDir
+      sourceCompatibility = JavaVersion.VERSION_11
+      targetCompatibility = JavaVersion.VERSION_11
+      destinationDirectory = compileJava.destinationDirectory
       include '*module-info*'
     }
     classes.dependsOn compileModuleInfoJava
@@ -77,8 +77,8 @@ afterEvaluate {
   compileJava {
     options.compilerArgs += compilerArgs
     options.encoding = 'UTF-8'
-    sourceCompatibility = JavaVersion.VERSION_1_9
-    targetCompatibility = JavaVersion.VERSION_1_9
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
     exclude '*module-info*'
   }
 
@@ -87,7 +87,7 @@ afterEvaluate {
     manifest {
       attributes(
         'Implementation-Title': moduleName,
-        'Implementation-Version': version,
+        'Implementation-Version': archiveVersion,
         'Main-Class': mainClassName)
     }
   }

diff --git a/server/gradle.properties b/server/gradle.properties
@@ -1 +1 @@
-application.version=3.11.0
+application.version=4.0.1
diff --git a/server/src/main/java/module-info.java b/server/src/main/java/module-info.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/server/src/main/java/swim/traffic/TrafficPlane.java b/server/src/main/java/swim/traffic/TrafficPlane.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/server/src/main/java/swim/traffic/agent/CityAgent.java b/server/src/main/java/swim/traffic/agent/CityAgent.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ public void linkIntersections() {
       intersectionsLink = downlinkMap()
           .keyForm(Uri.form())
           .hostUri(TRAFFIC_HOST)
-          .nodeUri(Uri.from(nodeUri().path()))
+          .nodeUri(Uri.create(nodeUri().path()))
           .laneUri("intersections")
           .didUpdate(this::didUpdateRemoteIntersection)
           .open();

diff --git a/server/src/main/java/swim/traffic/agent/IntersectionAgent.java b/server/src/main/java/swim/traffic/agent/IntersectionAgent.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -173,7 +173,7 @@ public void linkInfo() {
     if (infoLink == null) {
       infoLink = downlink()
           .hostUri(TRAFFIC_HOST_URI)
-          .nodeUri(Uri.from(nodeUri().path()))
+          .nodeUri(Uri.create(nodeUri().path()))
           .laneUri("info")
           .onEvent(this::didSetRemoteInfo)
           .keepSynced(true)
@@ -196,7 +196,7 @@ public void linkSchematic() {
     if (schematicLink == null) {
       schematicLink = downlink()
           .hostUri(TRAFFIC_HOST_URI)
-          .nodeUri(Uri.from(nodeUri().path()))
+          .nodeUri(Uri.create(nodeUri().path()))
           .laneUri("schematic")
           .onEvent(this::didSetRemoteSchematic)
           .keepSynced(true)
@@ -221,7 +221,7 @@ public void linkScan() {
       lastScanTime = System.currentTimeMillis();
       scanLink = downlink()
           .hostUri(TRAFFIC_HOST)
-          .nodeUri(Uri.from(nodeUri().path()))
+          .nodeUri(Uri.create(nodeUri().path()))
           .laneUri("scan/state")
           .onEvent(this::didUpdateRemoteScan)
           .open()
@@ -327,7 +327,7 @@ public void linkLatency() {
     if (latencyLink == null) {
       latencyLink = downlink()
           .hostUri(TRAFFIC_HOST_URI)
-          .nodeUri(Uri.from(nodeUri().path()))
+          .nodeUri(Uri.create(nodeUri().path()))
           .laneUri("latency")
           .onEvent(this::didSetRemoteLatency)
           .keepSynced(true)

diff --git a/server/src/main/java/swim/traffic/model/IntersectionEvent.java b/server/src/main/java/swim/traffic/model/IntersectionEvent.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/server/src/main/java/swim/traffic/model/IntersectionTensor.java b/server/src/main/java/swim/traffic/model/IntersectionTensor.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/server/src/main/java/swim/traffic/model/SignalPhaseEvent.java b/server/src/main/java/swim/traffic/model/SignalPhaseEvent.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/server/src/main/java/swim/traffic/model/SignalPhaseModel.java b/server/src/main/java/swim/traffic/model/SignalPhaseModel.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/server/src/main/java/swim/traffic/model/SignalPhaseTensor.java b/server/src/main/java/swim/traffic/model/SignalPhaseTensor.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/server/src/main/java/swim/traffic/model/VehicleDetectorEvent.java b/server/src/main/java/swim/traffic/model/VehicleDetectorEvent.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/server/src/main/java/swim/traffic/model/VehicleDetectorTensor.java b/server/src/main/java/swim/traffic/model/VehicleDetectorTensor.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/TrafficViewController.ts b/ui/main/TrafficViewController.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/index.ts b/ui/main/index.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/kpi/PedestrianBackupKpiViewController.ts b/ui/main/kpi/PedestrianBackupKpiViewController.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/kpi/TrafficKpiViewController.ts b/ui/main/kpi/TrafficKpiViewController.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/kpi/VehicleBackupKpiViewController.ts b/ui/main/kpi/VehicleBackupKpiViewController.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/kpi/VehicleFlowKpiViewController.ts b/ui/main/kpi/VehicleFlowKpiViewController.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/kpi/index.ts b/ui/main/kpi/index.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/map/ApproachMapView.ts b/ui/main/map/ApproachMapView.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/map/ApproachMapViewController.ts b/ui/main/map/ApproachMapViewController.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/map/ApproachModel.ts b/ui/main/map/ApproachModel.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/map/ApproachPopoverViewController.ts b/ui/main/map/ApproachPopoverViewController.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/map/IntersectionMapView.ts b/ui/main/map/IntersectionMapView.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/map/IntersectionMapViewController.ts b/ui/main/map/IntersectionMapViewController.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/map/IntersectionModel.ts b/ui/main/map/IntersectionModel.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/map/IntersectionPopoverViewController.ts b/ui/main/map/IntersectionPopoverViewController.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/map/TrafficMapView.ts b/ui/main/map/TrafficMapView.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/map/TrafficMapViewController.ts b/ui/main/map/TrafficMapViewController.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/map/index.ts b/ui/main/map/index.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/package.json b/ui/package.json
@@ -4,7 +4,7 @@
   "description": "Swim Traffic Web UI",
   "homepage": "https://github.com/swimos/traffic",
   "author": "Chris Sachs <chris@swim.ai>",
-  "copyright": "2015-2019 SWIM.AI inc.",
+  "copyright": "2015-2022 Swim.inc",
   "license": "Apache-2.0",
   "repository": "https://github.com/swimos/traffic.git",
   "private": true,