Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
[EAGLE-46] Modify LICENSE, NOTICE and DISCLAIMER. Fixed some compile …
Browse files Browse the repository at this point in the history
…bugs
  • Loading branch information
haoch committed Nov 19, 2015
1 parent 37e4429 commit bf35ede
Show file tree
Hide file tree
Showing 9 changed files with 52 additions and 8 deletions.
11 changes: 11 additions & 0 deletions DISCLAIMER
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Apache Eagle is an effort undergoing incubation at the Apache Software
Foundation (ASF), sponsored by the Apache Incubator PMC.

Incubation is required of all newly accepted projects until a further
review indicates that the infrastructure, communications, and decision
making process have stabilized in a manner consistent with other
successful ASF projects.

While incubation status is not necessarily a reflection of the
completeness or stability of the code, it does indicate that the
project has yet to be fully endorsed by the ASF.
14 changes: 14 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -200,3 +200,17 @@
See the License for the specific language governing permissions and
limitations under the License.

==============================================================================
Apache Eagle (incubating) Subcomponents:

The Apache Kylin project contains subcomponents with separate copyright
notices and license terms. Your use of the source code for the these
subcomponents is subject to the terms and conditions of the following
licenses.

==============================================================================
For AdminLTE:
==============================================================================
This product bundles AdminLTE, which is available under a
"MIT" license. For details, see
https://github.com/almasaeed2010/AdminLTE/blob/master/LICENSE.
5 changes: 5 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Apache Eagle (incubating)
Copyright 2015-2016 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

public class LogParseUtil {
/**
* .e.g. hchen9@APD.xyz.com
* .e.g. user@APD.xyz.com
*/
private final static Pattern UGI_PATTERN_DEFAULT = Pattern.compile("^([\\w\\d\\-]+)@.*");
/**
Expand Down
2 changes: 1 addition & 1 deletion eagle-security/eagle-security-hdfs-securitylog/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>eagle-security-parent</artifactId>
<groupId>eagle</groupId>
<version>0.1.0</version>
<version>0.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
package eagle.security.securitylog;


import eagle.dataproc.impl.storm.kafka.SpoutKafkaMessageDeserializer;
import eagle.security.securitylog.parse.HDFSSecurityLogObject;
import org.apache.eagle.dataproc.impl.storm.kafka.SpoutKafkaMessageDeserializer;
import eagle.security.securitylog.parse.HDFSSecurityLogParser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigRenderOptions;
import eagle.dataproc.impl.storm.kafka.KafkaSourcedSpoutProvider;
import eagle.dataproc.util.ConfigOptionParser;
import eagle.datastream.ExecutionEnvironmentFactory;
import eagle.datastream.StormExecutionEnvironment;
import org.apache.eagle.dataproc.impl.storm.kafka.KafkaSourcedSpoutProvider;
import org.apache.eagle.dataproc.util.ConfigOptionParser;
import org.apache.eagle.datastream.ExecutionEnvironmentFactory;
import org.apache.eagle.datastream.StormExecutionEnvironment;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
package eagle.security.securitylog.parse;


import eagle.common.DateTimeUtil;
import eagle.security.util.LogParseUtil;
import org.apache.eagle.common.DateTimeUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
14 changes: 14 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
<maven-scalatest.version>1.0</maven-scalatest.version>
<maven-tomcat7.version>2.2</maven-tomcat7.version>
<maven-apache-rat.version>0.11</maven-apache-rat.version>
<maven-failsafe.version>2.6</maven-failsafe.version>

<!-- Environment Versions-->
<hadoop.version>2.6.0.2.2.5.1-3</hadoop.version>
Expand Down Expand Up @@ -687,6 +688,19 @@
<useDefaultExcludes>true</useDefaultExcludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven-failsafe.version}</version>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.tomcat.maven</groupId>
Expand Down

0 comments on commit bf35ede

Please sign in to comment.