Skip to content

Commit 2527ad4

Browse files
janithbjanithb
committed
Merge branch 'master' of https://github.com/audit4j/audit4j-core into Milestone-2.3.0
Conflicts: src/main/java/org/audit4j/core/ConfigUtil.java src/main/java/org/audit4j/core/CoreConstants.java
2 parents 33a6616 + 8b76a53 commit 2527ad4

File tree

4 files changed

+108
-11
lines changed

4 files changed

+108
-11
lines changed

‎.gitignore‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,12 @@
44
*.jar
55
*.war
66
*.ear
7+
.idea/
8+
*.iml
9+
*.audit
10+
*.yml
11+
.settings
12+
target
13+
.classpath
14+
.project
15+

‎pom.xml‎

Lines changed: 85 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<name>Audit4j - Core</name>
88
<version>2.2.0</version>
99
<url>http://audit4j.org</url>
10-
<description>Audit4j - An open-source auditing framework for Java, Spring Integration</description>
10+
<description>Audit4j - An open-source auditing framework for Java, Core</description>
1111
<organization>
1212
<name>Audit4j</name>
1313
<url>http://audit4j.org</url>
@@ -89,6 +89,11 @@
8989
<!-- or whatever version you use -->
9090
<source>1.7</source>
9191
<target>1.7</target>
92+
<!-- [#2413] Make compiler warnings a bit more visible But don't fail
93+
(yet) -->
94+
<compilerArgs>
95+
<arg>-Xlint:varargs</arg>
96+
</compilerArgs>
9297
</configuration>
9398
</plugin>
9499
<plugin>
@@ -131,6 +136,10 @@
131136
<plugin>
132137
<groupId>org.apache.maven.plugins</groupId>
133138
<artifactId>maven-eclipse-plugin</artifactId>
139+
<configuration>
140+
<downloadSources>true</downloadSources>
141+
<downloadJavadocs>true</downloadJavadocs>
142+
</configuration>
134143
</plugin>
135144
<plugin>
136145
<groupId>org.apache.maven.plugins</groupId>
@@ -151,4 +160,79 @@
151160
</plugin>
152161
</plugins>
153162
</build>
163+
<reporting>
164+
<plugins>
165+
<plugin>
166+
<groupId>org.codehaus.mojo</groupId>
167+
<artifactId>cobertura-maven-plugin</artifactId>
168+
<version>2.6</version>
169+
<configuration>
170+
<instrumentation>
171+
<ignores>
172+
<ignore>org.audit4j.core.extra.*</ignore>
173+
</ignores>
174+
</instrumentation>
175+
</configuration>
176+
</plugin>
177+
<plugin>
178+
<groupId>org.codehaus.mojo</groupId>
179+
<artifactId>findbugs-maven-plugin</artifactId>
180+
<version>3.0.0</version>
181+
<configuration>
182+
<excludes>
183+
<exclude>org.audit4j.core.extra.*</exclude>
184+
</excludes>
185+
</configuration>
186+
</plugin>
187+
<plugin>
188+
<groupId>org.apache.maven.plugins</groupId>
189+
<artifactId>maven-pmd-plugin</artifactId>
190+
<version>3.4</version>
191+
<configuration>
192+
<linkXref>true</linkXref>
193+
<sourceEncoding>utf-8</sourceEncoding>
194+
<minimumTokens>100</minimumTokens>
195+
<targetJdk>1.5</targetJdk>
196+
<excludes>
197+
<exclude>org.audit4j.core.extra.*</exclude>
198+
</excludes>
199+
</configuration>
200+
</plugin>
201+
<plugin>
202+
<groupId>org.apache.maven.plugins</groupId>
203+
<artifactId>maven-project-info-reports-plugin</artifactId>
204+
<version>2.6</version>
205+
<reportSets>
206+
<reportSet>
207+
<reports><!-- select reports -->
208+
<report>index</report>
209+
</reports>
210+
</reportSet>
211+
</reportSets>
212+
</plugin>
213+
<plugin>
214+
<groupId>org.apache.maven.plugins</groupId>
215+
<artifactId>maven-javadoc-plugin</artifactId>
216+
<version>2.9</version>
217+
<configuration>
218+
<excludePackageNames>org.audit4j.core.extra.*</excludePackageNames>
219+
</configuration>
220+
<reportSets>
221+
<reportSet><!-- by default, id = "default" -->
222+
<reports><!-- select non-aggregate reports -->
223+
<report>javadoc</report>
224+
<report>test-javadoc</report>
225+
</reports>
226+
</reportSet>
227+
<reportSet><!-- aggregate reportSet, to define in poms having modules -->
228+
<id>aggregate</id>
229+
<inherited>false</inherited><!-- don't run aggregate in child modules -->
230+
<reports>
231+
<report>aggregate</report>
232+
</reports>
233+
</reportSet>
234+
</reportSets>
235+
</plugin>
236+
</plugins>
237+
</reporting>
154238
</project>

‎src/main/java/org/audit4j/core/ConfigUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014-2015 Janith Bandara, This source is a part of
2+
* Copyright 2014 Janith Bandara, This source is a part of
33
* Audit4j - An open source auditing framework.
44
* http://audit4j.org
55
*

‎src/main/java/org/audit4j/core/CoreConstants.java‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
/*
2+
<<<<<<< HEAD
23
* Copyright (c) 2014-2015 Janith Bandara, This source is a part of
4+
=======
5+
* Copyright 2014 Janith Bandara, This source is a part of
6+
>>>>>>> 8b76a53fd65d1fa87cf0839012fb0acd7945deef
37
* Audit4j - An open source auditing framework.
48
* http://audit4j.org
59
*
@@ -20,34 +24,34 @@
2024

2125
/**
2226
* The Class CoreConstants.
23-
*
27+
*
2428
* @author <a href="mailto:[email protected]">Janith Bandara</a>
25-
*
29+
*
2630
* @since 1.0.0
2731
*/
2832
public final class CoreConstants {
2933

3034
/** The Constant APP_NAME. */
3135
public static final String APP_NAME = "Audit4j";
32-
36+
3337
/** The Constant RELEASE_VERSION. */
3438
public static final String RELEASE_VERSION = "2.2.0";
3539

3640
/** The Constant RELEASE_DATE. */
3741
public static final String RELEASE_DATE = "2014-08-29T12:40:21.077Z";
38-
42+
3943
/** The Constant SUPPORT_JAVA_VERSION. */
4044
public static final String SUPPORT_JAVA_VERSION = "7";
41-
45+
4246
/** The Constant AUDIT_EXTENTION. */
4347
public static final String AUDIT_EXTENTION = ".audit";
44-
48+
4549
/** The Constant SITE_URL. */
4650
public static final String SITE_URL = "http://audit4j.org";
4751

4852
/** The Constant CONFIG_FILE_NAME. */
49-
public static final String CONFIG_FILE_NAME = "auit4j.conf.yml";
50-
53+
public static final String CONFIG_FILE_NAME = "audit4j.conf.yml";
54+
5155
/** The Constant COLON_CHAR. */
5256
public static final char COLON_CHAR = ':';
5357

@@ -88,7 +92,7 @@ public final class CoreConstants {
8892

8993
/** The Constant SALT. */
9094
public static final String DEFAULT_SECURE_SALT = "232332324";
91-
95+
9296
/** The Constant DEFAULT_SECURE_KEY. */
9397
public static final String DEFAULT_SECURE_KEY = "Aud1T4jSecureKey";
9498

0 commit comments

Comments
 (0)