From b77b5c4746a9377d5bdb5f7eb677d53801c615c2 Mon Sep 17 00:00:00 2001 From: Robinson Date: Sat, 5 Mar 2022 14:37:23 +0100 Subject: [PATCH] Updated deps. updated version --- LICENSE | 12 ++++++------ LICENSE.BSD2 | 22 ++++++++++++++++++++++ LICENSE.BSD3 | 26 ++++++++++++++++++++++++++ build.gradle.kts | 12 +++++------- 4 files changed, 59 insertions(+), 13 deletions(-) create mode 100644 LICENSE.BSD2 create mode 100644 LICENSE.BSD3 diff --git a/LICENSE b/LICENSE index 597b828..118312d 100644 --- a/LICENSE +++ b/LICENSE @@ -19,18 +19,18 @@ Copyright 2022 JetBrains s.r.o. - - Vaadin - An open platform for building modern web apps for Java back ends - [The Apache Software License, Version 2.0] - https://github.com/vaadin/ - Copyright 2022 - Vaadin Ltd. - - ClassGraph - An uber-fast parallelized Java classpath scanner and module scanner [The Apache Software License, Version 2.0] https://github.com/classgraph/classgraph Copyright 2022 Luke Hutchison + - Vaadin - An open platform for building modern web apps for Java back ends + [The Apache Software License, Version 2.0] + https://github.com/vaadin/ + Copyright 2022 + Vaadin Ltd. + - VaadinUndertow - Vaadin support for the Undertow web server [The Apache Software License, Version 2.0] https://git.dorkbox.com/dorkbox/VaadinUndertow diff --git a/LICENSE.BSD2 b/LICENSE.BSD2 new file mode 100644 index 0000000..ccb08e8 --- /dev/null +++ b/LICENSE.BSD2 @@ -0,0 +1,22 @@ + BSD License + + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/LICENSE.BSD3 b/LICENSE.BSD3 new file mode 100644 index 0000000..325c6ab --- /dev/null +++ b/LICENSE.BSD3 @@ -0,0 +1,26 @@ + BSD License + + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/build.gradle.kts b/build.gradle.kts index 45eaa73..07d0b1d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,7 +33,7 @@ object Extras { // set for the project const val description = "Gradle Plugin to build Vaadin for use by the VaadinUndertow library" const val group = "com.dorkbox" - const val version = "14.7.7" + const val version = "14.7.8" // set as project.ext const val name = "Gradle Vaadin" @@ -43,12 +43,10 @@ object Extras { val tags = listOf("vaadin", "undertow") val buildDate = Instant.now().toString() - const val coroutineVer = "1.6.0" - - const val vaadinUndertowVer = "14.7.4" + const val vaadinUndertowVer = "14.7.6" // These MUST be in lock-step with what the VaadinUndertow launcher defines, otherwise horrific errors can occur. - const val undertowVer = "2.2.14.Final" + const val undertowVer = "2.2.16.Final" const val vaadinVer = "14.7.8" const val vaadinFlowVer = "2.7.6" @@ -75,10 +73,10 @@ dependencies { compileOnly("org.jetbrains.kotlin:kotlin-gradle-plugin") implementation("org.jetbrains.kotlin:kotlin-reflect") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Extras.coroutineVer}") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0") // Uber-fast, ultra-lightweight Java classpath and module path scanner - implementation("io.github.classgraph:classgraph:4.8.139") + implementation("io.github.classgraph:classgraph:4.8.141") // implementation("com.vaadin:vaadin:${Extras.vaadinVer}") // NOTE: uncomment for testing ONLY implementation("com.vaadin:flow-server:${Extras.vaadinFlowVer}")