Skip to content

Use latest spine-base to fix Java11 usage #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yuri-sergiichuk merged 3 commits into from
Jun 18, 2020
Merged

Use latest spine-base to fix Java11 usage #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e45c4f
Update config module
yuri-sergiichuk Jun 18, 2020
e0a9877
Update base and plugin versions.
yuri-sergiichuk Jun 18, 2020
e8f5271
Update reports
yuri-sergiichuk Jun 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 3 additions & 18 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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.
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion config
Open in desktop
Submodule config updated 3 files
+4 −2 gradle/buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt
+1 −1 gradle/dependencies.gradle
+1 −2 quality/pmd.xml
25 changes: 18 additions & 7 deletions license-report.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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).
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).
18 changes: 9 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ all modules and does not describe the project structure per-subproject.

<groupId>io.spine.tools</groupId>
<artifactId>spine-bootstrap</artifactId>
<version>1.5.17</version>
<version>1.5.19</version>

<inceptionYear>2015</inceptionYear>

Expand Down Expand Up @@ -52,25 +52,25 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>io.spine</groupId>
<artifactId>spine-base</artifactId>
<version>1.5.12</version>
<version>1.5.19</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.spine.tools</groupId>
<artifactId>spine-model-compiler</artifactId>
<version>1.5.12</version>
<version>1.5.19</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.spine.tools</groupId>
<artifactId>spine-plugin-base</artifactId>
<version>1.5.12</version>
<version>1.5.19</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.spine.tools</groupId>
<artifactId>spine-proto-js-plugin</artifactId>
<version>1.5.12</version>
<version>1.5.19</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -106,13 +106,13 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>io.spine</groupId>
<artifactId>spine-testlib</artifactId>
<version>1.5.12</version>
<version>1.5.19</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.spine.tools</groupId>
<artifactId>spine-plugin-testlib</artifactId>
<version>1.5.12</version>
<version>1.5.19</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -152,12 +152,12 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>io.spine.tools</groupId>
<artifactId>spine-protoc-plugin</artifactId>
<version>1.5.12</version>
<version>1.5.19</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
<version>6.20.0</version>
<version>6.24.0</version>
</dependency>
<dependency>
<groupId>org.jacoco</groupId>
Expand Down
4 changes: 2 additions & 2 deletions version.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")