From e07cc019d73b097766a83b946c634aa190b38fd2 Mon Sep 17 00:00:00 2001 From: Joe Ho Date: Mon, 29 Aug 2016 14:29:04 -0400 Subject: [PATCH 1/5] [maven-release-plugin] prepare release rosette-api-java-binding-1.3.1 --- api/pom.xml | 2 +- examples/pom.xml | 2 +- json/pom.xml | 2 +- model/pom.xml | 2 +- pom.xml | 4 ++-- release/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 993fc702b..fec6c4a7b 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -20,7 +20,7 @@ com.basistech.rosette rosette-api-java-binding - 1.3.1-SNAPSHOT + 1.3.1 rosette-api rosette-api diff --git a/examples/pom.xml b/examples/pom.xml index 99f0a06c1..33f53c0d6 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -20,7 +20,7 @@ com.basistech.rosette rosette-api-java-binding - 1.3.1-SNAPSHOT + 1.3.1 com.basistech.rosette rosette-api-examples diff --git a/json/pom.xml b/json/pom.xml index 38c4c17bb..47c62bd63 100644 --- a/json/pom.xml +++ b/json/pom.xml @@ -20,7 +20,7 @@ com.basistech.rosette rosette-api-java-binding - 1.3.1-SNAPSHOT + 1.3.1 rosette-api-json rosette-api-json diff --git a/model/pom.xml b/model/pom.xml index 7ac6c9914..e2eb07b15 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -20,7 +20,7 @@ com.basistech.rosette rosette-api-java-binding - 1.3.1-SNAPSHOT + 1.3.1 rosette-api-model rosette-api-model diff --git a/pom.xml b/pom.xml index 4ba5d18b1..9ecf9f2a9 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 4.0.0 com.basistech.rosette rosette-api-java-binding - 1.3.1-SNAPSHOT + 1.3.1 open-source-parent com.basistech @@ -31,7 +31,7 @@ scm:git:git@github.com:rosette-api/java.git scm:git:git@github.com:rosette-api/java.git - rosette-api-java-binding-1.3.0 + rosette-api-java-binding-1.3.1 This is the Java binding for the Rosette API. The classes in diff --git a/release/pom.xml b/release/pom.xml index 7de2efa66..6992c7718 100644 --- a/release/pom.xml +++ b/release/pom.xml @@ -19,7 +19,7 @@ com.basistech.rosette rosette-api-java-binding - 1.3.1-SNAPSHOT + 1.3.1 com.basistech.rosette rosette-api-release From 5161b6b88d70661e0e9b8e3e0c97b08c004cdf72 Mon Sep 17 00:00:00 2001 From: Joe Ho Date: Mon, 29 Aug 2016 14:30:48 -0400 Subject: [PATCH 2/5] [maven-release-plugin] rollback the release of rosette-api-java-binding-1.3.1 --- api/pom.xml | 2 +- examples/pom.xml | 2 +- json/pom.xml | 2 +- model/pom.xml | 2 +- pom.xml | 4 ++-- release/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index fec6c4a7b..993fc702b 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -20,7 +20,7 @@ com.basistech.rosette rosette-api-java-binding - 1.3.1 + 1.3.1-SNAPSHOT rosette-api rosette-api diff --git a/examples/pom.xml b/examples/pom.xml index 33f53c0d6..99f0a06c1 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -20,7 +20,7 @@ com.basistech.rosette rosette-api-java-binding - 1.3.1 + 1.3.1-SNAPSHOT com.basistech.rosette rosette-api-examples diff --git a/json/pom.xml b/json/pom.xml index 47c62bd63..38c4c17bb 100644 --- a/json/pom.xml +++ b/json/pom.xml @@ -20,7 +20,7 @@ com.basistech.rosette rosette-api-java-binding - 1.3.1 + 1.3.1-SNAPSHOT rosette-api-json rosette-api-json diff --git a/model/pom.xml b/model/pom.xml index e2eb07b15..7ac6c9914 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -20,7 +20,7 @@ com.basistech.rosette rosette-api-java-binding - 1.3.1 + 1.3.1-SNAPSHOT rosette-api-model rosette-api-model diff --git a/pom.xml b/pom.xml index 9ecf9f2a9..4ba5d18b1 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 4.0.0 com.basistech.rosette rosette-api-java-binding - 1.3.1 + 1.3.1-SNAPSHOT open-source-parent com.basistech @@ -31,7 +31,7 @@ scm:git:git@github.com:rosette-api/java.git scm:git:git@github.com:rosette-api/java.git - rosette-api-java-binding-1.3.1 + rosette-api-java-binding-1.3.0 This is the Java binding for the Rosette API. The classes in diff --git a/release/pom.xml b/release/pom.xml index 6992c7718..7de2efa66 100644 --- a/release/pom.xml +++ b/release/pom.xml @@ -19,7 +19,7 @@ com.basistech.rosette rosette-api-java-binding - 1.3.1 + 1.3.1-SNAPSHOT com.basistech.rosette rosette-api-release From 3cfbf8666147ba62cc06450c5485eb8e10c8ac1c Mon Sep 17 00:00:00 2001 From: Joe Ho Date: Tue, 25 Oct 2016 11:29:16 -0400 Subject: [PATCH 3/5] WS-971 merge rosapi-1.4.18 to master --- .../SentenceWithDependenciesMixin.java | 4 ++-- .../apimodel/SentenceWithDependencies.java | 22 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/json/src/main/java/com/basistech/rosette/apimodel/jackson/SentenceWithDependenciesMixin.java b/json/src/main/java/com/basistech/rosette/apimodel/jackson/SentenceWithDependenciesMixin.java index 233414bb8..fb67c6179 100644 --- a/json/src/main/java/com/basistech/rosette/apimodel/jackson/SentenceWithDependenciesMixin.java +++ b/json/src/main/java/com/basistech/rosette/apimodel/jackson/SentenceWithDependenciesMixin.java @@ -25,8 +25,8 @@ public class SentenceWithDependenciesMixin { @JsonCreator public SentenceWithDependenciesMixin( - @JsonProperty("startOffset") Integer startOffset, - @JsonProperty("endOffset") Integer endOffset, + @JsonProperty("startTokenIndex") Integer startTokenIndex, + @JsonProperty("endTokenIndex") Integer endTokenIndex, @JsonProperty("dependencies") List dependencies ) { // diff --git a/model/src/main/java/com/basistech/rosette/apimodel/SentenceWithDependencies.java b/model/src/main/java/com/basistech/rosette/apimodel/SentenceWithDependencies.java index 5ad4c131a..8f630c74c 100644 --- a/model/src/main/java/com/basistech/rosette/apimodel/SentenceWithDependencies.java +++ b/model/src/main/java/com/basistech/rosette/apimodel/SentenceWithDependencies.java @@ -20,22 +20,22 @@ import java.util.Objects; public class SentenceWithDependencies { - private final Integer startOffset; - private final Integer endOffset; + private final Integer startTokenIndex; + private final Integer endTokenIndex; private final List dependencies; public SentenceWithDependencies(Integer startOffset, Integer endOffset, List dependencies) { - this.startOffset = startOffset; - this.endOffset = endOffset; + this.startTokenIndex = startOffset; + this.endTokenIndex = endOffset; this.dependencies = dependencies; } - public Integer getStartOffset() { - return startOffset; + public Integer getStartTokenIndex() { + return startTokenIndex; } - public Integer getEndOffset() { - return endOffset; + public Integer getEndTokenIndex() { + return endTokenIndex; } public List getDependencies() { @@ -47,8 +47,8 @@ public boolean equals(Object o) { return true; } else if (o != null && this.getClass() == o.getClass()) { SentenceWithDependencies that = (SentenceWithDependencies)o; - return Objects.equals(this.startOffset, that.startOffset) - && Objects.equals(this.endOffset, that.endOffset) + return Objects.equals(this.startTokenIndex, that.startTokenIndex) + && Objects.equals(this.endTokenIndex, that.endTokenIndex) && Objects.equals(this.dependencies, that.dependencies); } else { return false; @@ -56,6 +56,6 @@ public boolean equals(Object o) { } public int hashCode() { - return Objects.hash(this.startOffset, this.endOffset, this.dependencies); + return Objects.hash(this.startTokenIndex, this.endTokenIndex, this.dependencies); } } From b1860d1aa2b1c6aabb3fc7244ccf173b38ec44b3 Mon Sep 17 00:00:00 2001 From: Joe Ho Date: Tue, 25 Oct 2016 12:27:54 -0400 Subject: [PATCH 4/5] [maven-release-plugin] prepare release rosette-api-java-binding-1.5.3 --- api/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- json/pom.xml | 2 +- model/pom.xml | 2 +- pom.xml | 4 ++-- release/pom.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 840ab7d0f..eb289466b 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -19,7 +19,7 @@ com.basistech.rosette rosette-api-java-binding - 1.5.3-SNAPSHOT + 1.5.3 rosette-api rosette-api diff --git a/common/pom.xml b/common/pom.xml index 45fddd738..9f3ee2201 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -19,7 +19,7 @@ com.basistech.rosette rosette-api-java-binding - 1.5.3-SNAPSHOT + 1.5.3 rosette-api-common rosette-api-common diff --git a/examples/pom.xml b/examples/pom.xml index 4bc2ba45e..faac61cf9 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -20,7 +20,7 @@ com.basistech.rosette rosette-api-java-binding - 1.5.3-SNAPSHOT + 1.5.3 com.basistech.rosette rosette-api-examples diff --git a/json/pom.xml b/json/pom.xml index cc927f00e..26d7f11d5 100644 --- a/json/pom.xml +++ b/json/pom.xml @@ -20,7 +20,7 @@ com.basistech.rosette rosette-api-java-binding - 1.5.3-SNAPSHOT + 1.5.3 rosette-api-json rosette-api-json diff --git a/model/pom.xml b/model/pom.xml index 3970a8906..8d0cf28ed 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -19,7 +19,7 @@ com.basistech.rosette rosette-api-java-binding - 1.5.3-SNAPSHOT + 1.5.3 rosette-api-model rosette-api-model diff --git a/pom.xml b/pom.xml index 5f3f7b36d..d3e1e8dfd 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 4.0.0 com.basistech.rosette rosette-api-java-binding - 1.5.3-SNAPSHOT + 1.5.3 open-source-parent com.basistech @@ -31,7 +31,7 @@ scm:git:git@github.com:rosette-api/java.git scm:git:git@github.com:rosette-api/java.git - HEAD + rosette-api-java-binding-1.5.3 This is the Java binding for the Rosette API. The classes in diff --git a/release/pom.xml b/release/pom.xml index 3e515f833..94c1b4ff5 100644 --- a/release/pom.xml +++ b/release/pom.xml @@ -19,7 +19,7 @@ com.basistech.rosette rosette-api-java-binding - 1.5.3-SNAPSHOT + 1.5.3 com.basistech.rosette rosette-api-release From 2feda4566b7f324b91ce1fb1ae00433e66a487f5 Mon Sep 17 00:00:00 2001 From: Joe Ho Date: Tue, 25 Oct 2016 12:30:28 -0400 Subject: [PATCH 5/5] [maven-release-plugin] rollback the release of rosette-api-java-binding-1.5.3 --- api/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- json/pom.xml | 2 +- model/pom.xml | 2 +- pom.xml | 4 ++-- release/pom.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index eb289466b..840ab7d0f 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -19,7 +19,7 @@ com.basistech.rosette rosette-api-java-binding - 1.5.3 + 1.5.3-SNAPSHOT rosette-api rosette-api diff --git a/common/pom.xml b/common/pom.xml index 9f3ee2201..45fddd738 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -19,7 +19,7 @@ com.basistech.rosette rosette-api-java-binding - 1.5.3 + 1.5.3-SNAPSHOT rosette-api-common rosette-api-common diff --git a/examples/pom.xml b/examples/pom.xml index faac61cf9..4bc2ba45e 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -20,7 +20,7 @@ com.basistech.rosette rosette-api-java-binding - 1.5.3 + 1.5.3-SNAPSHOT com.basistech.rosette rosette-api-examples diff --git a/json/pom.xml b/json/pom.xml index 26d7f11d5..cc927f00e 100644 --- a/json/pom.xml +++ b/json/pom.xml @@ -20,7 +20,7 @@ com.basistech.rosette rosette-api-java-binding - 1.5.3 + 1.5.3-SNAPSHOT rosette-api-json rosette-api-json diff --git a/model/pom.xml b/model/pom.xml index 8d0cf28ed..3970a8906 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -19,7 +19,7 @@ com.basistech.rosette rosette-api-java-binding - 1.5.3 + 1.5.3-SNAPSHOT rosette-api-model rosette-api-model diff --git a/pom.xml b/pom.xml index d3e1e8dfd..5f3f7b36d 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 4.0.0 com.basistech.rosette rosette-api-java-binding - 1.5.3 + 1.5.3-SNAPSHOT open-source-parent com.basistech @@ -31,7 +31,7 @@ scm:git:git@github.com:rosette-api/java.git scm:git:git@github.com:rosette-api/java.git - rosette-api-java-binding-1.5.3 + HEAD This is the Java binding for the Rosette API. The classes in diff --git a/release/pom.xml b/release/pom.xml index 94c1b4ff5..3e515f833 100644 --- a/release/pom.xml +++ b/release/pom.xml @@ -19,7 +19,7 @@ com.basistech.rosette rosette-api-java-binding - 1.5.3 + 1.5.3-SNAPSHOT com.basistech.rosette rosette-api-release