From 3b8defbc18519477c1a016e710faad05e0816d19 Mon Sep 17 00:00:00 2001 From: Bjoern Kimminich Date: Tue, 29 Mar 2016 12:58:53 +0200 Subject: [PATCH 1/5] Removed news zombie from 2014 --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 97d49e9..3158941 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,5 @@ Welcome to the Home of ESAPI 3.x News ========== -2 Sept 2014 - We are gearing up to get some great stuff done at AppSecUSA in Denver this month. We'll be announcing our schedule and where we'll be at the conference soon! Stay tuned! - -For more information on ESAPI or information on ESAPI 2.x please visit our wiki page at https://www.owasp.org/index.php/Category:OWASP_Enterprise_Security_API +For more information on ESAPI or information on ESAPI 2.x please visit our wiki page at https://www.owasp.org/index.php/Category:OWASP_Enterprise_Security_API \ No newline at end of file From a0bd61ea5378c6d75be26032e0169f5a05e6ceca Mon Sep 17 00:00:00 2001 From: Bjoern Kimminich Date: Tue, 29 Mar 2016 13:00:23 +0200 Subject: [PATCH 2/5] Ignoring Eclipse and IntelliJ project files --- .gitignore | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/.gitignore b/.gitignore index 0f182a0..6e95a5a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,31 @@ *.jar *.war *.ear + +# Intellij +.idea/ +*.iml +*.iws +*.eml +out/ + +# Eclipse +*.pydevproject +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.classpath +.project +RemoteSystemsTempFiles/ +.externalToolBuilders/ +*.launch +.cproject +.buildpath +*.userlibraries \ No newline at end of file From 801568bebe0be74a05f3e8a16ae26bd762d8fa51 Mon Sep 17 00:00:00 2001 From: Bjoern Kimminich Date: Tue, 29 Mar 2016 13:05:30 +0200 Subject: [PATCH 3/5] Added default Travis-CI config Will execute by default: 1. mvn install -DskipTests=true 2. mvn test (see https://docs.travis-ci.com/user/languages/java#Projects-Using-Maven) --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..6bebb20 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,6 @@ +language: java + +jdk: + - oraclejdk8 + - oraclejdk7 + - openjdk7 \ No newline at end of file From 12fad1af8398663d42486fa3343996d906628c29 Mon Sep 17 00:00:00 2001 From: Bjoern Kimminich Date: Tue, 29 Mar 2016 13:06:59 +0200 Subject: [PATCH 4/5] Ignoring Maven output folder --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6e95a5a..752d19c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,13 @@ *.class -# Package Files # +# Package Files *.jar *.war *.ear +# Maven Files +target/ + # Intellij .idea/ *.iml From e512484b84d45d45466d7380d01faae62a07bae7 Mon Sep 17 00:00:00 2001 From: Bjoern Kimminich Date: Tue, 29 Mar 2016 13:38:55 +0200 Subject: [PATCH 5/5] Reformatted Travis config to avoid conflict with previous PR by @b-long --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6bebb20..0b548d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: java - jdk: - - oraclejdk8 + - openjdk7 - oraclejdk7 - - openjdk7 \ No newline at end of file + - oraclejdk8 \ No newline at end of file