Skip to content

Add javax.annotations-api #546

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 7 commits into from
Jun 18, 2020
Merged

Add javax.annotations-api #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
39fa8a8
Bump config version
yuri-sergiichuk Jun 18, 2020
e2cc891
Add javax-annotation dependencies.
yuri-sergiichuk Jun 18, 2020
78d1004
Bump version
yuri-sergiichuk Jun 18, 2020
135a50b
Update reports
yuri-sergiichuk Jun 18, 2020
bfee2bf
Delete obsolete `pull` script for Windows.
yuri-sergiichuk Jun 18, 2020
84b154c
Update `buidSrc` to match the main repo version.
yuri-sergiichuk Jun 18, 2020
f309955
Update license report
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
4 changes: 3 additions & 1 deletion base-validating-builders/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 @@ -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
4 changes: 3 additions & 1 deletion 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 @@ -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
355 changes: 235 additions & 120 deletions license-report.md
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 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</groupId>
<artifactId>spine-base</artifactId>
<version>1.5.18</version>
<version>1.5.19</version>

<inceptionYear>2015</inceptionYear>

Expand Down Expand Up @@ -154,7 +154,7 @@ 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.18</version>
<version>1.5.19</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -215,7 +215,7 @@ all modules and does not describe the project structure per-subproject.
<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
29 changes: 0 additions & 29 deletions pull.bat
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions tools/protoc-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ dependencies {
implementation(project(":protoc-api"))
implementation(project(":validation-generator"))
implementation(Deps.gen.javaPoet)
implementation(Deps.gen.javaxAnnotation)

testImplementation(project(":base"))
testImplementation(project(":testlib"))
Expand Down
4 changes: 3 additions & 1 deletion tools/smoke-tests/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 @@ -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
1 change: 1 addition & 0 deletions tools/tool-base/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ group = "io.spine.tools"
dependencies {
api(project(":base"))
implementation(Deps.gen.javaPoet)
implementation(Deps.gen.javaxAnnotation)

testImplementation(project(":testlib"))
}
1 change: 1 addition & 0 deletions tools/validation-generator/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ group = "io.spine.tools"
dependencies {
api(Deps.gen.javaPoet)
implementation(project(":tool-base"))
implementation(Deps.gen.javaxAnnotation)
testImplementation(project(":base"))
testImplementation(project(":testlib"))
}
2 changes: 1 addition & 1 deletion version.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* as we want to manage the versions in a single source.
*/

val SPINE_VERSION = "1.5.18"
val SPINE_VERSION = "1.5.19"

project.extra.apply {
this["spineVersion"] = SPINE_VERSION
Expand Down