From 691782bf8338696357ad032e827da76d3fabfec4 Mon Sep 17 00:00:00 2001 From: Michael Wall Date: Thu, 28 Jan 2016 19:13:45 -0500 Subject: [PATCH 1/2] ACCUMULO-4121 - netbeans Added typical files for a maven project to all .gitignores Also excluded those files in the rat plugin section of the pom.xml files. Not excluded by default, see http://creadur.apache.org/rat/apache-rat-plugin/check-mojo.html#useDefaultExcludes --- .gitignore | 3 +++ assemble/.gitignore | 3 +++ assemble/pom.xml | 3 +++ core/.gitignore | 3 +++ core/pom.xml | 3 +++ docs/.gitignore | 3 +++ examples/simple/.gitignore | 3 +++ examples/simple/pom.xml | 3 +++ fate/.gitignore | 3 +++ maven-plugin/.gitignore | 3 +++ minicluster/.gitignore | 3 +++ pom.xml | 12 ++++++++++++ proxy/.gitignore | 3 +++ server/base/.gitignore | 3 +++ server/gc/.gitignore | 3 +++ server/master/.gitignore | 3 +++ server/monitor/.gitignore | 3 +++ server/monitor/pom.xml | 3 +++ server/native/.gitignore | 3 +++ server/tracer/.gitignore | 3 +++ server/tserver/.gitignore | 3 +++ server/tserver/pom.xml | 3 +++ start/.gitignore | 3 +++ test/.gitignore | 3 +++ test/pom.xml | 3 +++ trace/.gitignore | 3 +++ 26 files changed, 87 insertions(+) diff --git a/.gitignore b/.gitignore index 56204d21a1d..e77a822fe70 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,6 @@ /.pydevproject /.idea /*.iml +/nbproject/ +/nbactions.xml +/nb-configuration.xml diff --git a/assemble/.gitignore b/assemble/.gitignore index 56204d21a1d..9a6df0956f2 100644 --- a/assemble/.gitignore +++ b/assemble/.gitignore @@ -23,3 +23,6 @@ /.pydevproject /.idea /*.iml +/nbproject/ +/nbactions.xml +/nb-configuration.xml \ No newline at end of file diff --git a/assemble/pom.xml b/assemble/pom.xml index 282a294f437..ff94e01cb90 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -171,6 +171,9 @@ bin-LICENSE bin-NOTICE + nbproject/** + nb-configuration.xml + nbactions.xml diff --git a/core/.gitignore b/core/.gitignore index 59a826fbe29..c3af2821b96 100644 --- a/core/.gitignore +++ b/core/.gitignore @@ -24,3 +24,6 @@ /.idea /*.iml /bin/ +/nbproject/ +/nbactions.xml +/nb-configuration.xml \ No newline at end of file diff --git a/core/pom.xml b/core/pom.xml index 74a0069b95e..c83ed58d76f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -173,6 +173,9 @@ src/test/resources/accumulo.jceks src/test/resources/empty.jceks src/test/resources/passwords.jceks + nbproject/** + nb-configuration.xml + nbactions.xml diff --git a/docs/.gitignore b/docs/.gitignore index 56204d21a1d..9a6df0956f2 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -23,3 +23,6 @@ /.pydevproject /.idea /*.iml +/nbproject/ +/nbactions.xml +/nb-configuration.xml \ No newline at end of file diff --git a/examples/simple/.gitignore b/examples/simple/.gitignore index 59a826fbe29..8d383417951 100644 --- a/examples/simple/.gitignore +++ b/examples/simple/.gitignore @@ -24,3 +24,6 @@ /.idea /*.iml /bin/ +/nbproject/ +/nbactions.xml +/nb-configuration.xml diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml index 421e6b132be..b568f520127 100644 --- a/examples/simple/pom.xml +++ b/examples/simple/pom.xml @@ -95,6 +95,9 @@ src/main/resources/META-INF/services/org.apache.accumulo.core.util.shell.ShellExtension + nbproject/** + nb-configuration.xml + nbactions.xml diff --git a/fate/.gitignore b/fate/.gitignore index 59a826fbe29..8d383417951 100644 --- a/fate/.gitignore +++ b/fate/.gitignore @@ -24,3 +24,6 @@ /.idea /*.iml /bin/ +/nbproject/ +/nbactions.xml +/nb-configuration.xml diff --git a/maven-plugin/.gitignore b/maven-plugin/.gitignore index e7d7fb1758a..0a0b71a1d75 100644 --- a/maven-plugin/.gitignore +++ b/maven-plugin/.gitignore @@ -24,3 +24,6 @@ /.idea /*.iml /target/ +/nbproject/ +/nbactions.xml +/nb-configuration.xml \ No newline at end of file diff --git a/minicluster/.gitignore b/minicluster/.gitignore index 56204d21a1d..9a6df0956f2 100644 --- a/minicluster/.gitignore +++ b/minicluster/.gitignore @@ -23,3 +23,6 @@ /.pydevproject /.idea /*.iml +/nbproject/ +/nbactions.xml +/nb-configuration.xml \ No newline at end of file diff --git a/pom.xml b/pom.xml index 32380075e65..feaa6927d4c 100644 --- a/pom.xml +++ b/pom.xml @@ -738,6 +738,18 @@ maven-plugin-plugin 3.4 + + org.apache.rat + apache-rat-plugin + 0.10 + + + nbproject/** + nb-configuration.xml + nbactions.xml + + + diff --git a/proxy/.gitignore b/proxy/.gitignore index 5def6512d35..9f528959abf 100644 --- a/proxy/.gitignore +++ b/proxy/.gitignore @@ -23,6 +23,9 @@ /.pydevproject /.idea /*.iml +/nbproject/ +/nbactions.xml +/nb-configuration.xml # python ignores *.pyc diff --git a/server/base/.gitignore b/server/base/.gitignore index 56204d21a1d..9a6df0956f2 100644 --- a/server/base/.gitignore +++ b/server/base/.gitignore @@ -23,3 +23,6 @@ /.pydevproject /.idea /*.iml +/nbproject/ +/nbactions.xml +/nb-configuration.xml \ No newline at end of file diff --git a/server/gc/.gitignore b/server/gc/.gitignore index 56204d21a1d..9a6df0956f2 100644 --- a/server/gc/.gitignore +++ b/server/gc/.gitignore @@ -23,3 +23,6 @@ /.pydevproject /.idea /*.iml +/nbproject/ +/nbactions.xml +/nb-configuration.xml \ No newline at end of file diff --git a/server/master/.gitignore b/server/master/.gitignore index 56204d21a1d..9a6df0956f2 100644 --- a/server/master/.gitignore +++ b/server/master/.gitignore @@ -23,3 +23,6 @@ /.pydevproject /.idea /*.iml +/nbproject/ +/nbactions.xml +/nb-configuration.xml \ No newline at end of file diff --git a/server/monitor/.gitignore b/server/monitor/.gitignore index 56204d21a1d..9a6df0956f2 100644 --- a/server/monitor/.gitignore +++ b/server/monitor/.gitignore @@ -23,3 +23,6 @@ /.pydevproject /.idea /*.iml +/nbproject/ +/nbactions.xml +/nb-configuration.xml \ No newline at end of file diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml index f9c5007d5a4..96559d4a5be 100644 --- a/server/monitor/pom.xml +++ b/server/monitor/pom.xml @@ -134,6 +134,9 @@ src/main/resources/web/flot/**/*.js + nbproject/** + nb-configuration.xml + nbactions.xml diff --git a/server/native/.gitignore b/server/native/.gitignore index 56204d21a1d..9a6df0956f2 100644 --- a/server/native/.gitignore +++ b/server/native/.gitignore @@ -23,3 +23,6 @@ /.pydevproject /.idea /*.iml +/nbproject/ +/nbactions.xml +/nb-configuration.xml \ No newline at end of file diff --git a/server/tracer/.gitignore b/server/tracer/.gitignore index e7d7fb1758a..0a0b71a1d75 100644 --- a/server/tracer/.gitignore +++ b/server/tracer/.gitignore @@ -24,3 +24,6 @@ /.idea /*.iml /target/ +/nbproject/ +/nbactions.xml +/nb-configuration.xml \ No newline at end of file diff --git a/server/tserver/.gitignore b/server/tserver/.gitignore index 56204d21a1d..9a6df0956f2 100644 --- a/server/tserver/.gitignore +++ b/server/tserver/.gitignore @@ -23,3 +23,6 @@ /.pydevproject /.idea /*.iml +/nbproject/ +/nbactions.xml +/nb-configuration.xml \ No newline at end of file diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml index 6b3baaab3b4..a26fdbfe63c 100644 --- a/server/tserver/pom.xml +++ b/server/tserver/pom.xml @@ -117,6 +117,9 @@ src/test/resources/*.walog src/test/resources/walog-from-14/* + nbproject/** + nb-configuration.xml + nbactions.xml diff --git a/start/.gitignore b/start/.gitignore index 56204d21a1d..9a6df0956f2 100644 --- a/start/.gitignore +++ b/start/.gitignore @@ -23,3 +23,6 @@ /.pydevproject /.idea /*.iml +/nbproject/ +/nbactions.xml +/nb-configuration.xml \ No newline at end of file diff --git a/test/.gitignore b/test/.gitignore index 5def6512d35..9f528959abf 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -23,6 +23,9 @@ /.pydevproject /.idea /*.iml +/nbproject/ +/nbactions.xml +/nb-configuration.xml # python ignores *.pyc diff --git a/test/pom.xml b/test/pom.xml index f9472dc19ef..45297d83d82 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -183,6 +183,9 @@ system/bench/lib/*splits system/continuous/*.txt + nbproject/** + nb-configuration.xml + nbactions.xml diff --git a/trace/.gitignore b/trace/.gitignore index 59a826fbe29..c3af2821b96 100644 --- a/trace/.gitignore +++ b/trace/.gitignore @@ -24,3 +24,6 @@ /.idea /*.iml /bin/ +/nbproject/ +/nbactions.xml +/nb-configuration.xml \ No newline at end of file From 6d925ae87fa6b08ee69f1fb0fb17fbcf32ca6e63 Mon Sep 17 00:00:00 2001 From: Michael Wall Date: Fri, 29 Jan 2016 09:26:03 -0500 Subject: [PATCH 2/2] ACCUMULO-4121 add newline to end of file --- .gitignore | 1 + assemble/.gitignore | 3 ++- core/.gitignore | 3 ++- docs/.gitignore | 3 ++- examples/simple/.gitignore | 1 + fate/.gitignore | 1 + maven-plugin/.gitignore | 3 ++- minicluster/.gitignore | 3 ++- proxy/.gitignore | 1 + server/base/.gitignore | 3 ++- server/gc/.gitignore | 3 ++- server/master/.gitignore | 3 ++- server/monitor/.gitignore | 3 ++- server/native/.gitignore | 3 ++- server/tracer/.gitignore | 3 ++- server/tserver/.gitignore | 3 ++- start/.gitignore | 3 ++- test/.gitignore | 1 + trace/.gitignore | 3 ++- 19 files changed, 33 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index e77a822fe70..f97b5ca630f 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /nbproject/ /nbactions.xml /nb-configuration.xml + diff --git a/assemble/.gitignore b/assemble/.gitignore index 9a6df0956f2..f97b5ca630f 100644 --- a/assemble/.gitignore +++ b/assemble/.gitignore @@ -25,4 +25,5 @@ /*.iml /nbproject/ /nbactions.xml -/nb-configuration.xml \ No newline at end of file +/nb-configuration.xml + diff --git a/core/.gitignore b/core/.gitignore index c3af2821b96..8c9981cd4fc 100644 --- a/core/.gitignore +++ b/core/.gitignore @@ -26,4 +26,5 @@ /bin/ /nbproject/ /nbactions.xml -/nb-configuration.xml \ No newline at end of file +/nb-configuration.xml + diff --git a/docs/.gitignore b/docs/.gitignore index 9a6df0956f2..f97b5ca630f 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -25,4 +25,5 @@ /*.iml /nbproject/ /nbactions.xml -/nb-configuration.xml \ No newline at end of file +/nb-configuration.xml + diff --git a/examples/simple/.gitignore b/examples/simple/.gitignore index 8d383417951..8c9981cd4fc 100644 --- a/examples/simple/.gitignore +++ b/examples/simple/.gitignore @@ -27,3 +27,4 @@ /nbproject/ /nbactions.xml /nb-configuration.xml + diff --git a/fate/.gitignore b/fate/.gitignore index 8d383417951..8c9981cd4fc 100644 --- a/fate/.gitignore +++ b/fate/.gitignore @@ -27,3 +27,4 @@ /nbproject/ /nbactions.xml /nb-configuration.xml + diff --git a/maven-plugin/.gitignore b/maven-plugin/.gitignore index 0a0b71a1d75..0a396d48a62 100644 --- a/maven-plugin/.gitignore +++ b/maven-plugin/.gitignore @@ -26,4 +26,5 @@ /target/ /nbproject/ /nbactions.xml -/nb-configuration.xml \ No newline at end of file +/nb-configuration.xml + diff --git a/minicluster/.gitignore b/minicluster/.gitignore index 9a6df0956f2..f97b5ca630f 100644 --- a/minicluster/.gitignore +++ b/minicluster/.gitignore @@ -25,4 +25,5 @@ /*.iml /nbproject/ /nbactions.xml -/nb-configuration.xml \ No newline at end of file +/nb-configuration.xml + diff --git a/proxy/.gitignore b/proxy/.gitignore index 9f528959abf..87da2f93c76 100644 --- a/proxy/.gitignore +++ b/proxy/.gitignore @@ -29,3 +29,4 @@ # python ignores *.pyc + diff --git a/server/base/.gitignore b/server/base/.gitignore index 9a6df0956f2..f97b5ca630f 100644 --- a/server/base/.gitignore +++ b/server/base/.gitignore @@ -25,4 +25,5 @@ /*.iml /nbproject/ /nbactions.xml -/nb-configuration.xml \ No newline at end of file +/nb-configuration.xml + diff --git a/server/gc/.gitignore b/server/gc/.gitignore index 9a6df0956f2..f97b5ca630f 100644 --- a/server/gc/.gitignore +++ b/server/gc/.gitignore @@ -25,4 +25,5 @@ /*.iml /nbproject/ /nbactions.xml -/nb-configuration.xml \ No newline at end of file +/nb-configuration.xml + diff --git a/server/master/.gitignore b/server/master/.gitignore index 9a6df0956f2..f97b5ca630f 100644 --- a/server/master/.gitignore +++ b/server/master/.gitignore @@ -25,4 +25,5 @@ /*.iml /nbproject/ /nbactions.xml -/nb-configuration.xml \ No newline at end of file +/nb-configuration.xml + diff --git a/server/monitor/.gitignore b/server/monitor/.gitignore index 9a6df0956f2..f97b5ca630f 100644 --- a/server/monitor/.gitignore +++ b/server/monitor/.gitignore @@ -25,4 +25,5 @@ /*.iml /nbproject/ /nbactions.xml -/nb-configuration.xml \ No newline at end of file +/nb-configuration.xml + diff --git a/server/native/.gitignore b/server/native/.gitignore index 9a6df0956f2..f97b5ca630f 100644 --- a/server/native/.gitignore +++ b/server/native/.gitignore @@ -25,4 +25,5 @@ /*.iml /nbproject/ /nbactions.xml -/nb-configuration.xml \ No newline at end of file +/nb-configuration.xml + diff --git a/server/tracer/.gitignore b/server/tracer/.gitignore index 0a0b71a1d75..0a396d48a62 100644 --- a/server/tracer/.gitignore +++ b/server/tracer/.gitignore @@ -26,4 +26,5 @@ /target/ /nbproject/ /nbactions.xml -/nb-configuration.xml \ No newline at end of file +/nb-configuration.xml + diff --git a/server/tserver/.gitignore b/server/tserver/.gitignore index 9a6df0956f2..f97b5ca630f 100644 --- a/server/tserver/.gitignore +++ b/server/tserver/.gitignore @@ -25,4 +25,5 @@ /*.iml /nbproject/ /nbactions.xml -/nb-configuration.xml \ No newline at end of file +/nb-configuration.xml + diff --git a/start/.gitignore b/start/.gitignore index 9a6df0956f2..f97b5ca630f 100644 --- a/start/.gitignore +++ b/start/.gitignore @@ -25,4 +25,5 @@ /*.iml /nbproject/ /nbactions.xml -/nb-configuration.xml \ No newline at end of file +/nb-configuration.xml + diff --git a/test/.gitignore b/test/.gitignore index 9f528959abf..87da2f93c76 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -29,3 +29,4 @@ # python ignores *.pyc + diff --git a/trace/.gitignore b/trace/.gitignore index c3af2821b96..8c9981cd4fc 100644 --- a/trace/.gitignore +++ b/trace/.gitignore @@ -26,4 +26,5 @@ /bin/ /nbproject/ /nbactions.xml -/nb-configuration.xml \ No newline at end of file +/nb-configuration.xml +