Repository: falcon Updated Branches: refs/heads/master d7a4eeb4e -> e7364bd55
FALCON-2326 Falcon Pull Request Builds failing Author: Pallavi Nagesha Rao <[email protected]> Reviewers: @sandeepSamudrala Closes #402 from pallavi-rao/2326 Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/e7364bd5 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/e7364bd5 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/e7364bd5 Branch: refs/heads/master Commit: e7364bd55bb186097cf6f2a184871a84a0379fda Parents: d7a4eeb Author: Pallavi Nagesha Rao <[email protected]> Authored: Mon Feb 26 11:20:02 2018 +0530 Committer: pallavi-rao <[email protected]> Committed: Mon Feb 26 11:20:02 2018 +0530 ---------------------------------------------------------------------- cli/pom.xml | 6 ++++++ pom.xml | 6 +++--- prism/pom.xml | 14 +++++++------- .../org/apache/falcon/aspect/GenericAlertTest.java | 6 ++++++ 4 files changed, 22 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/e7364bd5/cli/pom.xml ---------------------------------------------------------------------- diff --git a/cli/pom.xml b/cli/pom.xml index 04a43c8..634bb06 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -155,6 +155,12 @@ <groupId>org.apache.falcon</groupId> <artifactId>falcon-common</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.falcon</groupId> + <artifactId>falcon-metrics</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/falcon/blob/e7364bd5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 71e02f0..d170fb6 100644 --- a/pom.xml +++ b/pom.xml @@ -855,19 +855,19 @@ <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjrt</artifactId> - <version>1.8.6</version> + <version>1.8.13</version> </dependency> <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> - <version>1.8.6</version> + <version>1.8.13</version> </dependency> <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjtools</artifactId> - <version>1.8.6</version> + <version>1.8.13</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/falcon/blob/e7364bd5/prism/pom.xml ---------------------------------------------------------------------- diff --git a/prism/pom.xml b/prism/pom.xml index 5766a43..23a7472 100644 --- a/prism/pom.xml +++ b/prism/pom.xml @@ -231,29 +231,29 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>aspectj-maven-plugin</artifactId> - <version>1.7</version> + <version>1.10</version> <dependencies> <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> - <version>1.8.6</version> + <version>1.8.13</version> </dependency> <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjrt</artifactId> - <version>1.8.6</version> + <version>1.8.13</version> </dependency> <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjtools</artifactId> - <version>1.8.6</version> + <version>1.8.13</version> </dependency> </dependencies> <configuration> <verbose>true</verbose> - <source>1.7</source> - <target>1.7</target> - <complianceLevel>1.7</complianceLevel> + <source>1.8</source> + <target>1.8</target> + <complianceLevel>1.8</complianceLevel> <includes> <include>org/apache/falcon/resource/proxy/SchedulableEntityManagerProxy.java</include> <include>org/apache/falcon/resource/proxy/InstanceManagerProxy.java</include> http://git-wip-us.apache.org/repos/asf/falcon/blob/e7364bd5/prism/src/test/java/org/apache/falcon/aspect/GenericAlertTest.java ---------------------------------------------------------------------- diff --git a/prism/src/test/java/org/apache/falcon/aspect/GenericAlertTest.java b/prism/src/test/java/org/apache/falcon/aspect/GenericAlertTest.java index 0b6a265..9783b52 100644 --- a/prism/src/test/java/org/apache/falcon/aspect/GenericAlertTest.java +++ b/prism/src/test/java/org/apache/falcon/aspect/GenericAlertTest.java @@ -29,5 +29,11 @@ public class GenericAlertTest { GenericAlert.instrumentFailedInstance("cluster", "process", "agg-coord", "120:df", "ef-id", "wf-user", "1", "DELETE", "now", "error", "none", 1242); } + + @Test + public void testRecordAudit() throws Exception { + GenericAlert.audit("who", "fromAddress", "fromHost", "whatURL", + "whatAddrs", "whenISO9601"); + } }
