metron-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ceste...@apache.org
Subject [47/66] [abbrv] incubator-metron git commit: METRON-224 Metron should build from top-level directory closes apache/incubator-metron#157
Date Fri, 24 Jun 2016 20:57:45 GMT
METRON-224 Metron should build from top-level directory closes apache/incubator-metron#157


Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/056cfe20
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/056cfe20
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/056cfe20

Branch: refs/heads/master
Commit: 056cfe20049ddc4bb60928b039a915cd50d38363
Parents: 7aa2f1a
Author: dlyle65535 <dlyle65535@gmail.com>
Authored: Fri Jun 17 15:32:10 2016 -0400
Committer: David Lyle <dlyle65535@gmail.com>
Committed: Fri Jun 17 15:32:10 2016 -0400

----------------------------------------------------------------------
 .travis.yml                                     |   2 +-
 metron-deployment/README.md                     |   2 +-
 metron-deployment/amazon-ec2/run.sh             |   2 +-
 .../vagrant/full-dev-platform/README.md         |   2 +-
 .../vagrant/quick-dev-platform/README.md        |   2 +-
 metron-platform/metron-common/pom.xml           |  22 +--
 metron-platform/pom.xml                         | 152 +------------------
 metron-platform/style/LICENSE.config            |  16 --
 metron-platform/style/LICENSE.java              |  17 ---
 metron-platform/style/LICENSE.xml               |  16 --
 metron-platform/style/checkstyle.xml            |  39 -----
 metron-platform/style/suppressions.xml          |  31 ----
 pom.xml                                         | 143 +++++++++++++++--
 13 files changed, 152 insertions(+), 294 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/056cfe20/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index ad6b444..6fe6835 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,4 +3,4 @@ jdk:
   - oraclejdk8
 script:
   - |
-    mvn apache-rat:check && cd metron-platform && mvn -q integration-test
package
+    mvn -q integration-test install

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/056cfe20/metron-deployment/README.md
----------------------------------------------------------------------
diff --git a/metron-deployment/README.md b/metron-deployment/README.md
index e7e988d..c523b8e 100644
--- a/metron-deployment/README.md
+++ b/metron-deployment/README.md
@@ -13,7 +13,7 @@ The following tools are required to run these scripts:
 Currently Metron must be built from source.  Before running these scripts perform the following
steps:
 
 1. Clone the Metron git repository with `git clone git@github.com:apache/incubator-metron.git`
-2. Navigate to `incubator-metron/metron-platform` and run `mvn clean package`
+2. Navigate to `incubator-metron` and run `mvn clean package`
 
 These scripts depend on two files for configuration:
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/056cfe20/metron-deployment/amazon-ec2/run.sh
----------------------------------------------------------------------
diff --git a/metron-deployment/amazon-ec2/run.sh b/metron-deployment/amazon-ec2/run.sh
index 3019167..9892d5c 100755
--- a/metron-deployment/amazon-ec2/run.sh
+++ b/metron-deployment/amazon-ec2/run.sh
@@ -59,7 +59,7 @@ echo "Launching Metron[$ENV] @ $NOW"... >> $LOGFILE
 $DEPLOYDIR/../scripts/platform-info.sh >> $LOGFILE
 
 # build metron
-cd ../../metron-platform
+cd ../..
 mvn package -DskipTests
 
 # deploy metron

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/056cfe20/metron-deployment/vagrant/full-dev-platform/README.md
----------------------------------------------------------------------
diff --git a/metron-deployment/vagrant/full-dev-platform/README.md b/metron-deployment/vagrant/full-dev-platform/README.md
index 0269de9..3e079fd 100644
--- a/metron-deployment/vagrant/full-dev-platform/README.md
+++ b/metron-deployment/vagrant/full-dev-platform/README.md
@@ -37,7 +37,7 @@ Any platform that supports these tools is suitable, but the following instructio
 1. Build Metron
 
   ```
-  cd metron-platform
+  cd incubator-metron
   mvn clean package -DskipTests
   ```
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/056cfe20/metron-deployment/vagrant/quick-dev-platform/README.md
----------------------------------------------------------------------
diff --git a/metron-deployment/vagrant/quick-dev-platform/README.md b/metron-deployment/vagrant/quick-dev-platform/README.md
index b75f256..b6f8a6d 100644
--- a/metron-deployment/vagrant/quick-dev-platform/README.md
+++ b/metron-deployment/vagrant/quick-dev-platform/README.md
@@ -25,7 +25,7 @@ As with the Full Development Platform (`metron-deployment/vagrant/full-dev-platf
 1. Build Metron
 
   ```
-  cd metron-platform
+  cd incubator-metron
   mvn clean package -DskipTests
   ```
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/056cfe20/metron-platform/metron-common/pom.xml
----------------------------------------------------------------------
diff --git a/metron-platform/metron-common/pom.xml b/metron-platform/metron-common/pom.xml
index 0a36915..28e6626 100644
--- a/metron-platform/metron-common/pom.xml
+++ b/metron-platform/metron-common/pom.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  Licensed to the Apache Software 
-	Foundation (ASF) under one or more contributor license agreements. See the 
-	NOTICE file distributed with this work for additional information regarding 
-	copyright ownership. The ASF licenses this file to You under the Apache License, 
-	Version 2.0 (the "License"); you may not use this file except in compliance 
-	with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0

-	Unless required by applicable law or agreed to in writing, software distributed 
-	under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES 
-	OR CONDITIONS OF ANY KIND, either express or implied. See the License for 
-  the specific language governing permissions and limitations under the License. 
+<!--
+  Licensed to the Apache Software
+	Foundation (ASF) under one or more contributor license agreements. See the
+	NOTICE file distributed with this work for additional information regarding
+	copyright ownership. The ASF licenses this file to You under the Apache License,
+	Version 2.0 (the "License"); you may not use this file except in compliance
+	with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+	Unless required by applicable law or agreed to in writing, software distributed
+	under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+	OR CONDITIONS OF ANY KIND, either express or implied. See the License for
+  the specific language governing permissions and limitations under the License.
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/056cfe20/metron-platform/pom.xml
----------------------------------------------------------------------
diff --git a/metron-platform/pom.xml b/metron-platform/pom.xml
index 9267a43..ab906ef 100644
--- a/metron-platform/pom.xml
+++ b/metron-platform/pom.xml
@@ -20,6 +20,11 @@
 	<version>0.1BETA</version>
 	<packaging>pom</packaging>
 	<name>metron-platform</name>
+	<parent>
+		<groupId>org.apache.metron</groupId>
+		<artifactId>Metron</artifactId>
+		<version>0.1BETA</version>
+	</parent>
 	<description>Stream analytics for Metron</description>
 	<url>https://metron.incubator.apache.org/</url>
 	<scm>
@@ -28,31 +33,7 @@
 		<tag>HEAD</tag>
 		<url>https://git-wip-us.apache.org/repos/asf/incubator-metron</url>
 	</scm>
-	<properties>
-		<twitter>@ApacheMetron</twitter>
-		<global_opencsv_version>3.7</global_opencsv_version>
-		<global_storm_version>0.10.0</global_storm_version>
-		<global_flux_version>0.10.0</global_flux_version>
-		<global_pcap_version>1.7.1</global_pcap_version>
-		<global_kafka_version>0.8.2.2</global_kafka_version>
-		<global_hadoop_version>2.7.1</global_hadoop_version>
-		<global_hbase_version>1.1.1</global_hbase_version>
-		<global_flume_version>1.5.2</global_flume_version>
-		<global_elasticsearch_version>2.3.3</global_elasticsearch_version>
-		<global_json_simple_version>1.1.1</global_json_simple_version>
-		<global_metrics_version>3.0.2</global_metrics_version>
-		<global_junit_version>4.4</global_junit_version>
-		<global_guava_version>17.0</global_guava_version>
-		<global_hbase_guava_version>12.0</global_hbase_guava_version>
-		<global_json_schema_validator_version>2.2.5</global_json_schema_validator_version>
-		<global_slf4j_version>1.7.7</global_slf4j_version>
-		<global_opencsv_version>3.7</global_opencsv_version>
-		<global_java_version>1.8</global_java_version>
-		<global_solr_version>5.2.1</global_solr_version>
-		<global_mockito_version>1.10.19</global_mockito_version>
-		<global_shade_version>2.4.3</global_shade_version>
-		<global_jackson_version>2.7.4</global_jackson_version>
-	</properties>
+
 	<licenses>
 		<license>
 			<name>The Apache Software License, Version 2.0</name>
@@ -75,15 +56,6 @@
 		<module>elasticsearch-shaded</module>
 		<module>metron-elasticsearch</module>
 	</modules>
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.mockito</groupId>
-				<artifactId>mockito-core</artifactId>
-				<version>${global_mockito_version}</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
 	<dependencies>
 		<dependency>
 			<groupId>junit</groupId>
@@ -99,118 +71,8 @@
 		</dependency>
 	</dependencies>
 	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<!-- Separates the unit tests from the integration tests. -->
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.18</version>
-					<configuration>
-						<!-- Skip the default running of this plug-in (or everything is run twice...see
below) -->
-						<argLine>-Xmx2048m</argLine>
-						<skip>true</skip>
-						<!-- Show 100% of the lines from the stack trace (doesn't work) -->
-						<trimStackTrace>false</trimStackTrace>
-					</configuration>
-					<executions>
-						<execution>
-							<id>unit-tests</id>
-							<phase>test</phase>
-							<goals>
-								<goal>test</goal>
-							</goals>
-							<configuration>
-								<!-- Never skip running the tests when the test phase is invoked -->
-								<skip>false</skip>
-								<includes>
-									<!-- Include unit tests within integration-test phase. -->
-									<include>**/*Test.java</include>
-								</includes>
-								<excludes>
-									<!-- Exclude integration tests within (unit) test phase. -->
-									<exclude>**/*IntegrationTest.java</exclude>
-								</excludes>
-							</configuration>
-						</execution>
-						<execution>
-							<id>integration-tests</id>
-							<phase>integration-test</phase>
-							<goals>
-								<goal>test</goal>
-							</goals>
-							<configuration>
-								<!-- Never skip running the tests when the integration-test phase is invoked -->
-								<skip>false</skip>
-								<includes>
-									<!-- Include integration tests within integration-test phase. -->
-									<include>**/*IntegrationTest.java</include>
-								</includes>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>2.17</version>
-				<executions>
-					<execution>
-						<id>checkstyle</id>
-						<phase>package</phase>
-						<goals>
-							<goal>check</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<configLocation>style/checkstyle.xml</configLocation>
-					<headerLocation>style/LICENSE</headerLocation>
-					<failOnViolation>true</failOnViolation>
-					<includeTestSourceDirectory>true</includeTestSourceDirectory>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.5.1</version>
-				<configuration>
-					<source>${global_java_version}</source>
-					<target>${global_java_version}</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.7</version>
-				<configuration>
-					<check />
-					<formats>
-						<format>html</format>
-					</formats>
-					<aggregate>true</aggregate>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.rat</groupId>
-				<artifactId>apache-rat-plugin</artifactId>
-				<version>0.11</version>
-				<configuration>
-					<excludes>
-						<exclude>**/README.md</exclude>
-						<exclude>**/*.json</exclude>
-						<exclude>**/*.log</exclude>
-						<exclude>**/src/main/resources/patterns/**</exclude>
-						<exclude>**/src/main/sample/data/SampleIndexed/**</exclude>
-						<exclude>**/src/main/sample/data/SampleInput/**</exclude>
-						<exclude>**/src/main/sample/data/SampleParsed/**</exclude>
-						<exclude>**/dependency-reduced-pom.xml</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
+
 		</plugins>
 	</build>
 	<reporting>

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/056cfe20/metron-platform/style/LICENSE.config
----------------------------------------------------------------------
diff --git a/metron-platform/style/LICENSE.config b/metron-platform/style/LICENSE.config
deleted file mode 100644
index 826d578..0000000
--- a/metron-platform/style/LICENSE.config
+++ /dev/null
@@ -1,16 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/056cfe20/metron-platform/style/LICENSE.java
----------------------------------------------------------------------
diff --git a/metron-platform/style/LICENSE.java b/metron-platform/style/LICENSE.java
deleted file mode 100644
index 5d5f1e3..0000000
--- a/metron-platform/style/LICENSE.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/056cfe20/metron-platform/style/LICENSE.xml
----------------------------------------------------------------------
diff --git a/metron-platform/style/LICENSE.xml b/metron-platform/style/LICENSE.xml
deleted file mode 100644
index 05af984..0000000
--- a/metron-platform/style/LICENSE.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-     http://www.apache.org/licenses/LICENSE-2.0
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.
--->

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/056cfe20/metron-platform/style/checkstyle.xml
----------------------------------------------------------------------
diff --git a/metron-platform/style/checkstyle.xml b/metron-platform/style/checkstyle.xml
deleted file mode 100644
index 6a6b427..0000000
--- a/metron-platform/style/checkstyle.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-  -->
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN" "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
-
-<module name="Checker">
-  <property name="localeLanguage" value="en"/>
-  <module name="TreeWalker">
-    <module name="FileContentsHolder"/>
-  </module>
-  <module name="SuppressionCommentFilter"/>
-  <module name="SuppressionFilter">
-    <property name="file" value="style/suppressions.xml"/>
-  </module>
-  <!-- Verify that EVERY source file has the appropriate license -->
-  <module name="Header">
-    <property name="headerFile" value="style/LICENSE.java"/>
-    <property name="fileExtensions" value="java, g4"/>
-  </module>
-  <module name="Header">
-    <property name="headerFile" value="style/LICENSE.config"/>
-    <property name="fileExtensions" value="properties, yaml"/>
-  </module>
-
-</module>

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/056cfe20/metron-platform/style/suppressions.xml
----------------------------------------------------------------------
diff --git a/metron-platform/style/suppressions.xml b/metron-platform/style/suppressions.xml
deleted file mode 100644
index 85d8db1..0000000
--- a/metron-platform/style/suppressions.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-  -->
-
-<!DOCTYPE suppressions PUBLIC
-        "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-        "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
-
-<suppressions>
-    <suppress checks="HeaderCheck"
-              files="org[\\/]apache[\\/]metron[\\/]common[\\/]query[\\/]generated[\\/].*.java"
-              />
-    <suppress checks="HeaderCheck"
-              files="org[\\/]apache[\\/]metron[\\/]common[\\/]transformation[\\/]generated[\\/].*.java"
-              />
-
-</suppressions>

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/056cfe20/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f6a3b63..572997d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,10 +14,6 @@
 	OR CONDITIONS OF ANY KIND, either express or implied. See the License for
   the specific language governing permissions and limitations under the License.
   -->
-<!--
-  This exists soley to simplify the execution of apache-rat over the entire
-	code base of Metron.
-  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -26,14 +22,133 @@
     <version>0.1BETA</version>
     <packaging>pom</packaging>
     <name>Metron</name>
-    <description>Performs release auditing for Metron.</description>
+    <description>Metron Top Level Project</description>
     <url>https://metron.incubator.apache.org/</url>
+    <modules>
+            <module>metron-platform</module>
+    </modules>
+    <properties>
+        <twitter>@ApacheMetron</twitter>
+        <global_opencsv_version>3.7</global_opencsv_version>
+        <global_storm_version>0.10.0</global_storm_version>
+        <global_flux_version>0.10.0</global_flux_version>
+        <global_pcap_version>1.7.1</global_pcap_version>
+        <global_kafka_version>0.8.2.2</global_kafka_version>
+        <global_hadoop_version>2.7.1</global_hadoop_version>
+        <global_hbase_version>1.1.1</global_hbase_version>
+        <global_flume_version>1.5.2</global_flume_version>
+        <global_elasticsearch_version>2.3.3</global_elasticsearch_version>
+        <global_json_simple_version>1.1.1</global_json_simple_version>
+        <global_metrics_version>3.0.2</global_metrics_version>
+        <global_junit_version>4.4</global_junit_version>
+        <global_guava_version>17.0</global_guava_version>
+        <global_hbase_guava_version>12.0</global_hbase_guava_version>
+        <global_json_schema_validator_version>2.2.5</global_json_schema_validator_version>
+        <global_slf4j_version>1.7.7</global_slf4j_version>
+        <global_opencsv_version>3.7</global_opencsv_version>
+        <global_java_version>1.8</global_java_version>
+        <global_solr_version>5.2.1</global_solr_version>
+        <global_mockito_version>1.10.19</global_mockito_version>
+        <global_shade_version>2.4.3</global_shade_version>
+        <global_jackson_version>2.7.4</global_jackson_version>
+    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>${global_mockito_version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <!-- Separates the unit tests from the integration tests. -->
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.18</version>
+                    <configuration>
+                        <!-- Skip the default running of this plug-in (or everything is
run twice...see below) -->
+                        <argLine>-Xmx2048m</argLine>
+                        <skip>true</skip>
+                        <!-- Show 100% of the lines from the stack trace (doesn't work)
-->
+                        <trimStackTrace>false</trimStackTrace>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>unit-tests</id>
+                            <phase>test</phase>
+                            <goals>
+                                <goal>test</goal>
+                            </goals>
+                            <configuration>
+                                <!-- Never skip running the tests when the test phase
is invoked -->
+                                <skip>false</skip>
+                                <includes>
+                                    <!-- Include unit tests within integration-test phase.
-->
+                                    <include>**/*Test.java</include>
+                                </includes>
+                                <excludes>
+                                    <!-- Exclude integration tests within (unit) test
phase. -->
+                                    <exclude>**/*IntegrationTest.java</exclude>
+                                </excludes>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>integration-tests</id>
+                            <phase>integration-test</phase>
+                            <goals>
+                                <goal>test</goal>
+                            </goals>
+                            <configuration>
+                                <!-- Never skip running the tests when the integration-test
phase is invoked -->
+                                <skip>false</skip>
+                                <includes>
+                                    <!-- Include integration tests within integration-test
phase. -->
+                                    <include>**/*IntegrationTest.java</include>
+                                </includes>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.5.1</version>
+                <configuration>
+                    <source>${global_java_version}</source>
+                    <target>${global_java_version}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.7</version>
+                <configuration>
+                    <check />
+                    <formats>
+                        <format>html</format>
+                    </formats>
+                    <aggregate>true</aggregate>
+                </configuration>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.rat</groupId>
                 <artifactId>apache-rat-plugin</artifactId>
-                <version>0.11</version>
+                <version>0.12</version>
+                <executions>
+                    <execution>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
                 <configuration>
                     <excludes>
                         <exclude>**/README.md</exclude>
@@ -48,6 +163,14 @@
                         <exclude>**/*.iml</exclude>
                         <exclude>**/ansible.cfg</exclude>
                         <exclude>site/**</exclude>
+                        <exclude>**/src/main/resources/patterns/**</exclude>
+                        <exclude>**/src/main/sample/patterns/**</exclude>
+                        <exclude>**/src/test/resources/**</exclude>
+                        <exclude>**/src/main/sample/data/**</exclude>
+                        <exclude>**/dependency-reduced-pom.xml</exclude>
+                        <exclude>**/target/**</exclude>
+                        <exclude>**/bro-plugin-kafka/build/**</exclude>
+                        <exclude>**/files/opensoc-ui</exclude>
                         <exclude>metron-ui/lib/public/css/normalize.min.css</exclude>
                         <exclude>metron-ui/lib/public/app/panels/pcap/lib/showdown.js</exclude>
                         <!-- 3rd party bundled javascript dependencies -->
@@ -76,14 +199,6 @@
                         <exclude>metron-ui/lib/public/css/font-awesome.min.css</exclude>
                         <exclude>metron-ui/lib/public/font/**</exclude>
                         <exclude>metron-ui/node_modules/**</exclude>
-                        <exclude>**/src/main/resources/patterns/**</exclude>
-                        <exclude>**/src/main/sample/patterns/**</exclude>
-                        <exclude>**/src/test/resources/**</exclude>
-                        <exclude>**/src/main/sample/data/**</exclude>
-                        <exclude>**/dependency-reduced-pom.xml</exclude>
-                        <exclude>**/files/opensoc-ui</exclude>
-                        <exclude>**/target/**</exclude>
-                        <exclude>**/bro-plugin-kafka/build/**</exclude>
                     </excludes>
                 </configuration>
             </plugin>


Mime
View raw message