diff options
Diffstat (limited to 'plugins')
10 files changed, 39 insertions, 36 deletions
diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml index 0fa93ae29..c1c97b44b 100644 --- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml +++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml @@ -1,7 +1,7 @@ <!-- ============LICENSE_START======================================================= Copyright (C) 2018 Ericsson. All rights reserved. - Modifications Copyright (C) 2019 Nordix Foundation. + Modifications Copyright (C) 2019,2023 Nordix Foundation. Modifications Copyright (C) 2020 Bell Canada. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,7 +35,7 @@ <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-framework</artifactId> - <version>5.0.0</version> + <version>${version.curator}</version> <exclusions> <!-- The default Zookeeper version in Curator has vulnerabilities --> <exclusion> @@ -47,13 +47,13 @@ <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-recipes</artifactId> - <version>5.0.0</version> + <version>${version.curator}</version> </dependency> <!-- This Zookeeper version fixes the vulnerabilities --> <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.6.1</version> + <version>${version.zookeeper}</version> <exclusions> <!-- Zookeeper uses an ancient version of log4j --> <exclusion> diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml index 3cc7608ca..6157cfcb1 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml @@ -1,7 +1,7 @@ <!-- ============LICENSE_START======================================================= Copyright (C) 2016-2018 Ericsson. All rights reserved. - Modifications Copyright (C) 2020 Nordix Foundation. + Modifications Copyright (C) 2020,2023 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> - <version>1.9.2</version> + <version>${version.avro}</version> <exclusions> <exclusion> <groupId>org.apache.commons</groupId> diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaMapTest.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaMapTest.java index f4d202473..a3e85ed91 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaMapTest.java +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaMapTest.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2020-2021 Nordix Foundation. + * Modifications Copyright (C) 2020-2021,2023 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,9 +21,9 @@ package org.onap.policy.apex.plugins.context.schema.avro; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThrows; import java.io.File; @@ -111,7 +111,8 @@ public class AvroSchemaMapTest { .createSchemaHelper(testKey, avroSubstSchema1.getKey()); final GenericRecord subst1A = (GenericRecord) schemaHelperSubst1.unmarshal("{\"A-B\":\"foo\"}"); assertEquals(new Utf8("foo"), subst1A.get("A_DasH_B")); - assertNull(subst1A.get("A-B")); + assertThatThrownBy(() -> subst1A.get("A-B")).hasMessage("Not a valid schema field: A-B"); + final Throwable exception1 = assertThrows(ContextRuntimeException.class, () -> schemaHelperSubst1.unmarshal("{\"A-B\":123}")); assertNotNull(exception1.getCause()); @@ -127,7 +128,8 @@ public class AvroSchemaMapTest { .createSchemaHelper(testKey, avroSubstSchema2.getKey()); final GenericRecord subst2A = (GenericRecord) schemaHelperSubst2.unmarshal("{\"C.D\":123}"); assertEquals(123, subst2A.get("C_DoT_D")); - assertNull(subst2A.get("C.D")); + assertThatThrownBy(() -> subst2A.get("C.D")).hasMessage("Not a valid schema field: C.D"); + final Throwable exception2 = assertThrows(ContextRuntimeException.class, () -> schemaHelperSubst2.unmarshal("{\"C_DoT_D\":\"bar\"}")); assertNotNull(exception2.getCause()); @@ -143,7 +145,8 @@ public class AvroSchemaMapTest { .createSchemaHelper(testKey, avroSubstSchema3.getKey()); final GenericRecord subst3A = (GenericRecord) schemaHelperSubst3.unmarshal("{\"E:F\":true}"); assertEquals(true, subst3A.get("E_ColoN_F")); - assertNull(subst3A.get("E:F")); + assertThatThrownBy(() -> subst3A.get("E:F")).hasMessage("Not a valid schema field: E:F"); + final Throwable exception3 = assertThrows(ContextRuntimeException.class, () -> schemaHelperSubst3.unmarshal("{\"E_ColoN_F\":\"gaz\"}")); assertNotNull(exception3.getCause()); @@ -264,8 +267,9 @@ public class AvroSchemaMapTest { schemas.getSchemasMap().put(avroSchema.getKey(), avroSchema); final SchemaHelper schemaHelper = new SchemaHelperFactory().createSchemaHelper(testKey, avroSchema.getKey()); - GenericRecord subRecord = (GenericRecord) schemaHelper.createNewSubInstance("AddressUSRecord"); - assertNull(subRecord.get("streetAddress")); + final GenericRecord subRecord = (GenericRecord) schemaHelper.createNewSubInstance("AddressUSRecord"); + assertThatThrownBy(() -> subRecord.get("streetAddress")).hasMessage("Not a valid schema field: streetAddress"); + } /** diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaRecordTest.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaRecordTest.java index 147798227..2977059c6 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaRecordTest.java +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaRecordTest.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2020 Nordix Foundation. + * Modifications Copyright (C) 2020,2023 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -143,11 +143,11 @@ public class AvroSchemaRecordTest { schemas.getSchemasMap().put(avroSchema.getKey(), avroSchema); final SchemaHelper schemaHelper = new SchemaHelperFactory().createSchemaHelper(testKey, avroSchema.getKey()); - GenericRecord subRecord = (GenericRecord) schemaHelper.createNewSubInstance("AddressUSRecord"); - assertEquals(null, subRecord.get("streetAddress")); + final GenericRecord subRecord0 = (GenericRecord) schemaHelper.createNewSubInstance("AddressUSRecord"); + assertThatThrownBy(() -> subRecord0.get("address")).hasMessage("Not a valid schema field: address"); - subRecord = (GenericRecord) schemaHelper.createNewSubInstance("EmailAddress"); - assertEquals(null, subRecord.get("address")); + final GenericRecord subRecord1 = (GenericRecord) schemaHelper.createNewSubInstance("EmailAddress"); + assertThatThrownBy(() -> subRecord0.get("address")).hasMessage("Not a valid schema field: address"); assertThatThrownBy(() -> schemaHelper.createNewSubInstance("IDontExist")) .hasMessage("AvroTest:0.0.1: the schema \"User\" does not have a subtype of type \"IDontExist\""); diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml index 300f6cc0d..3fc1473ac 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml @@ -2,6 +2,7 @@ ============LICENSE_START======================================================= Copyright (C) 2018 Ericsson. All rights reserved. Modifications Copyright (C) 2020 Bell Canada. + Modifications Copyright (C) 2023 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -34,7 +35,7 @@ <dependency> <groupId>org.apache.activemq</groupId> <artifactId>artemis-jms-client</artifactId> - <version>2.21.0</version> + <version>${version.artemis-jms-client}</version> <exclusions> <exclusion> <groupId>io.netty</groupId> diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml index b83bb962f..d860cd91c 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml @@ -2,6 +2,7 @@ ============LICENSE_START======================================================= Copyright (C) 2018 Ericsson. All rights reserved. Modifications Copyright (C) 2022 Bell Canada. All rights reserved. + Modifications Copyright (C) 2023 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -39,7 +40,7 @@ <dependency> <groupId>io.confluent</groupId> <artifactId>kafka-avro-serializer</artifactId> - <version>7.2.1</version> + <version>${version.kafka-avro-serializer}</version> </dependency> </dependencies> diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml index cb7ec5a86..2990b196c 100644 --- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml +++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml @@ -1,7 +1,7 @@ <!-- ============LICENSE_START======================================================= Copyright (C) 2018 Ericsson. All rights reserved. - Modifications Copyright (C) 2021 Nordix Foundation. + Modifications Copyright (C) 2021,2023 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-client</artifactId> - <version>5.16.1</version> + <version>${version.activemq}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/plugins/plugins-executor/plugins-executor-javascript/pom.xml b/plugins/plugins-executor/plugins-executor-javascript/pom.xml index 831467c96..bd8ed727a 100644 --- a/plugins/plugins-executor/plugins-executor-javascript/pom.xml +++ b/plugins/plugins-executor/plugins-executor-javascript/pom.xml @@ -1,7 +1,7 @@ <!-- ============LICENSE_START======================================================= Copyright (C) 2018 Ericsson. All rights reserved. - Modifications Copyright (C) 2020 Nordix Foundation. + Modifications Copyright (C) 2020,2023 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -33,16 +33,12 @@ <name>${project.artifactId}</name> <description>[${project.parent.artifactId}] Plugin for execution of Javascript logic in Apex</description> - <properties> - <graalvm.version>20.0.0</graalvm.version> - </properties> - <dependencies> <dependency> <groupId>org.mozilla</groupId> <artifactId>rhino</artifactId> - <version>1.7.12</version> - </dependency> + <version>${version.rhino}</version> + </dependency> <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> diff --git a/plugins/plugins-executor/plugins-executor-jruby/pom.xml b/plugins/plugins-executor/plugins-executor-jruby/pom.xml index 50d5b0d3f..0503e4a42 100644 --- a/plugins/plugins-executor/plugins-executor-jruby/pom.xml +++ b/plugins/plugins-executor/plugins-executor-jruby/pom.xml @@ -1,7 +1,7 @@ <!-- ============LICENSE_START======================================================= Copyright (C) 2018 Ericsson. All rights reserved. - Modifications Copyright (C) 2019 Nordix Foundation. + Modifications Copyright (C) 2019,2023 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ <dependency> <groupId>org.jruby</groupId> <artifactId>jruby-core</artifactId> - <version>9.2.13.0</version> + <version>${version.jruby-core}</version> <exclusions> <exclusion> <groupId>org.jruby.extras</groupId> @@ -62,22 +62,22 @@ <dependency> <groupId>org.jruby.joni</groupId> <artifactId>joni</artifactId> - <version>2.1.40</version> + <version>${version.jruby-joni}</version> </dependency> <dependency> <groupId>org.jruby.extras</groupId> <artifactId>bytelist</artifactId> - <version>1.0.15</version> + <version>${version.jruby-extras-bytelist}</version> </dependency> <dependency> <groupId>com.github.jnr</groupId> <artifactId>jffi</artifactId> - <version>1.3.9</version> + <version>${version.jnr.jffi}</version> </dependency> <dependency> <groupId>com.github.jnr</groupId> <artifactId>jnr-posix</artifactId> - <version>3.1.15</version> + <version>${version.jnr.jnr-posix}</version> </dependency> </dependencies> </project> diff --git a/plugins/plugins-executor/plugins-executor-jython/pom.xml b/plugins/plugins-executor/plugins-executor-jython/pom.xml index 0def156c1..0a9c183d7 100644 --- a/plugins/plugins-executor/plugins-executor-jython/pom.xml +++ b/plugins/plugins-executor/plugins-executor-jython/pom.xml @@ -1,6 +1,7 @@ <!-- ============LICENSE_START======================================================= Copyright (C) 2018 Ericsson. All rights reserved. + Modifications Copyright (C) 2023 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -34,7 +35,7 @@ <dependency> <groupId>org.python</groupId> <artifactId>jython-standalone</artifactId> - <version>2.7.1</version> + <version>${version.jython-standalone}</version> </dependency> </dependencies> </project> |