From c10a8eed3a148745b1ce5126d762151e20a7e357 Mon Sep 17 00:00:00 2001 From: Michael Miklavcic Date: Tue, 1 Aug 2017 14:34:09 -0600 Subject: [PATCH] METRON-1072: Cleanup Maven build warnings --- .../src/main/assembly/assembly.xml | 6 +++--- .../src/main/assembly/assembly.xml | 2 +- .../src/main/assembly/assembly.xml | 8 ++++---- metron-interface/metron-config/assembly.xml | 10 +++++----- metron-interface/metron-rest/pom.xml | 4 ++-- .../src/main/assembly/assembly.xml | 6 +++--- .../src/main/assembly/assembly.xml | 4 ++-- .../src/main/assembly/assembly.xml | 4 ++-- .../src/main/assembly/assembly.xml | 6 +++--- .../src/main/assembly/assembly.xml | 10 +++++----- .../src/main/assembly/assembly.xml | 6 +++--- .../src/main/assembly/assembly.xml | 2 +- .../src/main/assembly/assembly.xml | 8 ++++---- .../src/main/assembly/assembly.xml | 8 ++++---- .../pattern/ByteArrayMatchingUtilTest.java | 19 ++++++++++--------- .../src/main/assembly/assembly.xml | 6 +++--- .../src/main/assembly/assembly.xml | 4 ++-- pom.xml | 2 ++ site-book/pom.xml | 2 +- 19 files changed, 60 insertions(+), 57 deletions(-) diff --git a/metron-analytics/metron-maas-service/src/main/assembly/assembly.xml b/metron-analytics/metron-maas-service/src/main/assembly/assembly.xml index 93eeeb1230..ee0fe0227b 100644 --- a/metron-analytics/metron-maas-service/src/main/assembly/assembly.xml +++ b/metron-analytics/metron-maas-service/src/main/assembly/assembly.xml @@ -20,7 +20,7 @@ ${project.basedir}/src/main/config - /config + config true **/*.formatted @@ -32,7 +32,7 @@ ${project.basedir}/src/main/scripts - /bin + bin true **/*.formatted @@ -47,7 +47,7 @@ ${project.artifactId}-${project.version}-uber.jar - /lib + lib true diff --git a/metron-analytics/metron-profiler-client/src/main/assembly/assembly.xml b/metron-analytics/metron-profiler-client/src/main/assembly/assembly.xml index b34bd980f3..b0ab070393 100644 --- a/metron-analytics/metron-profiler-client/src/main/assembly/assembly.xml +++ b/metron-analytics/metron-profiler-client/src/main/assembly/assembly.xml @@ -30,7 +30,7 @@ ${project.artifactId}-${project.version}.jar - /lib + lib true diff --git a/metron-analytics/metron-profiler/src/main/assembly/assembly.xml b/metron-analytics/metron-profiler/src/main/assembly/assembly.xml index 8f28ba193d..9c43074adb 100644 --- a/metron-analytics/metron-profiler/src/main/assembly/assembly.xml +++ b/metron-analytics/metron-profiler/src/main/assembly/assembly.xml @@ -27,7 +27,7 @@ ${project.basedir}/src/main/config - /config + config true **/*.formatted @@ -39,7 +39,7 @@ ${project.basedir}/src/main/scripts - /bin + bin true **/*.formatted @@ -51,7 +51,7 @@ ${project.basedir}/src/main/flux - /flux + flux true **/*.formatted @@ -65,7 +65,7 @@ ${project.artifactId}-${project.version}-uber.jar - /lib + lib true diff --git a/metron-interface/metron-config/assembly.xml b/metron-interface/metron-config/assembly.xml index 39c00e552a..c07fbd63a3 100644 --- a/metron-interface/metron-config/assembly.xml +++ b/metron-interface/metron-config/assembly.xml @@ -20,7 +20,7 @@ ${project.basedir}/dist - /web/management-ui + web/management-ui **/.npmignore @@ -28,7 +28,7 @@ ${project.basedir}/scripts - /web/expressjs + web/expressjs package.json server.js @@ -37,7 +37,7 @@ ${project.basedir}/scripts - /bin + bin true metron-management-ui @@ -48,7 +48,7 @@ ${project.basedir} - /web/management-ui/license + web/management-ui/license LICENSE NOTICE @@ -59,7 +59,7 @@ src/favicon.ico - /web/management-ui + web/management-ui diff --git a/metron-interface/metron-rest/pom.xml b/metron-interface/metron-rest/pom.xml index 2f59433260..cb8752cb58 100644 --- a/metron-interface/metron-rest/pom.xml +++ b/metron-interface/metron-rest/pom.xml @@ -260,12 +260,12 @@ org.apache.metron metron-indexing - ${parent.version} + ${project.parent.version} org.apache.metron metron-indexing - ${parent.version} + ${project.parent.version} test-jar test diff --git a/metron-interface/metron-rest/src/main/assembly/assembly.xml b/metron-interface/metron-rest/src/main/assembly/assembly.xml index 7a5dbeeb4b..e0e4f147f6 100644 --- a/metron-interface/metron-rest/src/main/assembly/assembly.xml +++ b/metron-interface/metron-rest/src/main/assembly/assembly.xml @@ -20,7 +20,7 @@ ${project.basedir}/src/main/config - /config + config true **/*.formatted @@ -32,7 +32,7 @@ ${project.basedir}/src/main/scripts - /bin + bin true **/*.formatted @@ -47,7 +47,7 @@ ${project.artifactId}-${project.version}.jar - /lib + lib true diff --git a/metron-platform/metron-common/src/main/assembly/assembly.xml b/metron-platform/metron-common/src/main/assembly/assembly.xml index 0b36f9dbe6..3595284177 100644 --- a/metron-platform/metron-common/src/main/assembly/assembly.xml +++ b/metron-platform/metron-common/src/main/assembly/assembly.xml @@ -20,7 +20,7 @@ ${project.basedir}/src/main/scripts - /bin + bin true **/*.formatted @@ -35,7 +35,7 @@ ${project.artifactId}-${project.version}.jar - /lib + lib true diff --git a/metron-platform/metron-data-management/src/main/assembly/assembly.xml b/metron-platform/metron-data-management/src/main/assembly/assembly.xml index 0b36f9dbe6..3595284177 100644 --- a/metron-platform/metron-data-management/src/main/assembly/assembly.xml +++ b/metron-platform/metron-data-management/src/main/assembly/assembly.xml @@ -20,7 +20,7 @@ ${project.basedir}/src/main/scripts - /bin + bin true **/*.formatted @@ -35,7 +35,7 @@ ${project.artifactId}-${project.version}.jar - /lib + lib true diff --git a/metron-platform/metron-elasticsearch/src/main/assembly/assembly.xml b/metron-platform/metron-elasticsearch/src/main/assembly/assembly.xml index 15359672b3..f8ce2da746 100644 --- a/metron-platform/metron-elasticsearch/src/main/assembly/assembly.xml +++ b/metron-platform/metron-elasticsearch/src/main/assembly/assembly.xml @@ -20,7 +20,7 @@ ${project.basedir}/src/main/config - /config + config true **/*.formatted @@ -32,7 +32,7 @@ ${project.basedir}/src/main/scripts - /bin + bin true **/*.formatted @@ -47,7 +47,7 @@ ${project.artifactId}-${project.version}-uber.jar - /lib + lib true diff --git a/metron-platform/metron-enrichment/src/main/assembly/assembly.xml b/metron-platform/metron-enrichment/src/main/assembly/assembly.xml index 6cbe4e7f0a..c6814684b6 100644 --- a/metron-platform/metron-enrichment/src/main/assembly/assembly.xml +++ b/metron-platform/metron-enrichment/src/main/assembly/assembly.xml @@ -20,7 +20,7 @@ ${project.basedir}/src/main/config - /config + config true **/*.formatted @@ -33,7 +33,7 @@ ${project.basedir}/src/main/scripts - /bin + bin true **/*.formatted @@ -45,7 +45,7 @@ ${project.basedir}/src/main/resources/ddl - /ddl + ddl true **/*.formatted @@ -57,7 +57,7 @@ ${project.basedir}/src/main/flux - /flux + flux true **/*.formatted @@ -71,7 +71,7 @@ ${project.artifactId}-${project.version}-uber.jar - /lib + lib true diff --git a/metron-platform/metron-indexing/src/main/assembly/assembly.xml b/metron-platform/metron-indexing/src/main/assembly/assembly.xml index 6c9165c5e7..77778e3ba8 100644 --- a/metron-platform/metron-indexing/src/main/assembly/assembly.xml +++ b/metron-platform/metron-indexing/src/main/assembly/assembly.xml @@ -20,7 +20,7 @@ ${project.basedir}/src/main/config - /config + config true **/*.formatted @@ -32,7 +32,7 @@ ${project.basedir}/src/main/scripts - /bin + bin true **/*.formatted @@ -44,7 +44,7 @@ ${project.basedir}/src/main/flux - /flux + flux true **/*.formatted diff --git a/metron-platform/metron-management/src/main/assembly/assembly.xml b/metron-platform/metron-management/src/main/assembly/assembly.xml index 81b79e257a..a7e20ed8ec 100644 --- a/metron-platform/metron-management/src/main/assembly/assembly.xml +++ b/metron-platform/metron-management/src/main/assembly/assembly.xml @@ -23,7 +23,7 @@ ${project.artifactId}-${project.version}.jar - /lib + lib true diff --git a/metron-platform/metron-parsers/src/main/assembly/assembly.xml b/metron-platform/metron-parsers/src/main/assembly/assembly.xml index e0b3f6dcab..bad1f00fff 100644 --- a/metron-platform/metron-parsers/src/main/assembly/assembly.xml +++ b/metron-platform/metron-parsers/src/main/assembly/assembly.xml @@ -20,7 +20,7 @@ ${project.basedir}/src/main/config - /config + config true **/*.formatted @@ -32,7 +32,7 @@ ${project.basedir}/src/main/resources/patterns - /patterns + patterns true **/*.formatted @@ -43,7 +43,7 @@ ${project.basedir}/src/main/scripts - /bin + bin true **/*.formatted @@ -58,7 +58,7 @@ ${project.artifactId}-${project.version}-uber.jar - /lib + lib true diff --git a/metron-platform/metron-pcap-backend/src/main/assembly/assembly.xml b/metron-platform/metron-pcap-backend/src/main/assembly/assembly.xml index b2111130fb..5b21e10986 100644 --- a/metron-platform/metron-pcap-backend/src/main/assembly/assembly.xml +++ b/metron-platform/metron-pcap-backend/src/main/assembly/assembly.xml @@ -20,7 +20,7 @@ ${project.basedir}/src/main/config - /config + config true **/*.formatted @@ -31,7 +31,7 @@ ${project.basedir}/src/main/scripts - /bin + bin true **/*.formatted @@ -43,7 +43,7 @@ ${project.basedir}/src/main/flux - /flux + flux true **/*.formatted @@ -57,7 +57,7 @@ ${project.artifactId}-${project.version}.jar - /lib + lib true diff --git a/metron-platform/metron-pcap/src/test/java/org/apache/metron/pcap/pattern/ByteArrayMatchingUtilTest.java b/metron-platform/metron-pcap/src/test/java/org/apache/metron/pcap/pattern/ByteArrayMatchingUtilTest.java index 0f1d0ec772..97f222e0f3 100644 --- a/metron-platform/metron-pcap/src/test/java/org/apache/metron/pcap/pattern/ByteArrayMatchingUtilTest.java +++ b/metron-platform/metron-pcap/src/test/java/org/apache/metron/pcap/pattern/ByteArrayMatchingUtilTest.java @@ -17,6 +17,7 @@ */ package org.apache.metron.pcap.pattern; +import java.nio.charset.StandardCharsets; import org.apache.metron.stellar.common.utils.StellarProcessorUtils; import org.junit.Assert; import org.junit.Test; @@ -85,10 +86,10 @@ public static Collection strategies() { @Test public void testStringMatch() throws ExecutionException { - Assert.assertTrue(strategy.evaluate("`metron`", "metron".getBytes())); - Assert.assertTrue(strategy.evaluate("`metron`", "metron example".getBytes())); - Assert.assertTrue(strategy.evaluate("`metron`", "edward metron example".getBytes())); - Assert.assertFalse(strategy.evaluate("`metron`", "apache".getBytes())); + Assert.assertTrue(strategy.evaluate("`metron`", "metron".getBytes(StandardCharsets.UTF_8))); + Assert.assertTrue(strategy.evaluate("`metron`", "metron example".getBytes(StandardCharsets.UTF_8))); + Assert.assertTrue(strategy.evaluate("`metron`", "edward metron example".getBytes(StandardCharsets.UTF_8))); + Assert.assertFalse(strategy.evaluate("`metron`", "apache".getBytes(StandardCharsets.UTF_8))); } @Test @@ -98,11 +99,11 @@ public void testBytesMatch() throws ExecutionException { Assert.assertTrue(strategy.evaluate("(2f56)(.){2}(14bc56420489ca38e7faf8cec3d4)", REALPACKET)); Assert.assertFalse(strategy.evaluate("(3f56)(.){2}(14bc56420489ca38e7faf8cec3d4)", REALPACKET)); Assert.assertFalse(strategy.evaluate("3f56abd814bc56420489ca38e7faf8cec3d4", REALPACKET)); - Assert.assertTrue(strategy.evaluate("deadbeef", join(DEADBEEF, "metron".getBytes()))); - Assert.assertTrue(strategy.evaluate("deadbeef", join(DEADBEEF, "metron".getBytes()))); - Assert.assertTrue(strategy.evaluate("deadbeef `metron`", join(DEADBEEF, "metron".getBytes()))); - Assert.assertTrue(strategy.evaluate("deadbeef `metron`", join(DEADBEEF, "metronjones".getBytes()))); - Assert.assertTrue(strategy.evaluate("deadbeef `metron`", join(DEADBEEF, "metronjones".getBytes(), DEADBEEF))); + Assert.assertTrue(strategy.evaluate("deadbeef", join(DEADBEEF, "metron".getBytes(StandardCharsets.UTF_8)))); + Assert.assertTrue(strategy.evaluate("deadbeef", join(DEADBEEF, "metron".getBytes(StandardCharsets.UTF_8)))); + Assert.assertTrue(strategy.evaluate("deadbeef `metron`", join(DEADBEEF, "metron".getBytes(StandardCharsets.UTF_8)))); + Assert.assertTrue(strategy.evaluate("deadbeef `metron`", join(DEADBEEF, "metronjones".getBytes(StandardCharsets.UTF_8)))); + Assert.assertTrue(strategy.evaluate("deadbeef `metron`", join(DEADBEEF, "metronjones".getBytes(StandardCharsets.UTF_8), DEADBEEF))); Assert.assertTrue(strategy.evaluate("([ff]){4}", ALLFS)); Assert.assertFalse(strategy.evaluate("([ff]){6}", ALLFS)); Assert.assertTrue(strategy.evaluate("[^ff]", new byte[] { (byte)0x00 })); diff --git a/metron-platform/metron-solr/src/main/assembly/assembly.xml b/metron-platform/metron-solr/src/main/assembly/assembly.xml index 51491aeb90..aabc537dc2 100644 --- a/metron-platform/metron-solr/src/main/assembly/assembly.xml +++ b/metron-platform/metron-solr/src/main/assembly/assembly.xml @@ -20,7 +20,7 @@ ${project.basedir}/src/main/config - /config + config true **/*.formatted @@ -33,7 +33,7 @@ ${project.basedir}/src/main/scripts - /bin + bin true **/*.formatted @@ -48,7 +48,7 @@ ${project.artifactId}-${project.version}-uber.jar - /lib + lib true diff --git a/metron-stellar/stellar-common/src/main/assembly/assembly.xml b/metron-stellar/stellar-common/src/main/assembly/assembly.xml index 51956aa997..0b5dfb832b 100644 --- a/metron-stellar/stellar-common/src/main/assembly/assembly.xml +++ b/metron-stellar/stellar-common/src/main/assembly/assembly.xml @@ -20,7 +20,7 @@ ${project.basedir}/src/main/scripts - /bin + bin true **/*.formatted @@ -35,7 +35,7 @@ ${project.artifactId}-${project.version}-uber.jar - /lib + lib true diff --git a/pom.xml b/pom.xml index 2a0ebcdb92..ad97f58a9f 100644 --- a/pom.xml +++ b/pom.xml @@ -70,6 +70,8 @@ @ApacheMetron + UTF-8 + UTF-8 1.0.1 1.0.1 diff --git a/site-book/pom.xml b/site-book/pom.xml index 371ed6003f..cef84be3a8 100644 --- a/site-book/pom.xml +++ b/site-book/pom.xml @@ -17,7 +17,7 @@ 4.0.0 org.apache.metron site-book - + pom site-book org.apache.metron