lttng: Add pcap.core to the Maven build

And added a redundant annotation to to fix the lack-of-inheritance
problem with Maven's compiler.

Change-Id: Ib78f9dbbe1842da49a2509eb3e79913b1a94783d
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-on: https://git.eclipse.org/r/30372
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/ConversionHelper.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/ConversionHelper.java
index 0d1057d72aa20ce2850404a9824cabd5f0bf04a7..1cade736a82c85bd71a73bda85a1cc562837330c 100644 (file)
--- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/ConversionHelper.java
+++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/ConversionHelper.java
@@ -16,6 +16,7 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.linuxtools.pcap.core.protocol.ethernet2.EthernetIIValues;
 import org.eclipse.linuxtools.pcap.core.protocol.ipv4.IPv4Values;
 
@@ -26,9 +27,8 @@ import org.eclipse.linuxtools.pcap.core.protocol.ipv4.IPv4Values;
  */
 public final class ConversionHelper {
 
-
     @SuppressWarnings("null")
-    private static final char[] HEX_ARRAY = "0123456789abcdef".toCharArray(); //$NON-NLS-1$
+    private static final @NonNull char[] HEX_ARRAY = "0123456789abcdef".toCharArray(); //$NON-NLS-1$
     private static final String EMPTY_STRING = ""; //$NON-NLS-1$
     private static final String DEFAULT_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss.SSS"; //$NON-NLS-1$
     private static final DateFormat DATE_FORMATTER = new SimpleDateFormat(DEFAULT_TIME_PATTERN);

diff --git a/pom.xml b/pom.xml
index cd091a75f6ba0fa76e7f3147549bec75cbbbd0ed..e85a03cfea0062ca4fc2c2f280a23aa14346f437 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -100,6 +100,8 @@
     <module>org.eclipse.linuxtools.ctf.parser</module>
     <module>org.eclipse.linuxtools.ctf.parser.tests</module>
 
+    <module>org.eclipse.linuxtools.pcap.core</module>
+
     <module>org.eclipse.linuxtools.statesystem.core</module>
     <module>org.eclipse.linuxtools.statesystem.core.tests</module>