From 9e45c4ff82d540c2d9d034bf017846d451426d61 Mon Sep 17 00:00:00 2001 From: Yuri Sergiichuk Date: Thu, 18 Jun 2020 14:31:02 +0300 Subject: [PATCH 1/3] Update config module --- .idea/misc.xml | 21 +++---------------- .../kotlin/io/spine/gradle/internal/deps.kt | 6 ++++-- config | 2 +- 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index fb72eb86..deb97c81 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,17 +1,12 @@ - - - - - + \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt b/buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt index 6846093b..0700d1b5 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt @@ -71,7 +71,7 @@ object Versions { val errorProne = "2.3.4" val errorProneJavac = "9+181-r4173-1" // taken from here: https://github.com/tbroyer/gradle-errorprone-plugin/blob/v0.8/build.gradle.kts val errorPronePlugin = "1.1.1" - val pmd = "6.20.0" + val pmd = "6.24.0" val checkstyle = "8.29" val protobufPlugin = "0.8.12" val appengineApi = "1.9.79" @@ -97,6 +97,7 @@ object Versions { val jackson = "2.9.10.4" val animalSniffer = "1.18" val apiguardian = "1.1.0" + val javaxAnnotation = "1.3.2" /** * Version of the SLF4J library. @@ -163,7 +164,8 @@ object Build { } object Gen { - val javaPoet = "com.squareup:javapoet:${Versions.javaPoet}" + val javaPoet = "com.squareup:javapoet:${Versions.javaPoet}" + val javaxAnnotation = "javax.annotation:javax.annotation-api:${Versions.javaxAnnotation}" } object Grpc { diff --git a/config b/config index 47048aed..48d14734 160000 --- a/config +++ b/config @@ -1 +1 @@ -Subproject commit 47048aed2a242a17c959577515b0548eb58fb984 +Subproject commit 48d147346958c61ee1aad3b4312294ada38e521d From e0a98775b94f2430cdf2212ed81fef2dfcffdb19 Mon Sep 17 00:00:00 2001 From: Yuri Sergiichuk Date: Thu, 18 Jun 2020 14:56:46 +0300 Subject: [PATCH 2/3] Update base and plugin versions. --- version.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.gradle.kts b/version.gradle.kts index 76c54161..09d1542e 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -29,7 +29,7 @@ * already in the root directory. */ -val spineBaseVersion: String by extra("1.5.12") +val spineBaseVersion: String by extra("1.5.19") val spineTimeVersion: String by extra("1.5.12") val spineVersion: String by extra("1.5.14") -val pluginVersion: String by extra("1.5.17") +val pluginVersion: String by extra("1.5.19") From e8f5271ad5890333d475f6e85ae79ab67547eee0 Mon Sep 17 00:00:00 2001 From: Yuri Sergiichuk Date: Thu, 18 Jun 2020 14:59:57 +0300 Subject: [PATCH 3/3] Update reports --- license-report.md | 25 ++++++++++++++++++------- pom.xml | 18 +++++++++--------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/license-report.md b/license-report.md index a5f258e3..10437283 100644 --- a/license-report.md +++ b/license-report.md @@ -1,6 +1,6 @@ -# Dependencies of `io.spine.tools:spine-plugin:1.5.17` +# Dependencies of `io.spine.tools:spine-plugin:1.5.19` ## Runtime 1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2 @@ -63,6 +63,11 @@ * **Project URL:** [http://commons.apache.org/lang/](http://commons.apache.org/lang/) * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt) +1. **Group:** javax.annotation **Name:** javax.annotation-api **Version:** 1.3.2 + * **Manifest Project URL:** [https://javaee.github.io/glassfish](https://javaee.github.io/glassfish) + * **POM Project URL:** [http://jcp.org/en/jsr/detail?id=250](http://jcp.org/en/jsr/detail?id=250) + * **POM License: CDDL + GPLv2 with classpath exception** - [https://github.com/javaee/javax.annotation/blob/master/LICENSE](https://github.com/javaee/javax.annotation/blob/master/LICENSE) + 1. **Group:** kr.motd.maven **Name:** os-maven-plugin **Version:** 1.6.2 * **POM Project URL:** [https://github.com/trustin/os-maven-plugin/](https://github.com/trustin/os-maven-plugin/) * **POM License: Apache License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) @@ -204,6 +209,11 @@ * **Project URL:** [http://commons.apache.org/lang/](http://commons.apache.org/lang/) * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt) +1. **Group:** javax.annotation **Name:** javax.annotation-api **Version:** 1.3.2 + * **Manifest Project URL:** [https://javaee.github.io/glassfish](https://javaee.github.io/glassfish) + * **POM Project URL:** [http://jcp.org/en/jsr/detail?id=250](http://jcp.org/en/jsr/detail?id=250) + * **POM License: CDDL + GPLv2 with classpath exception** - [https://github.com/javaee/javax.annotation/blob/master/LICENSE](https://github.com/javaee/javax.annotation/blob/master/LICENSE) + 1. **Group:** junit **Name:** junit **Version:** 4.12 * **POM Project URL:** [http://junit.org](http://junit.org) * **POM License: Eclipse Public License 1.0** - [http://www.eclipse.org/legal/epl-v10.html](http://www.eclipse.org/legal/epl-v10.html) @@ -216,10 +226,10 @@ * **POM Project URL:** [https://javacc.dev.java.net/](https://javacc.dev.java.net/) * **POM License: Berkeley Software Distribution (BSD) License** - [http://www.opensource.org/licenses/bsd-license.html](http://www.opensource.org/licenses/bsd-license.html) -1. **Group:** net.sourceforge.pmd **Name:** pmd-core **Version:** 6.20.0 +1. **Group:** net.sourceforge.pmd **Name:** pmd-core **Version:** 6.24.0 * **POM License: BSD-style** - [http://pmd.sourceforge.net/license.html](http://pmd.sourceforge.net/license.html) -1. **Group:** net.sourceforge.pmd **Name:** pmd-java **Version:** 6.20.0 +1. **Group:** net.sourceforge.pmd **Name:** pmd-java **Version:** 6.24.0 * **POM License: BSD-style** - [http://pmd.sourceforge.net/license.html](http://pmd.sourceforge.net/license.html) 1. **Group:** net.sourceforge.saxon **Name:** saxon **Version:** 9.1.0.8 @@ -300,10 +310,11 @@ * **POM Project URL:** [https://github.com/ota4j-team/opentest4j](https://github.com/ota4j-team/opentest4j) * **POM License: The Apache License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt) -1. **Group:** org.ow2.asm **Name:** asm **Version:** 7.1 +1. **Group:** org.ow2.asm **Name:** asm **Version:** 7.3.1 * **Manifest Project URL:** [http://asm.ow2.org](http://asm.ow2.org) - * **POM Project URL:** [http://asm.ow2.org/](http://asm.ow2.org/) - * **POM License: BSD** - [http://asm.ow2.org/license.html](http://asm.ow2.org/license.html) + * **Manifest License:** BSD-3-Clause;link=https://asm.ow2.io/LICENSE.txt (Not packaged) + * **POM Project URL:** [http://asm.ow2.io/](http://asm.ow2.io/) + * **POM License: BSD-3-Clause** - [https://asm.ow2.io/license.html](https://asm.ow2.io/license.html) * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt) 1. **Group:** org.pcollections **Name:** pcollections **Version:** 2.1.2 @@ -327,4 +338,4 @@ The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Jun 04 21:08:20 EEST 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). \ No newline at end of file +This report was generated on **Thu Jun 18 14:55:44 EEST 2020** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). \ No newline at end of file diff --git a/pom.xml b/pom.xml index fb9080d6..b1fbb246 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ all modules and does not describe the project structure per-subproject. io.spine.tools spine-bootstrap -1.5.17 +1.5.19 2015 @@ -52,25 +52,25 @@ all modules and does not describe the project structure per-subproject. io.spine spine-base - 1.5.12 + 1.5.19 compile io.spine.tools spine-model-compiler - 1.5.12 + 1.5.19 compile io.spine.tools spine-plugin-base - 1.5.12 + 1.5.19 compile io.spine.tools spine-proto-js-plugin - 1.5.12 + 1.5.19 compile @@ -106,13 +106,13 @@ all modules and does not describe the project structure per-subproject. io.spine spine-testlib - 1.5.12 + 1.5.19 test io.spine.tools spine-plugin-testlib - 1.5.12 + 1.5.19 test @@ -152,12 +152,12 @@ all modules and does not describe the project structure per-subproject. io.spine.tools spine-protoc-plugin - 1.5.12 + 1.5.19 net.sourceforge.pmd pmd-java - 6.20.0 + 6.24.0 org.jacoco