dorkbox
/
VaadinUndertow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated dependencies.

This commit is contained in:
Robinson 2022-03-04 20:18:58 +01:00
parent 854d39c86d
commit 8feacb966e
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
3 changed files with 40 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
LICENSE
View File

@ -1,7 +1,7 @@
- VaadinUndertow - Vaadin support for the Undertow web server
[The Apache Software License, Version 2.0]
https://git.dorkbox.com/dorkbox/VaadinUndertow
Copyright 2021
Copyright 2022
Dorkbox LLC
Extra license information
@ -27,18 +27,6 @@
Copyright 2017
Pronghorn Technology LLC
- 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 2021
Vaadin Ltd.
- Logback - Logback is a logging framework for Java applications
[The Apache Software License, Version 2.0]
http://logback.qos.ch
Copyright 2021
QOS.ch
- Kotlin -
[The Apache Software License, Version 2.0]
https://github.com/JetBrains/kotlin
@ -47,16 +35,28 @@
Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply
See: https://github.com/JetBrains/kotlin/blob/master/license/README.md
- 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.
- Logback - Logback is a logging framework for Java applications
[The Apache Software License, Version 2.0]
http://logback.qos.ch
Copyright 2022
QOS.ch
- kotlinx.coroutines - Library support for Kotlin coroutines with multiplatform support
[The Apache Software License, Version 2.0]
https://github.com/Kotlin/kotlinx.coroutines
Copyright 2021
Copyright 2022
JetBrains s.r.o.
- Undertow - High performance non-blocking webserver
[The Apache Software License, Version 2.0]
https://github.com/undertow-io/undertow
Copyright 2021
Copyright 2022
JBoss
Red Hat, Inc.
Individual contributors as listed in files
@ -64,25 +64,25 @@
- ClassGraph - An uber-fast parallelized Java classpath scanner and module scanner
[The Apache Software License, Version 2.0]
https://github.com/classgraph/classgraph
Copyright 2021
Copyright 2022
Luke Hutchison
- kotlin-logging - Lightweight logging framework for Kotlin
[The Apache Software License, Version 2.0]
https://github.com/MicroUtils/kotlin-logging
Copyright 2021
Copyright 2022
Ohad Shai
- SLF4J - Simple facade or abstraction for various logging frameworks
[MIT License]
http://www.slf4j.org
Copyright 2021
Copyright 2022
QOS.ch
- JUL to SLF4J - Java Util Logging implemented over SLF4J
[MIT License]
http://www.slf4j.org
Copyright 2021
Copyright 2022
QOS.ch
- Updates - Software Update Management

4
README.md
View File

@ -23,7 +23,7 @@ Maven Info
<dependency>
<groupId>com.dorkbox</groupId>
<artifactId>VaadinUndertow</artifactId>
<version>14.7.3</version>
<version>14.7.4</version>
</dependency>
</dependencies>
```
@ -33,7 +33,7 @@ Gradle Info
```
dependencies {
...
implementation "com.dorkbox:VaadinUndertow:14.7.3"
implementation "com.dorkbox:VaadinUndertow:14.7.4"
}
````

72
build.gradle.kts
View File

@ -26,12 +26,12 @@ import java.time.Instant
gradle.startParameter.showStacktrace = ShowStacktrace.ALWAYS // always show the stacktrace!
plugins {
id("com.dorkbox.GradleUtils") version "2.14"
id("com.dorkbox.Licensing") version "2.10"
id("com.dorkbox.GradleUtils") version "2.16"
id("com.dorkbox.Licensing") version "2.12"
id("com.dorkbox.VersionUpdate") version "2.4"
id("com.dorkbox.GradlePublish") version "1.11"
id("com.dorkbox.GradlePublish") version "1.12"
kotlin("jvm") version "1.5.21"
kotlin("jvm") version "1.6.10"
}
object Extras {
@ -39,7 +39,7 @@ object Extras {
const val group = "com.dorkbox"
const val name = "VaadinUndertow"
const val id = "VaadinUndertow"
const val version = "14.7.3"
const val version = "14.7.4"
const val vendor = "Dorkbox LLC"
const val vendorUrl = "https://dorkbox.com"
@ -47,11 +47,11 @@ object Extras {
val buildDate = Instant.now().toString()
const val coroutineVer = "1.4.3"
const val coroutineVer = "1.6.0"
// these BOTH must match the version information in the VaadinApplication.kt file (this is automatically passed into the plugin)
const val vaadinVer = "14.7.8"
const val undertowVer = "2.2.14.Final"
const val undertowVer = "2.2.16.Final"
}
///////////////////////////////
@ -60,7 +60,7 @@ object Extras {
GradleUtils.load("$projectDir/../../gradle.properties", Extras)
GradleUtils.defaults()
GradleUtils.compileConfiguration(JavaVersion.VERSION_1_8)
//GradleUtils.jpms(JavaVersion.VERSION_1_9)
GradleUtils.jpms(JavaVersion.VERSION_1_9)
licensing {
@ -97,70 +97,36 @@ licensing {
}
}
sourceSets {
main {
java {
setSrcDirs(listOf("src"))
// want to include java+kotlin files for the source. 'setSrcDirs' resets includes...
include("**/*.java", "**/*.kt")
}
}
}
kotlin {
sourceSets {
main {
kotlin {
setSrcDirs(listOf("src"))
// want to include kotlin files for the source. 'setSrcDirs' resets includes...
include("**/*.java", "**/*.kt")
}
}
test {
kotlin {
setSrcDirs(listOf("test"))
// want to include kotlin files for the source. 'setSrcDirs' resets includes...
include("**/*.java", "**/*.kt")
}
}
}
}
dependencies {
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Extras.coroutineVer}")
api("org.jetbrains.kotlin:kotlin-reflect")
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Extras.coroutineVer}")
compileOnly("com.vaadin:vaadin:${Extras.vaadinVer}")
// we use undertow 2, with kotlin coroutines on top (with 1 actor per session)
implementation("io.undertow:undertow-core:${Extras.undertowVer}")
implementation("io.undertow:undertow-servlet:${Extras.undertowVer}")
implementation("io.undertow:undertow-websockets-jsr:${Extras.undertowVer}")
api("io.undertow:undertow-core:${Extras.undertowVer}")
api("io.undertow:undertow-servlet:${Extras.undertowVer}")
api("io.undertow:undertow-websockets-jsr:${Extras.undertowVer}")
// Uber-fast, ultra-lightweight Java classpath and module path scanner
implementation("io.github.classgraph:classgraph:4.8.137")
api("io.github.classgraph:classgraph:4.8.141")
implementation("com.dorkbox:Updates:1.1")
api("com.dorkbox:Updates:1.1")
// implementation("com.conversantmedia:disruptor:1.2.19")
// awesome logging framework for kotlin.
// https://www.reddit.com/r/Kotlin/comments/8gbiul/slf4j_loggers_in_3_ways/
// https://github.com/MicroUtils/kotlin-logging
implementation("io.github.microutils:kotlin-logging:2.1.15")
api("io.github.microutils:kotlin-logging:2.1.21")
// 1.8.0-beta4 supports jpms
implementation("org.slf4j:slf4j-api:1.8.0-beta4")
implementation("org.slf4j:jul-to-slf4j:1.8.0-beta4")
api("org.slf4j:slf4j-api:1.8.0-beta4")
api("org.slf4j:jul-to-slf4j:1.8.0-beta4")
implementation("ch.qos.logback:logback-core:1.3.0-alpha4")
api("ch.qos.logback:logback-core:1.3.0-alpha4")
compileOnly("ch.qos.logback:logback-classic:1.3.0-alpha4")