diff options
Diffstat (limited to 'common/yang-whitelist')
4 files changed, 27 insertions, 14 deletions
diff --git a/common/yang-whitelist/yang-whitelist-api/pom.xml b/common/yang-whitelist/yang-whitelist-api/pom.xml index cddb17e80..a4a75565f 100644 --- a/common/yang-whitelist/yang-whitelist-api/pom.xml +++ b/common/yang-whitelist/yang-whitelist-api/pom.xml @@ -34,7 +34,7 @@ <name>${project.artifactId}</name> <properties> - <jaxb-api.version>2.2.12</jaxb-api.version> + <jaxb-api.version>2.4.0-b180725.0427</jaxb-api.version> </properties> <dependencies> diff --git a/common/yang-whitelist/yang-whitelist-api/src/main/java/io/fd/honeycomb/yang/YangModuleWhitelist.java b/common/yang-whitelist/yang-whitelist-api/src/main/java/io/fd/honeycomb/yang/YangModuleWhitelist.java index fee6c396d..d8e932bf5 100644 --- a/common/yang-whitelist/yang-whitelist-api/src/main/java/io/fd/honeycomb/yang/YangModuleWhitelist.java +++ b/common/yang-whitelist/yang-whitelist-api/src/main/java/io/fd/honeycomb/yang/YangModuleWhitelist.java @@ -22,8 +22,8 @@ import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; /** - * <yang-modules-whitelist> <modules> <module> <package>io.fd.aaa.bbb.ccc</package> <description>XYZ</description> - * </module> </modules> </yang-modules-whitelist> + * <yang-modules-whitelist> <modules> <module> <package>io.fd.aaa.bbb.ccc</package> <description>XYZ</description> + * </module> </modules> </yang-modules-whitelist> */ @XmlRootElement public class YangModuleWhitelist { diff --git a/common/yang-whitelist/yang-whitelist-impl/pom.xml b/common/yang-whitelist/yang-whitelist-impl/pom.xml index e0af117bb..da00dda70 100644 --- a/common/yang-whitelist/yang-whitelist-impl/pom.xml +++ b/common/yang-whitelist/yang-whitelist-impl/pom.xml @@ -34,7 +34,7 @@ <name>${project.artifactId}</name> <properties> - <jaxb-runtime.version>2.2.11</jaxb-runtime.version> + <jaxb-runtime.version>2.3.2</jaxb-runtime.version> <slf4j-simple.version>1.7.25</slf4j-simple.version> </properties> @@ -50,6 +50,26 @@ <version>${jaxb-runtime.version}</version> </dependency> <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>1.3.2</version> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.4.0-b180725.0427</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>2.4.0-b180830.0438</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + <version>2.3.0.1</version> + </dependency> + <dependency> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> <version>3.0.2</version> @@ -71,12 +91,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> - <version>1.3</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> <version>${slf4j-simple.version}</version> diff --git a/common/yang-whitelist/yang-whitelist-impl/src/test/java/io/fd/honeycomb/yang/YangModuleWhitelistReaderTest.java b/common/yang-whitelist/yang-whitelist-impl/src/test/java/io/fd/honeycomb/yang/YangModuleWhitelistReaderTest.java index 6ab917a09..5ca47f28f 100644 --- a/common/yang-whitelist/yang-whitelist-impl/src/test/java/io/fd/honeycomb/yang/YangModuleWhitelistReaderTest.java +++ b/common/yang-whitelist/yang-whitelist-impl/src/test/java/io/fd/honeycomb/yang/YangModuleWhitelistReaderTest.java @@ -18,11 +18,11 @@ package io.fd.honeycomb.yang; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import com.google.common.collect.ImmutableSet; import java.nio.file.Paths; import java.util.List; -import org.hamcrest.CoreMatchers; import org.junit.Before; import org.junit.Test; @@ -50,7 +50,6 @@ public class YangModuleWhitelistReaderTest { moduleA.setDescription("desc"); moduleB.setPckg("module.b.package"); - - assertThat(modules, CoreMatchers.hasItems(moduleA, moduleB)); + assertTrue(modules.containsAll(ImmutableSet.of(moduleA, moduleB))); } }
\ No newline at end of file |