diff options
| author |   Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> | 2024-01-10 13:13:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2024-01-10 13:13:39 +0000 |
| commit | 09fd390a6f265419edcc8d1225a43b9a85dcd76a (patch) | |
| tree | cd616ffcaa5ec79a19b057faff6858acde3fe8e9 /aai-core | |
| parent | 60eea4e2fdf10204147a22e78a165ed087fddbef (diff) | |
| parent | dc7a552c80013fdf7701705890c70674271fd7da (diff) | |
Merge "Update spring boot to 2.2"
Diffstat (limited to 'aai-core')
| -rw-r--r-- | aai-core/pom.xml | 31 | ||||
| -rw-r--r-- | aai-core/src/main/java/org/onap/aai/serialization/queryformats/StateFormat.java | 2 |
2 files changed, 12 insertions, 21 deletions
diff --git a/aai-core/pom.xml b/aai-core/pom.xml index 3b653924..79f8aade 100644 --- a/aai-core/pom.xml +++ b/aai-core/pom.xml @@ -257,21 +257,9 @@ limitations under the License. <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-yaml</artifactId> - </dependency> - <dependency> <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> + <version>1.4.01</version> </dependency> <dependency> <groupId>com.beust</groupId> @@ -280,7 +268,6 @@ limitations under the License. <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> - </dependency> <dependency> <groupId>com.bazaarvoice.jolt</groupId> @@ -394,12 +381,16 @@ limitations under the License. <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j.version}</version> - <type>pom</type> - </dependency> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-yaml</artifactId> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j.version}</version> + <type>pom</type> + </dependency> </dependencies> <!-- Plugins and repositories --> diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/StateFormat.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/StateFormat.java index 24405953..b010b19b 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/StateFormat.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/StateFormat.java @@ -104,7 +104,7 @@ public class StateFormat extends HistoryFormat { json.addProperty("uri", "NA"); } json.addProperty(TIMESTAMP, - e.property(AAIProperties.START_TS).isPresent() ? e.value(AAIProperties.START_TS) : 0); + e.property(AAIProperties.START_TS).isPresent() ? (String) e.value(AAIProperties.START_TS) : String.valueOf(0)); json.addProperty(SOT, e.property(AAIProperties.SOURCE_OF_TRUTH).isPresent() ? e.value(AAIProperties.SOURCE_OF_TRUTH) : ""); json.addProperty(TX_ID, |