Skip to content

Commit eea8265

Browse files
authored
Merge pull request #135 from SpineEventEngine/spine-1.2.1
Update to Spine 1.2.1
2 parents e300228 + df2d726 commit eea8265

File tree

8 files changed

+293
-372
lines changed

8 files changed

+293
-372
lines changed

build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ apply from: 'version.gradle'
4242

4343
ext {
4444
credentialsPropertyFile = 'credentials.properties'
45-
spineProtobufPluginId = 'io.spine.tools.spine-model-compiler'
4645

4746
projectsToPublish = ['datastore', 'stackdriver-trace', 'testutil-gcloud']
4847
}
@@ -146,7 +145,7 @@ subprojects {
146145
}
147146

148147
apply plugin: 'com.google.protobuf'
149-
apply plugin: spineProtobufPluginId
148+
apply plugin: 'io.spine.tools.spine-model-compiler'
150149
apply from: deps.scripts.modelCompiler
151150

152151
sourceSets {

config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# you may not use this file except in compliance with the License.
88
# You may obtain a copy of the License at
99
#
10-
# http://www.apache.org/licenses/LICENSE-2.0
10+
# https://www.apache.org/licenses/LICENSE-2.0
1111
#
1212
# Unless required by applicable law or agreed to in writing, software
1313
# distributed under the License is distributed on an "AS IS" BASIS,
@@ -125,8 +125,8 @@ if $darwin; then
125125
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
126126
fi
127127

128-
# For Cygwin, switch paths to Windows format before running java
129-
if $cygwin ; then
128+
# For Cygwin or MSYS, switch paths to Windows format before running java
129+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
130130
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
131131
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
132132
JAVACMD=`cygpath --unix "$JAVACMD"`

gradlew.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@rem you may not use this file except in compliance with the License.
66
@rem You may obtain a copy of the License at
77
@rem
8-
@rem http://www.apache.org/licenses/LICENSE-2.0
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
99
@rem
1010
@rem Unless required by applicable law or agreed to in writing, software
1111
@rem distributed under the License is distributed on an "AS IS" BASIS,

license-report.md

Lines changed: 271 additions & 349 deletions
Large diffs are not rendered by default.

pom.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ all modules and does not describe the project structure per-subproject.
1212

1313
<groupId>io.spine.gcloud</groupId>
1414
<artifactId>spine-gcloud-java</artifactId>
15-
<version>1.2.0</version>
15+
<version>1.2.1</version>
1616

1717
<inceptionYear>2015</inceptionYear>
1818

@@ -28,7 +28,7 @@ all modules and does not describe the project structure per-subproject.
2828
<dependency>
2929
<groupId>com.google.cloud</groupId>
3030
<artifactId>google-cloud-datastore</artifactId>
31-
<version>1.96.0</version>
31+
<version>1.100.0</version>
3232
<scope>compile</scope>
3333
</dependency>
3434
<dependency>
@@ -40,7 +40,7 @@ all modules and does not describe the project structure per-subproject.
4040
<dependency>
4141
<groupId>io.spine</groupId>
4242
<artifactId>spine-server</artifactId>
43-
<version>1.2.0</version>
43+
<version>1.2.1</version>
4444
<scope>compile</scope>
4545
</dependency>
4646
<dependency>
@@ -58,7 +58,7 @@ all modules and does not describe the project structure per-subproject.
5858
<dependency>
5959
<groupId>io.spine</groupId>
6060
<artifactId>spine-testutil-server</artifactId>
61-
<version>1.2.0</version>
61+
<version>1.2.1</version>
6262
<scope>test</scope>
6363
</dependency>
6464
<dependency>
@@ -76,19 +76,19 @@ all modules and does not describe the project structure per-subproject.
7676
<dependency>
7777
<groupId>org.junit.jupiter</groupId>
7878
<artifactId>junit-jupiter-api</artifactId>
79-
<version>5.5.1</version>
79+
<version>5.5.2</version>
8080
<scope>test</scope>
8181
</dependency>
8282
<dependency>
8383
<groupId>org.junit.jupiter</groupId>
8484
<artifactId>junit-jupiter-engine</artifactId>
85-
<version>5.5.1</version>
85+
<version>5.5.2</version>
8686
<scope>test</scope>
8787
</dependency>
8888
<dependency>
8989
<groupId>org.junit.jupiter</groupId>
9090
<artifactId>junit-jupiter-params</artifactId>
91-
<version>5.5.1</version>
91+
<version>5.5.2</version>
9292
<scope>test</scope>
9393
</dependency>
9494
<dependency>
@@ -109,32 +109,32 @@ all modules and does not describe the project structure per-subproject.
109109
<dependency>
110110
<groupId>io.grpc</groupId>
111111
<artifactId>protoc-gen-grpc-java</artifactId>
112-
<version>1.24.1</version>
112+
<version>1.25.0</version>
113113
</dependency>
114114
<dependency>
115115
<groupId>io.spine.tools</groupId>
116116
<artifactId>spine-errorprone-checks</artifactId>
117-
<version>1.2.0</version>
117+
<version>1.2.1</version>
118118
</dependency>
119119
<dependency>
120120
<groupId>io.spine.tools</groupId>
121121
<artifactId>spine-protoc-plugin</artifactId>
122-
<version>1.2.0</version>
122+
<version>1.2.1</version>
123123
</dependency>
124124
<dependency>
125125
<groupId>net.sourceforge.pmd</groupId>
126126
<artifactId>pmd-java</artifactId>
127-
<version>6.16.0</version>
127+
<version>6.19.0</version>
128128
</dependency>
129129
<dependency>
130130
<groupId>org.jacoco</groupId>
131131
<artifactId>org.jacoco.agent</artifactId>
132-
<version>0.8.4</version>
132+
<version>0.8.5</version>
133133
</dependency>
134134
<dependency>
135135
<groupId>org.jacoco</groupId>
136136
<artifactId>org.jacoco.ant</artifactId>
137-
<version>0.8.4</version>
137+
<version>0.8.5</version>
138138
</dependency>
139139
</dependencies>
140140
</project>

version.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
* {@code .config/gradle/dependencies.gradle}.
2626
*/
2727

28-
def final SPINE_VERSION = '1.2.0'
28+
def final SPINE_VERSION = '1.2.1'
2929

3030
ext {
3131
versionToPublish = SPINE_VERSION
3232

3333
spineBaseVersion = SPINE_VERSION
3434
spineCoreVersion = SPINE_VERSION
3535

36-
datastoreVersion = '1.96.0'
36+
datastoreVersion = '1.100.0'
3737
}

0 commit comments

Comments
 (0)