From e8da20a43bf434654fbaaad69f5bfde2cacddd1f Mon Sep 17 00:00:00 2001 From: John Roesler Date: Wed, 31 Mar 2021 13:26:01 -0500 Subject: [PATCH 1/2] KAFKA-12593: Fix header in streams-scala --- NOTICE | 4 ++++ build.gradle | 1 + streams/streams-scala/NOTICE | 3 --- .../kafka/streams/scala/FunctionConversions.scala | 3 --- .../kafka/streams/scala/ImplicitConversions.scala | 3 --- .../org/apache/kafka/streams/scala/Serdes.scala | 3 --- .../apache/kafka/streams/scala/StreamsBuilder.scala | 3 --- .../kafka/streams/scala/kstream/KGroupedStream.scala | 3 --- .../kafka/streams/scala/kstream/KGroupedTable.scala | 3 --- .../apache/kafka/streams/scala/kstream/KStream.scala | 3 --- .../apache/kafka/streams/scala/kstream/KTable.scala | 3 --- .../scala/kstream/SessionWindowedKStream.scala | 3 --- .../streams/scala/kstream/TimeWindowedKStream.scala | 3 --- .../org/apache/kafka/streams/scala/package.scala | 3 --- .../kafka/streams/scala/serialization/Serdes.scala | 3 --- ...TableJoinScalaIntegrationTestImplicitSerdes.scala | 12 ++++++------ .../apache/kafka/streams/scala/TopologyTest.scala | 3 --- .../apache/kafka/streams/scala/WordCountTest.scala | 3 --- .../kafka/streams/scala/kstream/ConsumedTest.scala | 2 -- .../kafka/streams/scala/kstream/JoinedTest.scala | 2 -- .../streams/scala/kstream/KStreamSplitTest.scala | 2 -- .../kafka/streams/scala/kstream/KStreamTest.scala | 2 -- .../kafka/streams/scala/kstream/KTableTest.scala | 2 -- .../streams/scala/kstream/MaterializedTest.scala | 2 -- .../kafka/streams/scala/kstream/ProducedTest.scala | 2 -- .../streams/scala/kstream/RepartitionedTest.scala | 2 -- .../kafka/streams/scala/kstream/SuppressedTest.scala | 2 -- .../StreamToTableJoinScalaIntegrationTestBase.scala | 12 ++++++------ .../scala/utils/StreamToTableJoinTestData.scala | 12 ++++++------ .../kafka/streams/scala/utils/TestDriver.scala | 2 -- 30 files changed, 23 insertions(+), 83 deletions(-) delete mode 100644 streams/streams-scala/NOTICE diff --git a/NOTICE b/NOTICE index 58170d518ff06..02f5a418ff10b 100644 --- a/NOTICE +++ b/NOTICE @@ -10,3 +10,7 @@ License. The source code of jersey can be found at https://github.com/jersey/jer This distribution has a binary test dependency on jqwik, which is available under the Eclipse Public License 2.0. The source code can be found at https://github.com/jlink/jqwik. + +The streams-scala (streams/streams-scala) module was donated by Lightbend and the original code was copyrighted by them: +Copyright (C) 2018 Lightbend Inc. +Copyright (C) 2017-2018 Alexis Seigneurin. \ No newline at end of file diff --git a/build.gradle b/build.gradle index 13ef44ded0537..e1a05e3c0a170 100644 --- a/build.gradle +++ b/build.gradle @@ -46,6 +46,7 @@ spotless { scala { target 'streams/**/*.scala' scalafmt("$versions.scalafmt").configFile('checkstyle/.scalafmt.conf') + licenseHeaderFile 'checkstyle/java.header', 'package' } } diff --git a/streams/streams-scala/NOTICE b/streams/streams-scala/NOTICE deleted file mode 100644 index 732e373e1c123..0000000000000 --- a/streams/streams-scala/NOTICE +++ /dev/null @@ -1,3 +0,0 @@ -Kafka Streams Scala -Copyright (C) 2018 Lightbend Inc. -Copyright (C) 2017-2018 Alexis Seigneurin. diff --git a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/FunctionConversions.scala b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/FunctionConversions.scala index e6852c49a5d7c..892419a6cd8bf 100644 --- a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/FunctionConversions.scala +++ b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/FunctionConversions.scala @@ -1,7 +1,4 @@ /* - * Copyright (C) 2018 Lightbend Inc. - * Copyright (C) 2017-2018 Alexis Seigneurin. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/ImplicitConversions.scala b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/ImplicitConversions.scala index c82a1b107a717..ab8f319e525c9 100644 --- a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/ImplicitConversions.scala +++ b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/ImplicitConversions.scala @@ -1,7 +1,4 @@ /* - * Copyright (C) 2018 Lightbend Inc. - * Copyright (C) 2017-2018 Alexis Seigneurin. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/Serdes.scala b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/Serdes.scala index a680723d5c10f..a36fef83beb88 100644 --- a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/Serdes.scala +++ b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/Serdes.scala @@ -1,7 +1,4 @@ /* - * Copyright (C) 2018 Lightbend Inc. - * Copyright (C) 2017-2018 Alexis Seigneurin. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/StreamsBuilder.scala b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/StreamsBuilder.scala index 9d8c9c995c46f..3eeffc484ba52 100644 --- a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/StreamsBuilder.scala +++ b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/StreamsBuilder.scala @@ -1,7 +1,4 @@ /* - * Copyright (C) 2018 Lightbend Inc. - * Copyright (C) 2017-2018 Alexis Seigneurin. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/KGroupedStream.scala b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/KGroupedStream.scala index 0f6414013aa0b..d3f1ea096b25a 100644 --- a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/KGroupedStream.scala +++ b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/KGroupedStream.scala @@ -1,7 +1,4 @@ /* - * Copyright (C) 2018 Lightbend Inc. - * Copyright (C) 2017-2018 Alexis Seigneurin. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/KGroupedTable.scala b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/KGroupedTable.scala index 085da1018abf2..292155dbff2e8 100644 --- a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/KGroupedTable.scala +++ b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/KGroupedTable.scala @@ -1,7 +1,4 @@ /* - * Copyright (C) 2018 Lightbend Inc. - * Copyright (C) 2017-2018 Alexis Seigneurin. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/KStream.scala b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/KStream.scala index 6c37775b04453..4d63e67268718 100644 --- a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/KStream.scala +++ b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/KStream.scala @@ -1,7 +1,4 @@ /* - * Copyright (C) 2018 Lightbend Inc. - * Copyright (C) 2017-2018 Alexis Seigneurin. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/KTable.scala b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/KTable.scala index adfcf0e189a38..ccabeb7ee2bbe 100644 --- a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/KTable.scala +++ b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/KTable.scala @@ -1,7 +1,4 @@ /* - * Copyright (C) 2018 Lightbend Inc. - * Copyright (C) 2017-2018 Alexis Seigneurin. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/SessionWindowedKStream.scala b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/SessionWindowedKStream.scala index 3432ee6f1eeca..0a20444d68197 100644 --- a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/SessionWindowedKStream.scala +++ b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/SessionWindowedKStream.scala @@ -1,7 +1,4 @@ /* - * Copyright (C) 2018 Lightbend Inc. - * Copyright (C) 2017-2018 Alexis Seigneurin. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/TimeWindowedKStream.scala b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/TimeWindowedKStream.scala index 3f9ccb289a260..fdb137c83c247 100644 --- a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/TimeWindowedKStream.scala +++ b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/kstream/TimeWindowedKStream.scala @@ -1,7 +1,4 @@ /* - * Copyright (C) 2018 Lightbend Inc. - * Copyright (C) 2017-2018 Alexis Seigneurin. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/package.scala b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/package.scala index 01f9833b64546..6a3906dd58931 100644 --- a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/package.scala +++ b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/package.scala @@ -1,7 +1,4 @@ /* - * Copyright (C) 2018 Lightbend Inc. - * Copyright (C) 2017-2018 Alexis Seigneurin. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/serialization/Serdes.scala b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/serialization/Serdes.scala index 6527db018f50e..c4e7537f924ff 100644 --- a/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/serialization/Serdes.scala +++ b/streams/streams-scala/src/main/scala/org/apache/kafka/streams/scala/serialization/Serdes.scala @@ -1,7 +1,4 @@ /* - * Copyright (C) 2018 Lightbend Inc. - * Copyright (C) 2017-2018 Alexis Seigneurin. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/StreamToTableJoinScalaIntegrationTestImplicitSerdes.scala b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/StreamToTableJoinScalaIntegrationTestImplicitSerdes.scala index a811b3d278fbe..56b1c29378e19 100644 --- a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/StreamToTableJoinScalaIntegrationTestImplicitSerdes.scala +++ b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/StreamToTableJoinScalaIntegrationTestImplicitSerdes.scala @@ -1,10 +1,10 @@ /* - * Copyright (C) 2018 Lightbend Inc. - * Copyright (C) 2017-2018 Alexis Seigneurin. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/TopologyTest.scala b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/TopologyTest.scala index f81be0a35c789..1dc2e76561520 100644 --- a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/TopologyTest.scala +++ b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/TopologyTest.scala @@ -1,7 +1,4 @@ /* - * Copyright (C) 2018 Lightbend Inc. - * Copyright (C) 2017-2018 Alexis Seigneurin. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/WordCountTest.scala b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/WordCountTest.scala index 5f4174bd12e11..1fa364a3d8c3f 100644 --- a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/WordCountTest.scala +++ b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/WordCountTest.scala @@ -1,7 +1,4 @@ /* - * Copyright (C) 2018 Lightbend Inc. - * Copyright (C) 2017-2018 Alexis Seigneurin. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/ConsumedTest.scala b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/ConsumedTest.scala index c98ebe827b31b..0b44165164b93 100644 --- a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/ConsumedTest.scala +++ b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/ConsumedTest.scala @@ -1,6 +1,4 @@ /* - * Copyright (C) 2018 Joan Goyeau. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/JoinedTest.scala b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/JoinedTest.scala index 8ddd2a9e011f2..4e6fa563f57d0 100644 --- a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/JoinedTest.scala +++ b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/JoinedTest.scala @@ -1,6 +1,4 @@ /* - * Copyright (C) 2018 Joan Goyeau. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/KStreamSplitTest.scala b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/KStreamSplitTest.scala index 0e5c8fdc61bd7..bbcc1b503f4fa 100644 --- a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/KStreamSplitTest.scala +++ b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/KStreamSplitTest.scala @@ -1,6 +1,4 @@ /* - * Copyright (C) 2018 Joan Goyeau. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/KStreamTest.scala b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/KStreamTest.scala index ab41f98fc8584..2df4e5801c0e6 100644 --- a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/KStreamTest.scala +++ b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/KStreamTest.scala @@ -1,6 +1,4 @@ /* - * Copyright (C) 2018 Joan Goyeau. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/KTableTest.scala b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/KTableTest.scala index f11ae59a102db..ccf955e8889b1 100644 --- a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/KTableTest.scala +++ b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/KTableTest.scala @@ -1,6 +1,4 @@ /* - * Copyright (C) 2018 Joan Goyeau. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/MaterializedTest.scala b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/MaterializedTest.scala index f5f3ba7f4ca09..9e0c466c26da0 100644 --- a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/MaterializedTest.scala +++ b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/MaterializedTest.scala @@ -1,6 +1,4 @@ /* - * Copyright (C) 2018 Joan Goyeau. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/ProducedTest.scala b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/ProducedTest.scala index 86e19d86a7fdf..69c4b1706096f 100644 --- a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/ProducedTest.scala +++ b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/ProducedTest.scala @@ -1,6 +1,4 @@ /* - * Copyright (C) 2018 Joan Goyeau. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/RepartitionedTest.scala b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/RepartitionedTest.scala index d917aecaf5b9e..4c8d8951b0af6 100644 --- a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/RepartitionedTest.scala +++ b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/RepartitionedTest.scala @@ -1,6 +1,4 @@ /* - * Copyright (C) 2018 Joan Goyeau. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/SuppressedTest.scala b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/SuppressedTest.scala index 42a49a2da476b..86936a21eca4a 100644 --- a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/SuppressedTest.scala +++ b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/kstream/SuppressedTest.scala @@ -1,6 +1,4 @@ /* - * Copyright (C) 2018 Joan Goyeau. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/utils/StreamToTableJoinScalaIntegrationTestBase.scala b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/utils/StreamToTableJoinScalaIntegrationTestBase.scala index 5983578dc026a..5b2aa7626825d 100644 --- a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/utils/StreamToTableJoinScalaIntegrationTestBase.scala +++ b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/utils/StreamToTableJoinScalaIntegrationTestBase.scala @@ -1,10 +1,10 @@ /* - * Copyright (C) 2018 Lightbend Inc. - * Copyright (C) 2017-2018 Alexis Seigneurin. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/utils/StreamToTableJoinTestData.scala b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/utils/StreamToTableJoinTestData.scala index 890d8c2ee14b2..29d06953e75a8 100644 --- a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/utils/StreamToTableJoinTestData.scala +++ b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/utils/StreamToTableJoinTestData.scala @@ -1,10 +1,10 @@ /* - * Copyright (C) 2018 Lightbend Inc. - * Copyright (C) 2017-2018 Alexis Seigneurin. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/utils/TestDriver.scala b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/utils/TestDriver.scala index 4dff50f213924..23a24178fb941 100644 --- a/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/utils/TestDriver.scala +++ b/streams/streams-scala/src/test/scala/org/apache/kafka/streams/scala/utils/TestDriver.scala @@ -1,6 +1,4 @@ /* - * Copyright (C) 2018 Joan Goyeau. - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. From d13ab4d13ab6e537cb8375d89de0bb8e123c0c48 Mon Sep 17 00:00:00 2001 From: John Roesler Date: Wed, 31 Mar 2021 16:48:06 -0500 Subject: [PATCH 2/2] also correct the copyright in the python files --- gradlew | 3 --- tests/kafkatest/tests/client/message_format_change_test.py | 2 -- .../kafkatest/tests/core/compatibility_test_new_broker_test.py | 2 -- tests/kafkatest/tests/streams/utils/util.py | 2 -- tests/kafkatest/utils/util.py | 2 -- 5 files changed, 11 deletions(-) diff --git a/gradlew b/gradlew index eaac4365793f9..61d317e696d1d 100755 --- a/gradlew +++ b/gradlew @@ -1,8 +1,5 @@ #!/usr/bin/env sh -# -# Copyright 2015 the original author or authors. -# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/tests/kafkatest/tests/client/message_format_change_test.py b/tests/kafkatest/tests/client/message_format_change_test.py index 41e0f95fe8a66..0cd9a2127d6bc 100644 --- a/tests/kafkatest/tests/client/message_format_change_test.py +++ b/tests/kafkatest/tests/client/message_format_change_test.py @@ -1,5 +1,3 @@ -# Copyright 2015 Confluent Inc. -# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/tests/kafkatest/tests/core/compatibility_test_new_broker_test.py b/tests/kafkatest/tests/core/compatibility_test_new_broker_test.py index db8aa1d0743ca..4e2e7b625e183 100644 --- a/tests/kafkatest/tests/core/compatibility_test_new_broker_test.py +++ b/tests/kafkatest/tests/core/compatibility_test_new_broker_test.py @@ -1,5 +1,3 @@ -# Copyright 2015 Confluent Inc. -# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/tests/kafkatest/tests/streams/utils/util.py b/tests/kafkatest/tests/streams/utils/util.py index 6871e08af2774..d3ca64552e7f8 100644 --- a/tests/kafkatest/tests/streams/utils/util.py +++ b/tests/kafkatest/tests/streams/utils/util.py @@ -1,5 +1,3 @@ -# Copyright 2015 Confluent Inc. -# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/tests/kafkatest/utils/util.py b/tests/kafkatest/utils/util.py index af986ba1ee54a..4739709c6c4e0 100644 --- a/tests/kafkatest/utils/util.py +++ b/tests/kafkatest/utils/util.py @@ -1,5 +1,3 @@ -# Copyright 2015 Confluent Inc. -# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at