diff options
author | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
---|---|---|
committer | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
commit | 567be9a1f6353cec41c23bfd1fcd46b4b2a4d2d7 (patch) | |
tree | 4664a743e166a5e11aee7b9acd70ad8ee2617612 /jrt_test/src/java | |
parent | e9058b555d4dfea2f6c872d9a677e8678b569569 (diff) | |
parent | bce3b8e926bf9da880172acbe1ba4b12d5e026d6 (diff) |
Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controller
Diffstat (limited to 'jrt_test/src/java')
-rw-r--r-- | jrt_test/src/java/CMakeLists.txt | 2 | ||||
-rw-r--r-- | jrt_test/src/java/DummySlobrokService.java | 2 | ||||
-rw-r--r-- | jrt_test/src/java/HelloWorld.java | 2 | ||||
-rw-r--r-- | jrt_test/src/java/PollRPCServer.java | 2 | ||||
-rw-r--r-- | jrt_test/src/java/SimpleServer.java | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/jrt_test/src/java/CMakeLists.txt b/jrt_test/src/java/CMakeLists.txt index 097c8cebac3..cb55f247fef 100644 --- a/jrt_test/src/java/CMakeLists.txt +++ b/jrt_test/src/java/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. file(MAKE_DIRECTORY classes) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/java_code_compiled COMMAND ${CMAKE_CURRENT_BINARY_DIR}/../binref/compilejava -d classes *.java diff --git a/jrt_test/src/java/DummySlobrokService.java b/jrt_test/src/java/DummySlobrokService.java index 5e5613e7d3f..78de2beecb7 100644 --- a/jrt_test/src/java/DummySlobrokService.java +++ b/jrt_test/src/java/DummySlobrokService.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. import com.yahoo.jrt.*; import com.yahoo.jrt.slobrok.api.*; diff --git a/jrt_test/src/java/HelloWorld.java b/jrt_test/src/java/HelloWorld.java index cbf941ed76d..a48abbf76a8 100644 --- a/jrt_test/src/java/HelloWorld.java +++ b/jrt_test/src/java/HelloWorld.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. public class HelloWorld { public static void main(String[] args) diff --git a/jrt_test/src/java/PollRPCServer.java b/jrt_test/src/java/PollRPCServer.java index 6c84cab1ab9..5b577add04f 100644 --- a/jrt_test/src/java/PollRPCServer.java +++ b/jrt_test/src/java/PollRPCServer.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. import com.yahoo.jrt.*; diff --git a/jrt_test/src/java/SimpleServer.java b/jrt_test/src/java/SimpleServer.java index 6c1364b2d84..b4dc1169cf4 100644 --- a/jrt_test/src/java/SimpleServer.java +++ b/jrt_test/src/java/SimpleServer.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. import com.yahoo.jrt.*; |