From 1c2c701be0f11da319097776f93a47a712e4852d Mon Sep 17 00:00:00 2001 From: Naimadx123 Date: Fri, 8 Nov 2024 22:08:53 +0100 Subject: [PATCH] Update protobuf-java version and apply updated copyright licenses to all Java files. --- API/pom.xml | 3 ++- .../tiktok/annotations/Priority.java | 22 +++++++++++++++++++ .../tiktok/live/LiveEventsHandler.java | 22 +++++++++++++++++++ .../tiktok/live/LiveMessagesHandler.java | 22 +++++++++++++++++++ Client/pom.xml | 2 +- .../tiktok/TikTokLiveClientTests.java | 22 +++++++++++++++++++ .../jwdeveloper/tiktok/TikTokTestBase.java | 22 +++++++++++++++++++ .../tiktok/mocks/EventsHandlerMock.java | 22 +++++++++++++++++++ .../tiktok/CustomizationExample.java | 22 +++++++++++++++++++ extension-collector/pom.xml | 2 +- license.txt | 2 +- pom.xml | 20 ++++++++++------- .../io/github/jwdeveloper/tiktok/Main.java | 22 +++++++++++++++++++ .../io/github/jwdeveloper/tiktok/Main2.java | 22 +++++++++++++++++++ 14 files changed, 215 insertions(+), 12 deletions(-) diff --git a/API/pom.xml b/API/pom.xml index 432b6f8..a10e604 100644 --- a/API/pom.xml +++ b/API/pom.xml @@ -14,7 +14,7 @@ com.google.protobuf protobuf-java - 3.24.1 + 4.28.3 provided @@ -51,6 +51,7 @@ direct + 4.28.3 src/main/proto diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/Priority.java b/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/Priority.java index 5ab1902..bdf44ad 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/Priority.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/Priority.java @@ -1,3 +1,25 @@ +/* + * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ package io.github.jwdeveloper.tiktok.annotations; /** diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveEventsHandler.java b/API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveEventsHandler.java index f3e589d..e335f44 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveEventsHandler.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveEventsHandler.java @@ -1,3 +1,25 @@ +/* + * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ package io.github.jwdeveloper.tiktok.live; import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveMessagesHandler.java b/API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveMessagesHandler.java index 5c8ee90..d638c64 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveMessagesHandler.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveMessagesHandler.java @@ -1,3 +1,25 @@ +/* + * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ package io.github.jwdeveloper.tiktok.live; import io.github.jwdeveloper.tiktok.data.dto.MessageMetaData; diff --git a/Client/pom.xml b/Client/pom.xml index 1767f87..616ad5a 100644 --- a/Client/pom.xml +++ b/Client/pom.xml @@ -29,7 +29,7 @@ com.google.protobuf protobuf-java - 3.24.1 + 4.28.3 diff --git a/Client/src/test/java/io/github/jwdeveloper/tiktok/TikTokLiveClientTests.java b/Client/src/test/java/io/github/jwdeveloper/tiktok/TikTokLiveClientTests.java index 47850f5..aa84d66 100644 --- a/Client/src/test/java/io/github/jwdeveloper/tiktok/TikTokLiveClientTests.java +++ b/Client/src/test/java/io/github/jwdeveloper/tiktok/TikTokLiveClientTests.java @@ -1,3 +1,25 @@ +/* + * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ package io.github.jwdeveloper.tiktok; import io.github.jwdeveloper.dependance.implementation.DependanceContainerBuilder; diff --git a/Client/src/test/java/io/github/jwdeveloper/tiktok/TikTokTestBase.java b/Client/src/test/java/io/github/jwdeveloper/tiktok/TikTokTestBase.java index af6e434..c450fc1 100644 --- a/Client/src/test/java/io/github/jwdeveloper/tiktok/TikTokTestBase.java +++ b/Client/src/test/java/io/github/jwdeveloper/tiktok/TikTokTestBase.java @@ -1,3 +1,25 @@ +/* + * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ package io.github.jwdeveloper.tiktok; import io.github.jwdeveloper.dependance.implementation.DependanceContainerBuilder; diff --git a/Client/src/test/java/io/github/jwdeveloper/tiktok/mocks/EventsHandlerMock.java b/Client/src/test/java/io/github/jwdeveloper/tiktok/mocks/EventsHandlerMock.java index e1123c2..a44c5c8 100644 --- a/Client/src/test/java/io/github/jwdeveloper/tiktok/mocks/EventsHandlerMock.java +++ b/Client/src/test/java/io/github/jwdeveloper/tiktok/mocks/EventsHandlerMock.java @@ -1,3 +1,25 @@ +/* + * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ package io.github.jwdeveloper.tiktok.mocks; import io.github.jwdeveloper.tiktok.TikTokLiveEventHandler; diff --git a/examples/src/main/java/io/github/jwdeveloper/tiktok/CustomizationExample.java b/examples/src/main/java/io/github/jwdeveloper/tiktok/CustomizationExample.java index eb1d1f9..a45ed95 100644 --- a/examples/src/main/java/io/github/jwdeveloper/tiktok/CustomizationExample.java +++ b/examples/src/main/java/io/github/jwdeveloper/tiktok/CustomizationExample.java @@ -1,3 +1,25 @@ +/* + * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ package io.github.jwdeveloper.tiktok; import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; diff --git a/extension-collector/pom.xml b/extension-collector/pom.xml index 2d2a680..feedf48 100644 --- a/extension-collector/pom.xml +++ b/extension-collector/pom.xml @@ -23,7 +23,7 @@ com.google.protobuf protobuf-java - 3.24.1 + 4.28.3 org.mongodb diff --git a/license.txt b/license.txt index f6a0465..3620ff4 100644 --- a/license.txt +++ b/license.txt @@ -1,4 +1,4 @@ -Copyright (c) ${license.years} ${license.owner} ${license.email} +Copyright (c) ${years} ${owner} ${email} Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/pom.xml b/pom.xml index e8f796a..a076e3a 100644 --- a/pom.xml +++ b/pom.xml @@ -51,18 +51,22 @@ com.mycila license-maven-plugin - 4.1 + 4.6 -
license.txt
- jwdeveloper - 2023-2023 - jacekwoln@gmail.com + jwdeveloper + 2023-2023 + jacekwoln@gmail.com true - - **/*.java - + + +
${project.basedir}\..\license.txt
+ + **/*.java + + + diff --git a/tools-readme/src/main/java/io/github/jwdeveloper/tiktok/Main.java b/tools-readme/src/main/java/io/github/jwdeveloper/tiktok/Main.java index 07a79b2..71c483c 100644 --- a/tools-readme/src/main/java/io/github/jwdeveloper/tiktok/Main.java +++ b/tools-readme/src/main/java/io/github/jwdeveloper/tiktok/Main.java @@ -1,3 +1,25 @@ +/* + * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ package io.github.jwdeveloper.tiktok; diff --git a/tools-readme/src/main/java/io/github/jwdeveloper/tiktok/Main2.java b/tools-readme/src/main/java/io/github/jwdeveloper/tiktok/Main2.java index c811539..caf00bb 100644 --- a/tools-readme/src/main/java/io/github/jwdeveloper/tiktok/Main2.java +++ b/tools-readme/src/main/java/io/github/jwdeveloper/tiktok/Main2.java @@ -1,3 +1,25 @@ +/* + * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ package io.github.jwdeveloper.tiktok; import com.google.common.base.Charsets;