METRON-726 Clean up mvn site generation (justinleet) closes apache/incubator-metron#459
Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/29e7c70d Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/29e7c70d Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/29e7c70d Branch: refs/heads/Metron_0.4.0 Commit: 29e7c70dfe946667e907ae0767f47da895e722e5 Parents: 47e5aa7 Author: justinleet <[email protected]> Authored: Tue May 2 18:16:35 2017 -0400 Committer: leet <[email protected]> Committed: Tue May 2 18:16:35 2017 -0400 ---------------------------------------------------------------------- .github/PULL_REQUEST_TEMPLATE.md | 3 +- .travis.yml | 2 +- README.md | 15 +++ metron-analytics/metron-maas-common/pom.xml | 41 +----- metron-analytics/metron-maas-service/pom.xml | 41 +----- metron-analytics/metron-profiler-client/pom.xml | 27 +--- metron-analytics/metron-profiler-common/pom.xml | 1 + metron-analytics/metron-profiler/pom.xml | 70 +--------- metron-analytics/metron-statistics/pom.xml | 1 + metron-analytics/pom.xml | 41 ------ metron-deployment/pom.xml | 1 + metron-docker/pom.xml | 1 + metron-interface/metron-config/pom.xml | 1 + metron-interface/metron-rest-client/pom.xml | 1 + metron-interface/metron-rest/pom.xml | 18 +-- metron-interface/pom.xml | 18 --- metron-platform/elasticsearch-shaded/pom.xml | 2 + metron-platform/metron-api/pom.xml | 2 + metron-platform/metron-common/pom.xml | 27 +--- .../IPProtocolTransformation.java | 2 - .../benchmark/StellarMicrobenchmark.java | 3 - metron-platform/metron-data-management/pom.xml | 11 +- metron-platform/metron-elasticsearch/pom.xml | 72 +--------- metron-platform/metron-enrichment/pom.xml | 43 +----- .../integration/EnrichmentIntegrationTest.java | 2 +- metron-platform/metron-hbase/pom.xml | 2 + metron-platform/metron-indexing/pom.xml | 41 +----- .../integration/IndexingIntegrationTest.java | 2 +- metron-platform/metron-integration-test/pom.xml | 4 +- .../metron/integration/ComponentRunner.java | 1 - .../integration/processors/KafkaProcessor.java | 3 + metron-platform/metron-management/pom.xml | 27 +--- metron-platform/metron-parsers/pom.xml | 29 +---- .../integration/ParserIntegrationTest.java | 2 +- metron-platform/metron-pcap-backend/pom.xml | 28 +--- metron-platform/metron-pcap/pom.xml | 2 + metron-platform/metron-solr/pom.xml | 51 +------- metron-platform/metron-storm-kafka/pom.xml | 29 +---- metron-platform/metron-test-utilities/pom.xml | 7 +- metron-platform/metron-writer/pom.xml | 27 +--- metron-platform/pom.xml | 41 ------ pom.xml | 130 ++++++++++++++++++- site-book/README.md | 8 +- site-book/pom.xml | 18 ++- 44 files changed, 213 insertions(+), 685 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/.github/PULL_REQUEST_TEMPLATE.md ---------------------------------------------------------------------- diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 6c1f2a5..92f557e 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -34,8 +34,7 @@ In order to streamline the review of the contribution we ask you follow these gu ``` cd site-book - bin/generate-md.sh - mvn site:site + mvn site ``` #### Note: http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 1632b6e..8fb218a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ before_install: - export PATH=$M2_HOME/bin:$PATH script: - | - time mvn -q -T 2C -DskipTests install && time mvn -q -T 2C surefire:test@unit-tests && mvn -q surefire:test@integration-tests && time mvn -q test --projects metron-interface/metron-config && time build_utils/verify_licenses.sh + time mvn -q -T 2C -DskipTests install && time mvn -q -T 2C jacoco:prepare-agent surefire:test@unit-tests && mvn -q jacoco:prepare-agent surefire:test@integration-tests && time mvn -q jacoco:prepare-agent test --projects metron-interface/metron-config && time build_utils/verify_licenses.sh cache: directories: - $HOME/.m2 http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 09f72c3..53a84c4 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,21 @@ $ mvn clean install -PHDP-2.5.0.0 You can swap "install" for "package" in the commands above if you don't want to deploy the artifacts to your local .m2 repo. +# Build Metron Reporting + +To build and run reporting with code coverage: +``` +$ mvn clean install +$ mvn site site:stage-deploy site:deploy +``` + +Code coverage can be skipped by skipping tests: +``` +$ mvn clean install -DskipTests site site:stage-deploy site:deploy +``` + +The staged site is deployed to /tmp/metron/site/index.html, and can be viewed by opening the file in a browser. + # Navigating the Architecture Metron is at its core a Kappa architecture with Apache Storm as the processing http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-analytics/metron-maas-common/pom.xml ---------------------------------------------------------------------- diff --git a/metron-analytics/metron-maas-common/pom.xml b/metron-analytics/metron-maas-common/pom.xml index 20969df..ef51c62 100644 --- a/metron-analytics/metron-maas-common/pom.xml +++ b/metron-analytics/metron-maas-common/pom.xml @@ -21,6 +21,7 @@ <version>0.4.0</version> </parent> <artifactId>metron-maas-common</artifactId> + <url>https://metron.apache.org/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -75,46 +76,6 @@ </dependency> </dependencies> - <reporting> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>mode</name> - <value>global</value> - </property> - </systemProperties> - </configuration> - </plugin> - - <!-- Normally, dependency report takes time, skip it --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - - <configuration> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> - </configuration> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <version>1.0-alpha-3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <targetJdk>${global_java_version}</targetJdk> - </configuration> - </plugin> - </plugins> - </reporting> <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-analytics/metron-maas-service/pom.xml ---------------------------------------------------------------------- diff --git a/metron-analytics/metron-maas-service/pom.xml b/metron-analytics/metron-maas-service/pom.xml index ac016d4..32a9e5d 100644 --- a/metron-analytics/metron-maas-service/pom.xml +++ b/metron-analytics/metron-maas-service/pom.xml @@ -21,6 +21,7 @@ <version>0.4.0</version> </parent> <artifactId>metron-maas-service</artifactId> + <url>https://metron.apache.org/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -204,46 +205,6 @@ <scope>test</scope> </dependency> </dependencies> - <reporting> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>mode</name> - <value>global</value> - </property> - </systemProperties> - </configuration> - </plugin> - - <!-- Normally, dependency report takes time, skip it --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - - <configuration> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> - </configuration> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <version>1.0-alpha-3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <targetJdk>${global_java_version}</targetJdk> - </configuration> - </plugin> - </plugins> - </reporting> <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-analytics/metron-profiler-client/pom.xml ---------------------------------------------------------------------- diff --git a/metron-analytics/metron-profiler-client/pom.xml b/metron-analytics/metron-profiler-client/pom.xml index e87110a..812a6ec 100644 --- a/metron-analytics/metron-profiler-client/pom.xml +++ b/metron-analytics/metron-profiler-client/pom.xml @@ -21,6 +21,7 @@ <version>0.4.0</version> </parent> <artifactId>metron-profiler-client</artifactId> + <url>https://metron.apache.org/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -248,32 +249,6 @@ </dependency> </dependencies> - <reporting> - <plugins> - <!-- Normally, dependency report takes time, skip it --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.7</version> - - <configuration> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <version>1.0-alpha-3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <targetJdk>${global_java_version}</targetJdk> - </configuration> - </plugin> - </plugins> - </reporting> <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-analytics/metron-profiler-common/pom.xml ---------------------------------------------------------------------- diff --git a/metron-analytics/metron-profiler-common/pom.xml b/metron-analytics/metron-profiler-common/pom.xml index b557e71..4f49ec2 100644 --- a/metron-analytics/metron-profiler-common/pom.xml +++ b/metron-analytics/metron-profiler-common/pom.xml @@ -21,6 +21,7 @@ <version>0.4.0</version> </parent> <artifactId>metron-profiler-common</artifactId> + <url>https://metron.apache.org/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-analytics/metron-profiler/pom.xml ---------------------------------------------------------------------- diff --git a/metron-analytics/metron-profiler/pom.xml b/metron-analytics/metron-profiler/pom.xml index 1746c51..cecf464 100644 --- a/metron-analytics/metron-profiler/pom.xml +++ b/metron-analytics/metron-profiler/pom.xml @@ -21,6 +21,7 @@ <version>0.4.0</version> </parent> <artifactId>metron-profiler</artifactId> + <url>https://metron.apache.org/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -272,79 +273,10 @@ </exclusions> </dependency> </dependencies> - <reporting> - <plugins> - <!-- Normally, dependency report takes time, skip it --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.7</version> - <configuration> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <version>1.0-alpha-3</version> - <inherited>true</inherited> - </plugin> - </plugins> - </reporting> <build> <plugins> <plugin> - <!-- Separates the unit tests from the integration tests. --> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.12.4</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> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <version>${global_shade_version}</version> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-analytics/metron-statistics/pom.xml ---------------------------------------------------------------------- diff --git a/metron-analytics/metron-statistics/pom.xml b/metron-analytics/metron-statistics/pom.xml index d8db748..6489ae4 100644 --- a/metron-analytics/metron-statistics/pom.xml +++ b/metron-analytics/metron-statistics/pom.xml @@ -21,6 +21,7 @@ <version>0.4.0</version> </parent> <artifactId>metron-statistics</artifactId> + <url>https://metron.apache.org/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-analytics/pom.xml ---------------------------------------------------------------------- diff --git a/metron-analytics/pom.xml b/metron-analytics/pom.xml index 552de67..7670e8f 100644 --- a/metron-analytics/pom.xml +++ b/metron-analytics/pom.xml @@ -75,47 +75,6 @@ <plugins> </plugins> </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.18</version> - <configuration> - <argLine>-Xmx2048m -XX:MaxPermSize=256m</argLine> - <systemProperties> - <property> - <name>mode</name> - <value>local</value> - </property> - </systemProperties> - </configuration> - </plugin> - <!-- Normally, dependency report takes time, skip it --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.7</version> - <configuration> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <version>3.3</version> - <configuration> - <targetJdk>${global_java_version}</targetJdk> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <version>1.0-alpha-3</version> - <inherited>true</inherited> - </plugin> - </plugins> - </reporting> <repositories> <repository> <id>clojars.org</id> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-deployment/pom.xml ---------------------------------------------------------------------- diff --git a/metron-deployment/pom.xml b/metron-deployment/pom.xml index fa7e1f9..e130ab4 100644 --- a/metron-deployment/pom.xml +++ b/metron-deployment/pom.xml @@ -24,6 +24,7 @@ <version>0.4.0</version> </parent> <description>Building and deploying Metron</description> + <url>https://metron.apache.org/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-docker/pom.xml ---------------------------------------------------------------------- diff --git a/metron-docker/pom.xml b/metron-docker/pom.xml index 947e0bb..66ca5df 100644 --- a/metron-docker/pom.xml +++ b/metron-docker/pom.xml @@ -24,6 +24,7 @@ <version>0.4.0</version> </parent> <description>Metron Docker</description> + <url>https://metron.apache.org/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-interface/metron-config/pom.xml ---------------------------------------------------------------------- diff --git a/metron-interface/metron-config/pom.xml b/metron-interface/metron-config/pom.xml index 646371d..2099817 100644 --- a/metron-interface/metron-config/pom.xml +++ b/metron-interface/metron-config/pom.xml @@ -21,6 +21,7 @@ <version>0.4.0</version> </parent> <artifactId>metron-config</artifactId> + <url>https://metron.apache.org/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-interface/metron-rest-client/pom.xml ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest-client/pom.xml b/metron-interface/metron-rest-client/pom.xml index 1c01acb..7bcd784 100644 --- a/metron-interface/metron-rest-client/pom.xml +++ b/metron-interface/metron-rest-client/pom.xml @@ -21,6 +21,7 @@ <version>0.4.0</version> </parent> <artifactId>metron-rest-client</artifactId> + <url>https://metron.apache.org/</url> <properties> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-interface/metron-rest/pom.xml ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/pom.xml b/metron-interface/metron-rest/pom.xml index cc53192..b11e999 100644 --- a/metron-interface/metron-rest/pom.xml +++ b/metron-interface/metron-rest/pom.xml @@ -21,6 +21,7 @@ <version>0.4.0</version> </parent> <artifactId>metron-rest</artifactId> + <url>https://metron.apache.org/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -32,7 +33,6 @@ <spring.kerberos.version>1.0.1.RELEASE</spring.kerberos.version> <swagger.version>2.5.0</swagger.version> <mysql.client.version>5.1.40</mysql.client.version> - <emma.version>1.0-alpha-3</emma.version> </properties> <dependencies> <dependency> @@ -254,22 +254,6 @@ </dependencies> </dependencyManagement> - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <version>${emma.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <targetJdk>${global_java_version}</targetJdk> - </configuration> - </plugin> - </plugins> - </reporting> <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-interface/pom.xml ---------------------------------------------------------------------- diff --git a/metron-interface/pom.xml b/metron-interface/pom.xml index fa7e95b..58e066f 100644 --- a/metron-interface/pom.xml +++ b/metron-interface/pom.xml @@ -61,24 +61,6 @@ <plugins> </plugins> </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <version>3.3</version> - <configuration> - <targetJdk>${global_java_version}</targetJdk> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <version>1.0-alpha-3</version> - <inherited>true</inherited> - </plugin> - </plugins> - </reporting> <repositories> <repository> <id>multiline-release-repo</id> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/elasticsearch-shaded/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/elasticsearch-shaded/pom.xml b/metron-platform/elasticsearch-shaded/pom.xml index b8dbf1c..ce5bb6b 100644 --- a/metron-platform/elasticsearch-shaded/pom.xml +++ b/metron-platform/elasticsearch-shaded/pom.xml @@ -21,6 +21,8 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>elasticsearch-shaded</artifactId> + <name>elasticsearch-shaded</name> + <url>https://metron.apache.org/</url> <dependencies> <dependency> <groupId>com.google.guava</groupId> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/metron-api/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-api/pom.xml b/metron-platform/metron-api/pom.xml index c9243e6..7fede58 100644 --- a/metron-platform/metron-api/pom.xml +++ b/metron-platform/metron-api/pom.xml @@ -20,7 +20,9 @@ <version>0.4.0</version> </parent> <artifactId>metron-api</artifactId> + <name>metron-api</name> <description>Metron API</description> + <url>https://metron.apache.org/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <flume.version>${global_flume_version}</flume.version> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/metron-common/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-common/pom.xml b/metron-platform/metron-common/pom.xml index 0aaf34c..04ac946 100644 --- a/metron-platform/metron-common/pom.xml +++ b/metron-platform/metron-common/pom.xml @@ -23,6 +23,7 @@ <artifactId>metron-common</artifactId> <name>metron-common</name> <description>Components common to all enrichments</description> + <url>https://metron.apache.org/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -360,32 +361,6 @@ </dependency> </dependencies> - <reporting> - <plugins> - <!-- Normally, dependency report takes time, skip it --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.7</version> - - <configuration> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <version>1.0-alpha-3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <targetJdk>${global_java_version}</targetJdk> - </configuration> - </plugin> - </plugins> - </reporting> <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/metron-common/src/main/java/org/apache/metron/common/field/transformation/IPProtocolTransformation.java ---------------------------------------------------------------------- diff --git a/metron-platform/metron-common/src/main/java/org/apache/metron/common/field/transformation/IPProtocolTransformation.java b/metron-platform/metron-common/src/main/java/org/apache/metron/common/field/transformation/IPProtocolTransformation.java index 2405c90..1488a9a 100644 --- a/metron-platform/metron-common/src/main/java/org/apache/metron/common/field/transformation/IPProtocolTransformation.java +++ b/metron-platform/metron-common/src/main/java/org/apache/metron/common/field/transformation/IPProtocolTransformation.java @@ -19,7 +19,6 @@ package org.apache.metron.common.field.transformation; -import org.apache.hadoop.yarn.util.ConverterUtils; import org.apache.metron.common.dsl.Context; import org.apache.metron.common.dsl.ParseException; import org.apache.metron.common.dsl.Stellar; @@ -29,7 +28,6 @@ import org.apache.metron.common.utils.ConversionUtils; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.function.Function; @Stellar(name="PROTOCOL_TO_NAME" , description="Converts the IANA protocol number to the protocol name" http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/benchmark/StellarMicrobenchmark.java ---------------------------------------------------------------------- diff --git a/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/benchmark/StellarMicrobenchmark.java b/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/benchmark/StellarMicrobenchmark.java index d674210..faa55e0 100644 --- a/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/benchmark/StellarMicrobenchmark.java +++ b/metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/benchmark/StellarMicrobenchmark.java @@ -17,7 +17,6 @@ */ package org.apache.metron.common.stellar.benchmark; -import com.clearspring.analytics.util.Lists; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.base.Joiner; import com.google.common.base.Splitter; @@ -26,11 +25,9 @@ import org.apache.commons.cli.*; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; import org.apache.metron.common.dsl.Context; import org.apache.metron.common.dsl.MapVariableResolver; -import org.apache.metron.common.dsl.ParseException; import org.apache.metron.common.dsl.StellarFunctions; import org.apache.metron.common.utils.JSONUtils; import org.apache.metron.common.utils.cli.OptionHandler; -import scala.testing.Benchmark; import javax.annotation.Nullable; import java.io.File; http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/metron-data-management/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-data-management/pom.xml b/metron-platform/metron-data-management/pom.xml index 9133eb6..2c4691f 100644 --- a/metron-platform/metron-data-management/pom.xml +++ b/metron-platform/metron-data-management/pom.xml @@ -21,6 +21,8 @@ <version>0.4.0</version> </parent> <artifactId>metron-data-management</artifactId> + <name>metron-data-management</name> + <url>https://metron.apache.org/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -366,15 +368,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-Xmx2048m</argLine> - <skip>true</skip> - <trimStackTrace>false</trimStackTrace> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <version>${global_shade_version}</version> <executions> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/metron-elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-elasticsearch/pom.xml b/metron-platform/metron-elasticsearch/pom.xml index 3f5b0b3..ba0f1ad 100644 --- a/metron-platform/metron-elasticsearch/pom.xml +++ b/metron-platform/metron-elasticsearch/pom.xml @@ -21,6 +21,8 @@ <version>0.4.0</version> </parent> <artifactId>metron-elasticsearch</artifactId> + <name>metron-elasticsearch</name> + <url>https://metron.apache.org/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -197,80 +199,10 @@ <scope>test</scope> </dependency> </dependencies> - <reporting> - <plugins> - <!-- Normally, dependency report takes time, skip it --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.7</version> - - <configuration> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> - </configuration> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <version>1.0-alpha-3</version> - <inherited>true</inherited> - </plugin> - </plugins> - </reporting> <build> <plugins> <plugin> - <!-- Separates the unit tests from the integration tests. --> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.12.4</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> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <version>${global_shade_version}</version> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/metron-enrichment/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-enrichment/pom.xml b/metron-platform/metron-enrichment/pom.xml index bebd774..29de74f 100644 --- a/metron-platform/metron-enrichment/pom.xml +++ b/metron-platform/metron-enrichment/pom.xml @@ -21,6 +21,8 @@ <version>0.4.0</version> </parent> <artifactId>metron-enrichment</artifactId> + <name>metron-enrichment</name> + <url>https://metron.apache.org/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -262,47 +264,6 @@ <version>${commons-compress.version}</version> </dependency> </dependencies> - <reporting> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>mode</name> - <value>global</value> - </property> - </systemProperties> - </configuration> - </plugin> - - <!-- Normally, dependency report takes time, skip it --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.7</version> - - <configuration> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> - </configuration> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <version>1.0-alpha-3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <targetJdk>${global_java_version}</targetJdk> - </configuration> - </plugin> - </plugins> - </reporting> <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/integration/EnrichmentIntegrationTest.java ---------------------------------------------------------------------- diff --git a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/integration/EnrichmentIntegrationTest.java b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/integration/EnrichmentIntegrationTest.java index 77b64dc..9634805 100644 --- a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/integration/EnrichmentIntegrationTest.java +++ b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/integration/EnrichmentIntegrationTest.java @@ -198,9 +198,9 @@ public class EnrichmentIntegrationTest extends BaseIntegrationTest { .withCustomShutdownOrder(new String[]{"storm","config","kafka","zk"}) .withNumRetries(10) .build(); - runner.start(); try { + runner.start(); fluxComponent.submitTopology(); kafkaComponent.writeMessages(Constants.ENRICHMENT_TOPIC, inputMessages); http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/metron-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-hbase/pom.xml b/metron-platform/metron-hbase/pom.xml index a2f4792..22d55b2 100644 --- a/metron-platform/metron-hbase/pom.xml +++ b/metron-platform/metron-hbase/pom.xml @@ -21,6 +21,8 @@ <version>0.4.0</version> </parent> <artifactId>metron-hbase</artifactId> + <name>metron-hbase</name> + <url>https://metron.apache.org/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/metron-indexing/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-indexing/pom.xml b/metron-platform/metron-indexing/pom.xml index ff34a97..6a18dc4 100644 --- a/metron-platform/metron-indexing/pom.xml +++ b/metron-platform/metron-indexing/pom.xml @@ -21,6 +21,8 @@ <version>0.4.0</version> </parent> <artifactId>metron-indexing</artifactId> + <name>metron-indexing</name> + <url>https://metron.apache.org/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -139,45 +141,6 @@ <scope>test</scope> </dependency> </dependencies> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>mode</name> - <value>global</value> - </property> - </systemProperties> - </configuration> - </plugin> - - <!-- Normally, dependency report takes time, skip it --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.7</version> - - <configuration> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <version>1.0-alpha-3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <targetJdk>${global_java_version}</targetJdk> - </configuration> - </plugin> - </plugins> - </reporting> <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/metron-indexing/src/test/java/org/apache/metron/indexing/integration/IndexingIntegrationTest.java ---------------------------------------------------------------------- diff --git a/metron-platform/metron-indexing/src/test/java/org/apache/metron/indexing/integration/IndexingIntegrationTest.java b/metron-platform/metron-indexing/src/test/java/org/apache/metron/indexing/integration/IndexingIntegrationTest.java index ff786cf..da46d93 100644 --- a/metron-platform/metron-indexing/src/test/java/org/apache/metron/indexing/integration/IndexingIntegrationTest.java +++ b/metron-platform/metron-indexing/src/test/java/org/apache/metron/indexing/integration/IndexingIntegrationTest.java @@ -182,9 +182,9 @@ public abstract class IndexingIntegrationTest extends BaseIntegrationTest { .withMaxTimeMS(150000) .withCustomShutdownOrder(new String[] {"search","storm","config","kafka","zk"}) .build(); - runner.start(); try { + runner.start(); while(!isLoaded.get()) { Thread.sleep(100); } http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/metron-integration-test/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-integration-test/pom.xml b/metron-platform/metron-integration-test/pom.xml index 6e83f97..54f4a6b 100644 --- a/metron-platform/metron-integration-test/pom.xml +++ b/metron-platform/metron-integration-test/pom.xml @@ -21,7 +21,9 @@ <version>0.4.0</version> </parent> <artifactId>metron-integration-test</artifactId> + <name>metron-integration-test</name> <description>Metron Integration Test</description> + <url>https://metron.apache.org/</url> <properties> </properties> <dependencies> @@ -268,6 +270,4 @@ </plugin> </plugins> </build> - <reporting> - </reporting> </project> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/metron-integration-test/src/main/java/org/apache/metron/integration/ComponentRunner.java ---------------------------------------------------------------------- diff --git a/metron-platform/metron-integration-test/src/main/java/org/apache/metron/integration/ComponentRunner.java b/metron-platform/metron-integration-test/src/main/java/org/apache/metron/integration/ComponentRunner.java index b1f581d..ce7cab8 100644 --- a/metron-platform/metron-integration-test/src/main/java/org/apache/metron/integration/ComponentRunner.java +++ b/metron-platform/metron-integration-test/src/main/java/org/apache/metron/integration/ComponentRunner.java @@ -121,7 +121,6 @@ public class ComponentRunner { } } - public <T> ProcessorResult<T> process(Processor<T> successState) { int retryCount = 0; long start = System.currentTimeMillis(); http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/metron-integration-test/src/main/java/org/apache/metron/integration/processors/KafkaProcessor.java ---------------------------------------------------------------------- diff --git a/metron-platform/metron-integration-test/src/main/java/org/apache/metron/integration/processors/KafkaProcessor.java b/metron-platform/metron-integration-test/src/main/java/org/apache/metron/integration/processors/KafkaProcessor.java index 63f073d..50be8ae 100644 --- a/metron-platform/metron-integration-test/src/main/java/org/apache/metron/integration/processors/KafkaProcessor.java +++ b/metron-platform/metron-integration-test/src/main/java/org/apache/metron/integration/processors/KafkaProcessor.java @@ -58,6 +58,7 @@ public class KafkaProcessor<T> implements Processor<T> { private Function<KafkaMessageSet, Boolean> validateReadMessages; private Function<KafkaMessageSet,T> provideResult; + @Override public ReadinessState process(ComponentRunner runner){ KafkaComponent kafkaComponent = runner.getComponent(kafkaComponentName, KafkaComponent.class); LinkedList<byte[]> outputMessages = new LinkedList<>(kafkaComponent.readMessages(readTopic)); @@ -79,6 +80,8 @@ public class KafkaProcessor<T> implements Processor<T> { } return ReadinessState.NOT_READY; } + + @Override @SuppressWarnings("unchecked") public ProcessorResult<T> getResult(){ ProcessorResult.Builder<T> builder = new ProcessorResult.Builder(); http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/metron-management/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-management/pom.xml b/metron-platform/metron-management/pom.xml index 1dad3af..638d65f 100644 --- a/metron-platform/metron-management/pom.xml +++ b/metron-platform/metron-management/pom.xml @@ -23,6 +23,7 @@ <artifactId>metron-management</artifactId> <name>metron-management</name> <description>Management Stellar functions</description> + <url>https://metron.apache.org/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -181,32 +182,6 @@ </dependency> </dependencies> - <reporting> - <plugins> - <!-- Normally, dependency report takes time, skip it --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.7</version> - - <configuration> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <version>1.0-alpha-3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <targetJdk>${global_java_version}</targetJdk> - </configuration> - </plugin> - </plugins> - </reporting> <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/metron-parsers/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-parsers/pom.xml b/metron-platform/metron-parsers/pom.xml index 97cfd49..cce975a 100644 --- a/metron-platform/metron-parsers/pom.xml +++ b/metron-platform/metron-parsers/pom.xml @@ -21,6 +21,8 @@ <version>0.4.0</version> </parent> <artifactId>metron-parsers</artifactId> + <name>metron-parsers</name> + <url>https://metron.apache.org/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -218,33 +220,6 @@ <scope>test</scope> </dependency> </dependencies> - <reporting> - <plugins> - <!-- Normally, dependency report takes time, skip it --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.7</version> - - <configuration> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <version>1.0-alpha-3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <targetJdk>1.7</targetJdk> - </configuration> - - </plugin> - </plugins> - </reporting> <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/integration/ParserIntegrationTest.java ---------------------------------------------------------------------- diff --git a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/integration/ParserIntegrationTest.java b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/integration/ParserIntegrationTest.java index a170a2c..defd815 100644 --- a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/integration/ParserIntegrationTest.java +++ b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/integration/ParserIntegrationTest.java @@ -74,8 +74,8 @@ public abstract class ParserIntegrationTest extends BaseIntegrationTest { .withNumRetries(10) .withCustomShutdownOrder(new String[] {"org/apache/storm","config","kafka","zk"}) .build(); - runner.start(); try { + runner.start(); kafkaComponent.writeMessages(sensorType, inputMessages); ProcessorResult<List<byte[]>> result = runner.process(getProcessor()); List<byte[]> outputMessages = result.getResult(); http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/metron-pcap-backend/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-pcap-backend/pom.xml b/metron-platform/metron-pcap-backend/pom.xml index 106f9fb..3095e5b 100644 --- a/metron-platform/metron-pcap-backend/pom.xml +++ b/metron-platform/metron-pcap-backend/pom.xml @@ -21,6 +21,8 @@ <version>0.4.0</version> </parent> <artifactId>metron-pcap-backend</artifactId> + <name>metron-pcap-backend</name> + <url>https://metron.apache.org/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -198,32 +200,6 @@ </dependency> </dependencies> - <reporting> - <plugins> - <!-- Normally, dependency report takes time, skip it --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.7</version> - - <configuration> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <version>1.0-alpha-3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <targetJdk>${global_java_version}</targetJdk> - </configuration> - </plugin> - </plugins> - </reporting> <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/metron-pcap/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-pcap/pom.xml b/metron-platform/metron-pcap/pom.xml index 73f57f0..7b9c9e5 100644 --- a/metron-platform/metron-pcap/pom.xml +++ b/metron-platform/metron-pcap/pom.xml @@ -21,7 +21,9 @@ <version>0.4.0</version> </parent> <artifactId>metron-pcap</artifactId> + <name>metron-pcap</name> <description>Metron Pcap</description> + <url>https://metron.apache.org/</url> <properties> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/metron-solr/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-solr/pom.xml b/metron-platform/metron-solr/pom.xml index c287dce..06f7822 100644 --- a/metron-platform/metron-solr/pom.xml +++ b/metron-platform/metron-solr/pom.xml @@ -21,6 +21,8 @@ <version>0.4.0</version> </parent> <artifactId>metron-solr</artifactId> + <name>metron-solr</name> + <url>https://metron.apache.org/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -215,55 +217,6 @@ <build> <plugins> <plugin> - <!-- Separates the unit tests from the integration tests. --> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.12.4</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> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <version>${global_shade_version}</version> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/metron-storm-kafka/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-storm-kafka/pom.xml b/metron-platform/metron-storm-kafka/pom.xml index fe93f65..b8e3f8d 100644 --- a/metron-platform/metron-storm-kafka/pom.xml +++ b/metron-platform/metron-storm-kafka/pom.xml @@ -23,6 +23,7 @@ <artifactId>metron-storm-kafka</artifactId> <name>metron-storm-kafka</name> <description>Components that extend the Storm/Kafka spout</description> + <url>https://metron.apache.org/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -90,35 +91,7 @@ </dependency> </dependencies> - <reporting> - <plugins> - <!-- Normally, dependency report takes time, skip it --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.7</version> - - <configuration> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <version>1.0-alpha-3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <targetJdk>${global_java_version}</targetJdk> - </configuration> - </plugin> - </plugins> - </reporting> <build> - <plugins> - </plugins> <resources> <resource> <directory>src/main/resources</directory> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/metron-test-utilities/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-test-utilities/pom.xml b/metron-platform/metron-test-utilities/pom.xml index 8cfebe0..98ce767 100644 --- a/metron-platform/metron-test-utilities/pom.xml +++ b/metron-platform/metron-test-utilities/pom.xml @@ -21,7 +21,9 @@ <version>0.4.0</version> </parent> <artifactId>metron-test-utilities</artifactId> + <name>metron-test-utilities</name> <description>Metron Test Utilities</description> + <url>https://metron.apache.org/</url> <properties> </properties> <dependencies> @@ -156,9 +158,4 @@ <version>0.1.2</version> </dependency> </dependencies> - - <build> - </build> - <reporting> - </reporting> </project> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/metron-writer/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-writer/pom.xml b/metron-platform/metron-writer/pom.xml index f984329..65b9528 100644 --- a/metron-platform/metron-writer/pom.xml +++ b/metron-platform/metron-writer/pom.xml @@ -23,6 +23,7 @@ <artifactId>metron-writer</artifactId> <name>metron-writer</name> <description>Components common to all enrichments</description> + <url>https://metron.apache.org/</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -200,32 +201,6 @@ </dependency> </dependencies> - <reporting> - <plugins> - <!-- Normally, dependency report takes time, skip it --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.7</version> - - <configuration> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <version>1.0-alpha-3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <targetJdk>${global_java_version}</targetJdk> - </configuration> - </plugin> - </plugins> - </reporting> <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/metron-platform/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/pom.xml b/metron-platform/pom.xml index 68d9be8..1376e5c 100644 --- a/metron-platform/pom.xml +++ b/metron-platform/pom.xml @@ -95,45 +95,4 @@ <scope>test</scope> </dependency> </dependencies> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.18</version> - <configuration> - <argLine>-Xmx2048m -XX:MaxPermSize=256m</argLine> - <systemProperties> - <property> - <name>mode</name> - <value>local</value> - </property> - </systemProperties> - </configuration> - </plugin> - <!-- Normally, dependency report takes time, skip it --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.7</version> - <configuration> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <version>3.3</version> - <configuration> - <targetJdk>${global_java_version}</targetJdk> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <version>1.0-alpha-3</version> - <inherited>true</inherited> - </plugin> - </plugins> - </reporting> </project> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 96885d6..bb32c64 100644 --- a/pom.xml +++ b/pom.xml @@ -24,12 +24,17 @@ <name>Metron</name> <description>Metron Top Level Project</description> <url>https://metron.apache.org/</url> + <organization> + <name>The Apache Software Foundation</name> + <url>https://www.apache.org</url> + </organization> <modules> <module>metron-analytics</module> <module>metron-platform</module> <module>metron-deployment</module> <module>metron-docker</module> <module>metron-interface</module> + <module>site-book</module> </modules> <repositories> @@ -124,6 +129,7 @@ <global_jackson_version>2.7.4</global_jackson_version> <global_errorprone_core_version>2.0.14</global_errorprone_core_version> <global_jar_version>3.0.2</global_jar_version> + <global_surefire_version>2.18</global_surefire_version> </properties> <profiles> @@ -159,10 +165,10 @@ <!-- Separates the unit tests from the integration tests. --> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.18</version> + <version>${global_surefire_version}</version> <configuration> <!-- Skip the default running of this plug-in (or everything is run twice...see below) --> - <argLine>-Xmx2048m</argLine> + <argLine>@{argLine} -Xmx2048m</argLine> <skip>true</skip> <!-- Show 100% of the lines from the stack trace (doesn't work) --> <trimStackTrace>false</trimStackTrace> @@ -216,6 +222,11 @@ </pluginManagement> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>3.6</version> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>3.5.1</version> @@ -255,6 +266,25 @@ </configuration> </plugin> <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.7.9</version> + <executions> + <execution> + <goals> + <goal>prepare-agent</goal> + </goals> + </execution> + <execution> + <id>report</id> + <phase>prepare-package</phase> + <goals> + <goal>report</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <version>0.12</version> @@ -320,4 +350,100 @@ </plugin> </plugins> </build> + + <distributionManagement> + <site> + <id>metron</id> + <name>Metron</name> + <url>file:///tmp/metron/site/</url> + </site> + </distributionManagement> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.3</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.4</version> + <configuration> + <additionalparam>-Xdoclint:none</additionalparam> + </configuration> + <reportSets> + <reportSet> + <id>default</id> + <reports> + <report>javadoc</report> + <report>test-javadoc</report> + </reports> + </reportSet> + <reportSet> + <id>aggregate</id> + <reports> + <report>aggregate</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>2.9</version> + <reportSets> + <reportSet> + <reports> + <!-- Normally, dependency report takes time, skip it --> + <!--<report>dependencies</report>--> + <report>index</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>mailing-list</report> + <report>plugins</report> + <report>project-team</report> + <report>scm</report> + <report>summary</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.17</version> + <reportSets> + <reportSet> + <reports> + <report>checkstyle</report> + <report>checkstyle-aggregate</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.7.9</version> + <reportSets> + <reportSet> + <reports> + <!-- select non-aggregate reports --> + <report>report</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <version>3.7</version> + <configuration> + <targetJdk>${global_java_version}</targetJdk> + </configuration> + </plugin> + </plugins> + </reporting> </project> http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/site-book/README.md ---------------------------------------------------------------------- diff --git a/site-book/README.md b/site-book/README.md index d1060a0..6c6b7bd 100644 --- a/site-book/README.md +++ b/site-book/README.md @@ -8,15 +8,15 @@ Metron's Site Book is an attempt at producing documentation that is: The idea is that a release manager would build the site-book (following the instructions below), then publish it from the public [Metron site](http://metron.apache.org/) as the docs for the new released version. Older site-book versions should remain available for users that need them. +The site-book is also part of the Maven site lifecycle, and will be included by the full site from the top level. However, the site as a whole takes longer than just the site-book: -To build the book, do the following: +To build only the book, do the following: In any git clone of incubator-metron containing the site-book subdirectory, ``` cd site-book -bin/generate-md.sh -mvn site:site +mvn site ``` It only takes a few seconds. You may now view your copy of the book in a browser by opening @@ -31,6 +31,7 @@ On a Mac, you can just type the following on the command line open target/site/index.html ``` + ##Key Components: ###bin/generate-md.sh @@ -38,6 +39,7 @@ open target/site/index.html - Copies all .md files from the code directory tree into the site tree - Performs some transformations on them - Generates the nav tree structure and labels +- Happens during the site:pre-site phase of Maven. ###bin/fix-md-dialect.py http://git-wip-us.apache.org/repos/asf/metron/blob/29e7c70d/site-book/pom.xml ---------------------------------------------------------------------- diff --git a/site-book/pom.xml b/site-book/pom.xml index 2f04c71..71e4879 100644 --- a/site-book/pom.xml +++ b/site-book/pom.xml @@ -51,6 +51,22 @@ <build> <plugins> + <plugin> + <artifactId>exec-maven-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <executions> + <execution> + <id>Generate MD</id> + <phase>pre-site</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>${basedir}/bin/generate-md.sh</executable> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> @@ -73,10 +89,8 @@ <configuration> <generateProjectInfo>false</generateProjectInfo> <generateReports>false</generateReports> - <skip>false</skip> </configuration> </plugin> </plugins> </build> - </project>
