You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by mm...@apache.org on 2017/08/02 16:26:26 UTC
metron git commit: METRON-1072: Cleanup Maven build warnings
(mmiklavc) closes apache/metron#676
Repository: metron
Updated Branches:
refs/heads/master 19096fe62 -> 27ab28923
METRON-1072: Cleanup Maven build warnings (mmiklavc) closes apache/metron#676
Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/27ab2892
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/27ab2892
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/27ab2892
Branch: refs/heads/master
Commit: 27ab28923107b18b90bbe1c0c360aa3f1e338666
Parents: 19096fe
Author: mmiklavc <mi...@gmail.com>
Authored: Wed Aug 2 10:26:10 2017 -0600
Committer: Michael Miklavcic <mi...@gmail.com>
Committed: Wed Aug 2 10:26:10 2017 -0600
----------------------------------------------------------------------
.../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 ++--
.../metron-rest/src/main/assembly/assembly.xml | 6 +++---
.../metron-common/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 ++++----
.../pcap/pattern/ByteArrayMatchingUtilTest.java | 19 ++++++++++---------
.../metron-solr/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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metron/blob/27ab2892/metron-analytics/metron-maas-service/src/main/assembly/assembly.xml
----------------------------------------------------------------------
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 93eeeb1..ee0fe02 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 @@
<fileSets>
<fileSet>
<directory>${project.basedir}/src/main/config</directory>
- <outputDirectory>/config</outputDirectory>
+ <outputDirectory>config</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -32,7 +32,7 @@
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/scripts</directory>
- <outputDirectory>/bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -47,7 +47,7 @@
<includes>
<include>${project.artifactId}-${project.version}-uber.jar</include>
</includes>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>
http://git-wip-us.apache.org/repos/asf/metron/blob/27ab2892/metron-analytics/metron-profiler-client/src/main/assembly/assembly.xml
----------------------------------------------------------------------
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 b34bd98..b0ab070 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 @@
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>
http://git-wip-us.apache.org/repos/asf/metron/blob/27ab2892/metron-analytics/metron-profiler/src/main/assembly/assembly.xml
----------------------------------------------------------------------
diff --git a/metron-analytics/metron-profiler/src/main/assembly/assembly.xml b/metron-analytics/metron-profiler/src/main/assembly/assembly.xml
index 8f28ba1..9c43074 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 @@
<fileSets>
<fileSet>
<directory>${project.basedir}/src/main/config</directory>
- <outputDirectory>/config</outputDirectory>
+ <outputDirectory>config</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -39,7 +39,7 @@
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/scripts</directory>
- <outputDirectory>/bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -51,7 +51,7 @@
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/flux</directory>
- <outputDirectory>/flux</outputDirectory>
+ <outputDirectory>flux</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -65,7 +65,7 @@
<includes>
<include>${project.artifactId}-${project.version}-uber.jar</include>
</includes>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>
http://git-wip-us.apache.org/repos/asf/metron/blob/27ab2892/metron-interface/metron-config/assembly.xml
----------------------------------------------------------------------
diff --git a/metron-interface/metron-config/assembly.xml b/metron-interface/metron-config/assembly.xml
index 39c00e5..c07fbd6 100644
--- a/metron-interface/metron-config/assembly.xml
+++ b/metron-interface/metron-config/assembly.xml
@@ -20,7 +20,7 @@
<fileSets>
<fileSet>
<directory>${project.basedir}/dist</directory>
- <outputDirectory>/web/management-ui</outputDirectory>
+ <outputDirectory>web/management-ui</outputDirectory>
<excludes>
<exclude>**/.npmignore</exclude>
</excludes>
@@ -28,7 +28,7 @@
</fileSet>
<fileSet>
<directory>${project.basedir}/scripts</directory>
- <outputDirectory>/web/expressjs</outputDirectory>
+ <outputDirectory>web/expressjs</outputDirectory>
<includes>
<include>package.json</include>
<include>server.js</include>
@@ -37,7 +37,7 @@
</fileSet>
<fileSet>
<directory>${project.basedir}/scripts</directory>
- <outputDirectory>/bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
<include>metron-management-ui</include>
@@ -48,7 +48,7 @@
</fileSet>
<fileSet>
<directory>${project.basedir}</directory>
- <outputDirectory>/web/management-ui/license</outputDirectory>
+ <outputDirectory>web/management-ui/license</outputDirectory>
<includes>
<include>LICENSE</include>
<include>NOTICE</include>
@@ -59,7 +59,7 @@
<files>
<file>
<source>src/favicon.ico</source>
- <outputDirectory>/web/management-ui</outputDirectory>
+ <outputDirectory>web/management-ui</outputDirectory>
</file>
</files>
</assembly>
http://git-wip-us.apache.org/repos/asf/metron/blob/27ab2892/metron-interface/metron-rest/pom.xml
----------------------------------------------------------------------
diff --git a/metron-interface/metron-rest/pom.xml b/metron-interface/metron-rest/pom.xml
index 2f59433..cb8752c 100644
--- a/metron-interface/metron-rest/pom.xml
+++ b/metron-interface/metron-rest/pom.xml
@@ -260,12 +260,12 @@
<dependency>
<groupId>org.apache.metron</groupId>
<artifactId>metron-indexing</artifactId>
- <version>${parent.version}</version>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.metron</groupId>
<artifactId>metron-indexing</artifactId>
- <version>${parent.version}</version>
+ <version>${project.parent.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/metron/blob/27ab2892/metron-interface/metron-rest/src/main/assembly/assembly.xml
----------------------------------------------------------------------
diff --git a/metron-interface/metron-rest/src/main/assembly/assembly.xml b/metron-interface/metron-rest/src/main/assembly/assembly.xml
index 7a5dbee..e0e4f14 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 @@
<fileSets>
<fileSet>
<directory>${project.basedir}/src/main/config</directory>
- <outputDirectory>/config</outputDirectory>
+ <outputDirectory>config</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -32,7 +32,7 @@
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/scripts</directory>
- <outputDirectory>/bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -47,7 +47,7 @@
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>
http://git-wip-us.apache.org/repos/asf/metron/blob/27ab2892/metron-platform/metron-common/src/main/assembly/assembly.xml
----------------------------------------------------------------------
diff --git a/metron-platform/metron-common/src/main/assembly/assembly.xml b/metron-platform/metron-common/src/main/assembly/assembly.xml
index 0b36f9d..3595284 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 @@
<fileSets>
<fileSet>
<directory>${project.basedir}/src/main/scripts</directory>
- <outputDirectory>/bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -35,7 +35,7 @@
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>
http://git-wip-us.apache.org/repos/asf/metron/blob/27ab2892/metron-platform/metron-data-management/src/main/assembly/assembly.xml
----------------------------------------------------------------------
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 0b36f9d..3595284 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 @@
<fileSets>
<fileSet>
<directory>${project.basedir}/src/main/scripts</directory>
- <outputDirectory>/bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -35,7 +35,7 @@
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>
http://git-wip-us.apache.org/repos/asf/metron/blob/27ab2892/metron-platform/metron-elasticsearch/src/main/assembly/assembly.xml
----------------------------------------------------------------------
diff --git a/metron-platform/metron-elasticsearch/src/main/assembly/assembly.xml b/metron-platform/metron-elasticsearch/src/main/assembly/assembly.xml
index 1535967..f8ce2da 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 @@
<fileSets>
<fileSet>
<directory>${project.basedir}/src/main/config</directory>
- <outputDirectory>/config</outputDirectory>
+ <outputDirectory>config</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -32,7 +32,7 @@
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/scripts</directory>
- <outputDirectory>/bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -47,7 +47,7 @@
<includes>
<include>${project.artifactId}-${project.version}-uber.jar</include>
</includes>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>
http://git-wip-us.apache.org/repos/asf/metron/blob/27ab2892/metron-platform/metron-enrichment/src/main/assembly/assembly.xml
----------------------------------------------------------------------
diff --git a/metron-platform/metron-enrichment/src/main/assembly/assembly.xml b/metron-platform/metron-enrichment/src/main/assembly/assembly.xml
index 6cbe4e7..c681468 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 @@
<fileSets>
<fileSet>
<directory>${project.basedir}/src/main/config</directory>
- <outputDirectory>/config</outputDirectory>
+ <outputDirectory>config</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -33,7 +33,7 @@
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/scripts</directory>
- <outputDirectory>/bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -45,7 +45,7 @@
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/resources/ddl</directory>
- <outputDirectory>/ddl</outputDirectory>
+ <outputDirectory>ddl</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -57,7 +57,7 @@
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/flux</directory>
- <outputDirectory>/flux</outputDirectory>
+ <outputDirectory>flux</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -71,7 +71,7 @@
<includes>
<include>${project.artifactId}-${project.version}-uber.jar</include>
</includes>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>
http://git-wip-us.apache.org/repos/asf/metron/blob/27ab2892/metron-platform/metron-indexing/src/main/assembly/assembly.xml
----------------------------------------------------------------------
diff --git a/metron-platform/metron-indexing/src/main/assembly/assembly.xml b/metron-platform/metron-indexing/src/main/assembly/assembly.xml
index 6c9165c..77778e3 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 @@
<fileSets>
<fileSet>
<directory>${project.basedir}/src/main/config</directory>
- <outputDirectory>/config</outputDirectory>
+ <outputDirectory>config</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -32,7 +32,7 @@
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/scripts</directory>
- <outputDirectory>/bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -44,7 +44,7 @@
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/flux</directory>
- <outputDirectory>/flux</outputDirectory>
+ <outputDirectory>flux</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
http://git-wip-us.apache.org/repos/asf/metron/blob/27ab2892/metron-platform/metron-management/src/main/assembly/assembly.xml
----------------------------------------------------------------------
diff --git a/metron-platform/metron-management/src/main/assembly/assembly.xml b/metron-platform/metron-management/src/main/assembly/assembly.xml
index 81b79e2..a7e20ed 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 @@
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>
http://git-wip-us.apache.org/repos/asf/metron/blob/27ab2892/metron-platform/metron-parsers/src/main/assembly/assembly.xml
----------------------------------------------------------------------
diff --git a/metron-platform/metron-parsers/src/main/assembly/assembly.xml b/metron-platform/metron-parsers/src/main/assembly/assembly.xml
index e0b3f6d..bad1f00 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 @@
<fileSets>
<fileSet>
<directory>${project.basedir}/src/main/config</directory>
- <outputDirectory>/config</outputDirectory>
+ <outputDirectory>config</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -32,7 +32,7 @@
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/resources/patterns</directory>
- <outputDirectory>/patterns</outputDirectory>
+ <outputDirectory>patterns</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -43,7 +43,7 @@
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/scripts</directory>
- <outputDirectory>/bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -58,7 +58,7 @@
<includes>
<include>${project.artifactId}-${project.version}-uber.jar</include>
</includes>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>
http://git-wip-us.apache.org/repos/asf/metron/blob/27ab2892/metron-platform/metron-pcap-backend/src/main/assembly/assembly.xml
----------------------------------------------------------------------
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 b211113..5b21e10 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 @@
<fileSets>
<fileSet>
<directory>${project.basedir}/src/main/config</directory>
- <outputDirectory>/config</outputDirectory>
+ <outputDirectory>config</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -31,7 +31,7 @@
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/scripts</directory>
- <outputDirectory>/bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -43,7 +43,7 @@
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/flux</directory>
- <outputDirectory>/flux</outputDirectory>
+ <outputDirectory>flux</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -57,7 +57,7 @@
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>
http://git-wip-us.apache.org/repos/asf/metron/blob/27ab2892/metron-platform/metron-pcap/src/test/java/org/apache/metron/pcap/pattern/ByteArrayMatchingUtilTest.java
----------------------------------------------------------------------
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 0f1d0ec..97f222e 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 class ByteArrayMatchingUtilTest {
@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 class ByteArrayMatchingUtilTest {
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 }));
http://git-wip-us.apache.org/repos/asf/metron/blob/27ab2892/metron-platform/metron-solr/src/main/assembly/assembly.xml
----------------------------------------------------------------------
diff --git a/metron-platform/metron-solr/src/main/assembly/assembly.xml b/metron-platform/metron-solr/src/main/assembly/assembly.xml
index 51491ae..aabc537 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 @@
<fileSets>
<fileSet>
<directory>${project.basedir}/src/main/config</directory>
- <outputDirectory>/config</outputDirectory>
+ <outputDirectory>config</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -33,7 +33,7 @@
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/scripts</directory>
- <outputDirectory>/bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -48,7 +48,7 @@
<includes>
<include>${project.artifactId}-${project.version}-uber.jar</include>
</includes>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>
http://git-wip-us.apache.org/repos/asf/metron/blob/27ab2892/metron-stellar/stellar-common/src/main/assembly/assembly.xml
----------------------------------------------------------------------
diff --git a/metron-stellar/stellar-common/src/main/assembly/assembly.xml b/metron-stellar/stellar-common/src/main/assembly/assembly.xml
index 51956aa..0b5dfb8 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 @@
<fileSets>
<fileSet>
<directory>${project.basedir}/src/main/scripts</directory>
- <outputDirectory>/bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.formatted</exclude>
@@ -35,7 +35,7 @@
<includes>
<include>${project.artifactId}-${project.version}-uber.jar</include>
</includes>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>
http://git-wip-us.apache.org/repos/asf/metron/blob/27ab2892/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2a0ebcd..ad97f58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,8 @@
<properties>
<twitter>@ApacheMetron</twitter>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- base project versions -->
<base_storm_version>1.0.1</base_storm_version>
<base_flux_version>1.0.1</base_flux_version>
http://git-wip-us.apache.org/repos/asf/metron/blob/27ab2892/site-book/pom.xml
----------------------------------------------------------------------
diff --git a/site-book/pom.xml b/site-book/pom.xml
index 371ed60..cef84be 100644
--- a/site-book/pom.xml
+++ b/site-book/pom.xml
@@ -17,7 +17,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.metron</groupId>
<artifactId>site-book</artifactId>
- <!-- <packaging>pom</packaging> -->
+ <packaging>pom</packaging>
<name>site-book</name>
<parent>
<groupId>org.apache.metron</groupId>