Skip to content

Commit 5209d27

Browse files
committed
Merge Bjorn Kimminich's pull request (# 386). Close issue #386.
1 parent 0a203f8 commit 5209d27

File tree

4 files changed

+50
-23
lines changed

4 files changed

+50
-23
lines changed

.gitignore

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1+
# Eclipse / IntelliJ / Maven / backup editor files
12
/target
23
/.settings/**
34
.classpath
45
.project
56
*.swp
67
*~
78
*.iml
9+
.idea/
10+
*.iws
11+
*.eml
12+
out/
813

9-
# IntelliJ
10-
11-
/.idea
14+
# Leftover test files
15+
ciphertext-portable.ser
16+
ReferenceEncryptedProperties.test.txt
17+
test.out

.travis.yml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
language: java
2+
jdk:
3+
- oraclejdk7
4+
env:
5+
global:
6+
- secure: "aDhH/FBa9CSX3P3UucVJGghHkzHwmw8DhEdklUnb5HI44CpQs5rVNBQLG6ClqrJGl5BEghaHG9mQ0alVrZoqGCR4UA0qhGCmeRyo+SL7z44tHFq/VdWbZJcnSXeq+CzGc4rgkIg2XBrgGKKq5EfUxXjsYQUA/mIslWhnmQtfn0gjiobJkOdGAOJ4RY6cAyTtgNbv8AZg71hnPDusz+F/Somy1GPp2oFW0gAJyOUbDqol6bx8ajTl/+NJkQL9uSlUEGqyeMwXGW0Z901Vbn+Btwl7QtnrSFxOOOlQSUIAFGKTqAt/DzOeKi0Guv5uE4nqR50veOge5StbpgDqTq6a101DYNTyMFeE4plTNKHawnnyMe7v0yTDsnk+PeeSe8hkkdqiRLiBufriVnlzlfQt9TbWfE7aRhy6U0wqvlMvMgOOmXl5+eyLf1CtdRCbWeh2eZFISbD35y8EZbGY/bP33sC8jHlWROtykdMkVzcZ6N+mP+pB+SSqy+5hUMFUCDKyzRoIjHioVJS0S+Ul7CpEeLNKTy23IzO5VSh9dysH+hf+dbdAhgEe/XBEpUxZnV400fww5LW+vAlDpY+QwqdzwpabofTYaRfyRT7nQC3qAgMrQZopqwehdKyOTgpGIKM4lqqsSLz0F/LZ57fUh8DD2sZl2M4VKL6SQ3KPEM+DC/w="
7+
after_success:
8+
- mvn clean cobertura:cobertura coveralls:report
9+
addons:
10+
coverity_scan:
11+
project:
12+
name: "bkimminich/esapi-java-legacy"
13+
description: "OWASP ESAPI 2.x (Legacy) build submitted via Travis CI"
14+
notification_email: [email protected]
15+
build_command_prepend: "mvn clean"
16+
build_command: "mvn -DskipTests=true compile"
17+
branch_pattern: coverity_scan

README.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
Enterprise Security API for Java (Legacy)
22
=================
3+
4+
[![Build Status](https://travis-ci.org/bkimminich/esapi-java-legacy.svg?branch=master)](https://travis-ci.org/bkimminich/esapi-java-legacy)
5+
[![Coverage Status](https://coveralls.io/repos/github/bkimminich/esapi-java-legacy/badge.svg?branch=develop)](https://coveralls.io/github/bkimminich/esapi-java-legacy?branch=develop)
6+
[![Coverity Status](https://scan.coverity.com/projects/8517/badge.svg)](https://scan.coverity.com/projects/bkimminich-esapi-java-legacy)
7+
38
<table border=0>
49
<tr>
510
<td>

pom.xml

+19-20
Original file line numberDiff line numberDiff line change
@@ -250,16 +250,26 @@
250250
</execution>
251251
</executions>
252252
</plugin>
253+
254+
<plugin>
255+
<groupId>org.codehaus.mojo</groupId>
256+
<artifactId>cobertura-maven-plugin</artifactId>
257+
<version>2.7</version>
258+
<configuration>
259+
<formats>
260+
<format>html</format>
261+
<format>xml</format>
262+
</formats>
263+
</configuration>
264+
</plugin>
265+
266+
<plugin>
267+
<groupId>org.eluder.coveralls</groupId>
268+
<artifactId>coveralls-maven-plugin</artifactId>
269+
<version>4.1.0</version>
270+
</plugin>
271+
253272
</plugins>
254-
<resources>
255-
<resource>
256-
<directory>src/main/resources</directory>
257-
</resource>
258-
<resource>
259-
<directory>configuration/META-INF</directory>
260-
<targetPath>META-INF</targetPath>
261-
</resource>
262-
</resources>
263273
</build>
264274

265275
<reporting>
@@ -277,17 +287,6 @@
277287
<relaxed>false</relaxed>
278288
</configuration>
279289
</plugin>
280-
<plugin>
281-
<groupId>org.codehaus.mojo</groupId>
282-
<artifactId>cobertura-maven-plugin</artifactId>
283-
<version>2.7</version>
284-
<configuration>
285-
<formats>
286-
<format>html</format>
287-
<format>xml</format>
288-
</formats>
289-
</configuration>
290-
</plugin>
291290
<plugin>
292291
<groupId>org.codehaus.mojo</groupId>
293292
<artifactId>jdepend-maven-plugin</artifactId>

0 commit comments

Comments
 (0)