diff options
| author |   Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2024-01-02 13:02:39 +0100 |
|---|---|---|
| committer | Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2024-01-10 11:37:13 +0100 |
| commit | dc7a552c80013fdf7701705890c70674271fd7da (patch) | |
| tree | d499b12d0b8311a734096bdbf01a12cb86a0208b /aai-core | |
| parent | d21a7599963ae8e094eecd62cb80ed1d83d6d767 (diff) | |
Update spring boot to 2.2
- update spring dependency to 2.2.13
- remove profile based switch between spring versions 1.5.22 and 2.1.12
- migrate testng based tests in aai-els-onap-logging to junit 4
- rely more on boms for dependencyManagement by removing separate declarations (of spring and jackson)
- resolve some build warnings by adding dependency + plugin versions
- resolve some build warnings by removing duplicate declarations of dependencies
- resolve build warning about ambiguous reference to JsonObject.addProperty()
Issue-ID: AAI-3711
Change-Id: I7559e90ffb65199ee46bc5b7cdf5d9e73b7d87bc
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
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, |