From 182285b2c2ee07703403249bb8aeb36390b2b292 Mon Sep 17 00:00:00 2001 From: Michael Schierl Date: Tue, 11 Jun 2013 19:43:10 +0200 Subject: [PATCH] Update .gitignore and .travis.yml for new repo --- java/.gitignore | 14 ++++++++++++++ java/.travis.yml | 6 ++++++ java/_root/.gitignore | 42 ------------------------------------------ java/_root/.travis.yml | 18 ------------------ 4 files changed, 20 insertions(+), 60 deletions(-) create mode 100644 java/.gitignore create mode 100644 java/.travis.yml delete mode 100644 java/_root/.gitignore delete mode 100644 java/_root/.travis.yml diff --git a/java/.gitignore b/java/.gitignore new file mode 100644 index 00000000..c743415b --- /dev/null +++ b/java/.gitignore @@ -0,0 +1,14 @@ +*/.classpath +*/.project +*/.settings +*/bin +*/target +*/*/.classpath +*/*/.project +*/*/.settings +*/*/bin +*/*/target +*.swp +*.orig +*.rej +*~ diff --git a/java/.travis.yml b/java/.travis.yml new file mode 100644 index 00000000..40f06358 --- /dev/null +++ b/java/.travis.yml @@ -0,0 +1,6 @@ +language: java + +jdk: + - openjdk6 + - openjdk7 + - oraclejdk7 \ No newline at end of file diff --git a/java/_root/.gitignore b/java/_root/.gitignore deleted file mode 100644 index 5cc4662f..00000000 --- a/java/_root/.gitignore +++ /dev/null @@ -1,42 +0,0 @@ -.bundle -# Rubymine project directory -.idea -# Portable ruby version files for rvm -.ruby-gemset -.ruby-version -# RVM control file -.rvmrc -# YARD cache directory -.yardoc -# Mac OS X files -.DS_Store -# database config for testing -config/database.yml -# simplecov coverage data -coverage -data/meterpreter/ext_server_pivot.dll -data/meterpreter/ext_server_pivot.x64.dll -doc/ -external/source/meterpreter/java/bin -external/source/meterpreter/java/build -external/source/meterpreter/java/extensions -external/source/javapayload/bin -external/source/javapayload/build -# Java binary ignores. Replace the 5 above with this once we're merged. -external/source/javapayload/*/.classpath -external/source/javapayload/*/.project -external/source/javapayload/*/.settings -external/source/javapayload/*/bin -external/source/javapayload/*/target -external/source/javapayload/*/*/.classpath -external/source/javapayload/*/*/.project -external/source/javapayload/*/*/.settings -external/source/javapayload/*/*/bin -external/source/javapayload/*/*/target -# Packaging directory -pkg -tags -*.swp -*.orig -*.rej -*~ diff --git a/java/_root/.travis.yml b/java/_root/.travis.yml deleted file mode 100644 index 9c98a8aa..00000000 --- a/java/_root/.travis.yml +++ /dev/null @@ -1,18 +0,0 @@ -language: ruby -before_install: - - sudo apt-get update -qq - - sudo apt-get install -qq libpcap-dev -before_script: - - cp config/database.yml.travis config/database.yml - - rake db:create - - rake db:migrate - -rvm: - #- '1.8.7' - - '1.9.3' - -notifications: - irc: "irc.freenode.org#msfnotify" - -git: - depth: 1