Merge f35573c into 4985049

exonum · Mar 13, 2019 · e28ce15 · e28ce15
2 parents 4985049 + f35573c
commit e28ce15
Show file tree

Hide file tree

Showing 21 changed files with 53 additions and 44 deletions.
diff --git a/exonum-java-binding/CHANGELOG.md b/exonum-java-binding/CHANGELOG.md
@@ -15,11 +15,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.5.0] - 2019-03-TBD
+
+### Overview
+
+This release brings support of Exonum Time Oracle. It is based on Exonum 0.10.3.
+
 ### Added
 - Support of Time oracle. Instruction on how to enable built-in services can be found
-  [here](https://exonum.com/doc/version/0.4/get-started/java-binding/#built-in-services). (#667)
-- `com.exonum.binding.common.serialization.json.JsonSerializer` provides support for `ZonedDateTime`
-  JSON serialization in `java.time.format.DateTimeFormatter.ISO_ZONED_DATE_TIME` format. (#762)
+  [here](https://exonum.com/doc/version/0.10/get-started/java-binding/#built-in-services). (#667)
+- [`JsonSerializer`][json-serializer-0.5.0] provides support for `ZonedDateTime`
+  JSON serialization in [`ISO_ZONED_DATE_TIME`][iso-zdt-format] format. (#762)
+
+[json-serializer-0.5.0]: https://exonum.com/doc/api/java-binding-common/0.5.0/com/exonum/binding/common/serialization/json/JsonSerializer.html
+[iso-zdt-format]: https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/time/format/DateTimeFormatter.html#ISO_ZONED_DATE_TIME
 
 ### Changed
 - `TransactionResult` and `TransactionLocation` classes moved to the common module. (#725)
@@ -168,7 +177,8 @@ Parent module and BOM module were released as they are required dependencies to
 
 The first release of Exonum Java Binding.
 
-[Unreleased]: https://github.com/exonum/exonum-java-binding/compare/v0.4...HEAD
+[Unreleased]: https://github.com/exonum/exonum-java-binding/compare/ejb/v0.5.0...HEAD
+[0.5.0]: https://github.com/exonum/exonum-java-binding/compare/v0.4...ejb/v0.5.0
 [0.4]: https://github.com/exonum/exonum-java-binding/compare/v0.3...v0.4
 [0.3]: https://github.com/exonum/exonum-java-binding/compare/v0.2...v0.3
 [0.2]: https://github.com/exonum/exonum-java-binding/compare/v0.1.2...v0.2

diff --git a/exonum-java-binding/bom/pom.xml b/exonum-java-binding/bom/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>com.exonum.binding</groupId>
     <artifactId>exonum-java-binding-parent</artifactId>
-    <version>0.5-SNAPSHOT</version>
+    <version>0.5.0</version>
   </parent>
 
   <artifactId>exonum-java-binding-bom</artifactId>
-  <version>0.5-SNAPSHOT</version>
+  <version>0.5.0</version>
   <packaging>pom</packaging>
 
   <name>Exonum Java Binding: Bill of Materials</name>

diff --git a/exonum-java-binding/common/pom.xml b/exonum-java-binding/common/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>com.exonum.binding</groupId>
     <artifactId>exonum-java-binding-parent</artifactId>
-    <version>0.5-SNAPSHOT</version>
+    <version>0.5.0</version>
   </parent>
 
   <artifactId>exonum-java-binding-common</artifactId>
-  <version>0.5-SNAPSHOT</version>
+  <version>0.5.0</version>
   <packaging>jar</packaging>
 
   <name>Exonum Java Binding: Common</name>

diff --git a/exonum-java-binding/core/pom.xml b/exonum-java-binding/core/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>com.exonum.binding</groupId>
     <artifactId>exonum-java-binding-parent</artifactId>
-    <version>0.5-SNAPSHOT</version>
+    <version>0.5.0</version>
   </parent>
 
   <artifactId>exonum-java-binding-core</artifactId>
-  <version>0.5-SNAPSHOT</version>
+  <version>0.5.0</version>
   <packaging>jar</packaging>
 
   <name>Exonum Java Binding: Core</name>

diff --git a/exonum-java-binding/core/rust/Cargo.lock b/exonum-java-binding/core/rust/Cargo.lock
diff --git a/exonum-java-binding/core/rust/Cargo.toml b/exonum-java-binding/core/rust/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "java_bindings"
-version = "0.5.0-SNAPSHOT"
+version = "0.5.0"
 authors = ["Exonum Team <exonum@bitfury.com>"]
 
 [workspace]

diff --git a/exonum-java-binding/core/rust/ejb-app/Cargo.toml b/exonum-java-binding/core/rust/ejb-app/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ejb-app"
-version = "0.5.0-SNAPSHOT"
+version = "0.5.0"
 authors = ["Exonum team <exonum@bitfury.com>"]
 
 [dependencies]

diff --git a/exonum-java-binding/core/rust/integration_tests/Cargo.toml b/exonum-java-binding/core/rust/integration_tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "integration_tests"
-version = "0.5.0-SNAPSHOT"
+version = "0.5.0"
 authors = ["Exonum Team <exonum@bitfury.com>"]
 publish = false
 workspace = ".."

diff --git a/exonum-java-binding/cryptocurrency-demo/pom.xml b/exonum-java-binding/cryptocurrency-demo/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>com.exonum.binding</groupId>
     <artifactId>exonum-java-binding-parent</artifactId>
-    <version>0.5-SNAPSHOT</version>
+    <version>0.5.0</version>
   </parent>
 
   <artifactId>exonum-java-binding-cryptocurrency-demo</artifactId>
-  <version>0.5-SNAPSHOT</version>
+  <version>0.5.0</version>
   <packaging>jar</packaging>
 
   <name>Exonum Java Binding: Cryptocurrency Java service</name>

diff --git a/exonum-java-binding/fakes/pom.xml b/exonum-java-binding/fakes/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>com.exonum.binding</groupId>
     <artifactId>exonum-java-binding-parent</artifactId>
-    <version>0.5-SNAPSHOT</version>
+    <version>0.5.0</version>
   </parent>
 
   <artifactId>exonum-java-binding-fakes</artifactId>
-  <version>0.5-SNAPSHOT</version>
+  <version>0.5.0</version>
   <packaging>jar</packaging>
 
   <name>Exonum Java Binding: Fakes</name>

diff --git a/exonum-java-binding/pom.xml b/exonum-java-binding/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.exonum.binding</groupId>
   <artifactId>exonum-java-binding-parent</artifactId>
-  <version>0.5-SNAPSHOT</version>
+  <version>0.5.0</version>
   <packaging>pom</packaging>
 
   <name>Exonum Java Binding Parent</name>

diff --git a/exonum-java-binding/qa-service/pom.xml b/exonum-java-binding/qa-service/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>com.exonum.binding</groupId>
     <artifactId>exonum-java-binding-parent</artifactId>
-    <version>0.5-SNAPSHOT</version>
+    <version>0.5.0</version>
   </parent>
 
   <artifactId>exonum-java-binding-qa-service</artifactId>
-  <version>0.5-SNAPSHOT</version>
+  <version>0.5.0</version>
   <packaging>jar</packaging>
 
   <name>Exonum Java Binding: QA Java service</name>

diff --git a/exonum-java-binding/service-archetype/pom.xml b/exonum-java-binding/service-archetype/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.exonum.binding</groupId>
     <artifactId>exonum-java-binding-parent</artifactId>
-    <version>0.5-SNAPSHOT</version>
+    <version>0.5.0</version>
   </parent>
 
   <artifactId>exonum-java-binding-service-archetype</artifactId>

diff --git a/exonum-java-binding/service-archetype/src/main/resources/archetype-resources/pom.xml b/exonum-java-binding/service-archetype/src/main/resources/archetype-resources/pom.xml
@@ -18,7 +18,7 @@
     <junit.jupiter.version>5.4.0</junit.jupiter.version>
     <hamcrest.version>2.1</hamcrest.version>
     <mockito.version>2.24.0</mockito.version>
-    <exonum.version>0.5-SNAPSHOT</exonum.version>
+    <exonum.version>0.5.0</exonum.version>
   </properties>
 
   <dependencyManagement>

diff --git a/exonum-java-binding/testing/pom.xml b/exonum-java-binding/testing/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>com.exonum.binding</groupId>
     <artifactId>exonum-java-binding-parent</artifactId>
-    <version>0.5-SNAPSHOT</version>
+    <version>0.5.0</version>
   </parent>
 
   <artifactId>exonum-java-testing</artifactId>
-  <version>0.5-SNAPSHOT</version>
+  <version>0.5.0</version>
   <packaging>jar</packaging>
 
   <name>Exonum Java Binding: Testing Utils</name>

diff --git a/exonum-java-binding/time-oracle/README.md b/exonum-java-binding/time-oracle/README.md
@@ -12,7 +12,7 @@ Include `exonum-time-oracle` as a dependency in your `pom.xml`:
     <dependency>
       <groupId>com.exonum.binding</groupId>
       <artifactId>exonum-time-oracle</artifactId>
-      <version>0.5-SNAPSHOT</version>
+      <version>0.5.0</version>
     </dependency>
 ```
 
@@ -25,6 +25,7 @@ services = ["time"]
 
 See more information on built-in services [here][built-in-services].
 
+[`TimeSchema`][time-schema-javadoc] allows to access the state of time oracle.
 Below is an example of a service method that uses time oracle to return the consolidated time. Note
 that at the time when a new blockchain is launched, the consolidated time is unknown until the
 transactions containing time values from at least two thirds of validator nodes are processed.
@@ -55,3 +56,4 @@ See [LICENSE](../../LICENSE) for details.
 
 [exonum-time]: https://exonum.com/doc/version/0.10/advanced/time/
 [built-in-services]: https://exonum.com/doc/version/0.10/get-started/java-binding/#built-in-services
+[time-schema-javadoc]: https://exonum.com/doc/api/java-time-oracle/0.5.0/com/exonum/binding/time/TimeSchema.html
diff --git a/exonum-java-binding/time-oracle/pom.xml b/exonum-java-binding/time-oracle/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>com.exonum.binding</groupId>
     <artifactId>exonum-java-binding-parent</artifactId>
-    <version>0.5-SNAPSHOT</version>
+    <version>0.5.0</version>
   </parent>
 
   <artifactId>exonum-time-oracle</artifactId>
-  <version>0.5-SNAPSHOT</version>
+  <version>0.5.0</version>
   <packaging>jar</packaging>
 
   <name>Exonum Time Oracle</name>
@@ -59,13 +59,9 @@
         </configuration>
       </plugin>
 
-      <!-- Skip the deployment of this module -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
+        <artifactId>maven-javadoc-plugin</artifactId>
       </plugin>
     </plugins>
   </build>

diff --git a/exonum-java-binding/time-oracle/src/main/java/com/exonum/binding/time/TimeSchema.java b/exonum-java-binding/time-oracle/src/main/java/com/exonum/binding/time/TimeSchema.java
@@ -26,7 +26,7 @@
  * Exonum time service database schema. It provides read-only access to the state
  * of the time oracle for a given {@linkplain View database view}.
  *
- * @see <a href="https://exonum.com/doc/version/latest/advanced/time/">Time oracle documentation</a>
+ * @see <a href="https://exonum.com/doc/version/0.10/advanced/time/">Time oracle documentation</a>
  */
 public interface TimeSchema {
 

diff --git a/...ing/time-oracle/src/test/java/com/exonum/binding/time/UtcZonedDateTimeSerializerTest.java b/...ing/time-oracle/src/test/java/com/exonum/binding/time/UtcZonedDateTimeSerializerTest.java
@@ -33,27 +33,27 @@
 
 class UtcZonedDateTimeSerializerTest {
 
-  private Serializer<ZonedDateTime> serializer = UtcZonedDateTimeSerializer.INSTANCE;
+  private final Serializer<ZonedDateTime> SERIALIZER = UtcZonedDateTimeSerializer.INSTANCE;
 
   @ParameterizedTest
   @MethodSource("testSource")
   void roundTrip(ZonedDateTime key) {
-    byte[] bytes = serializer.toBytes(key);
-    ZonedDateTime actual = serializer.fromBytes(bytes);
+    byte[] bytes = SERIALIZER.toBytes(key);
+    ZonedDateTime actual = SERIALIZER.fromBytes(bytes);
 
     assertThat(actual, equalTo(key));
   }
 
   @Test
   void deserializeInvalidValue() {
     byte[] invalidValue = Bytes.bytes();
-    assertThrows(IllegalArgumentException.class, () -> serializer.fromBytes(invalidValue));
+    assertThrows(IllegalArgumentException.class, () -> SERIALIZER.fromBytes(invalidValue));
   }
 
   @Test
   void serializeNonUtcValue() {
     ZonedDateTime value = ZonedDateTime.now(ZoneId.of("Europe/Amsterdam"));
-    assertThrows(IllegalArgumentException.class, () -> serializer.toBytes(value));
+    assertThrows(IllegalArgumentException.class, () -> SERIALIZER.toBytes(value));
   }
 
   private static Stream<ZonedDateTime> testSource() {

diff --git a/exonum-light-client/CHANGELOG.md b/exonum-light-client/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Versions Support
 - Exonum version, 0.11
+  <!-- TODO: clarify during JLC release (in readme#compatibility) -->
 - Exonum Java Binding version, 0.5-SNAPSHOT
 
 ### Added

diff --git a/exonum-light-client/pom.xml b/exonum-light-client/pom.xml
@@ -61,7 +61,7 @@
 
   <properties>
     <!-- Project configuration -->
-    <ejb.version>0.5-SNAPSHOT</ejb.version>
+    <ejb.version>0.5.0</ejb.version>
     <java.compiler.source>8</java.compiler.source>
     <java.compiler.target>8</java.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>