From 79b8508b602513f0eefc98d0ae1fe92e12281609 Mon Sep 17 00:00:00 2001 From: Naveen Malik Date: Thu, 22 Jan 2015 12:56:55 -0500 Subject: [PATCH 1/7] Removed all submodules --- .gitmodules | 27 --------------------------- lightblue-applications | 1 - lightblue-audit-hook | 1 - lightblue-client | 1 - lightblue-core | 1 - lightblue-ldap | 1 - lightblue-migrator | 1 - lightblue-mongo | 1 - lightblue-rdbms | 1 - lightblue-rest | 1 - 10 files changed, 36 deletions(-) delete mode 160000 lightblue-applications delete mode 160000 lightblue-audit-hook delete mode 160000 lightblue-client delete mode 160000 lightblue-core delete mode 160000 lightblue-ldap delete mode 160000 lightblue-migrator delete mode 160000 lightblue-mongo delete mode 160000 lightblue-rdbms delete mode 160000 lightblue-rest diff --git a/.gitmodules b/.gitmodules index 2e93046..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,27 +0,0 @@ -[submodule "lightblue-core"] - path = lightblue-core - url = git@github.com:lightblue-platform/lightblue-core.git -[submodule "lightblue-rdbms"] - path = lightblue-rdbms - url = git@github.com:lightblue-platform/lightblue-rdbms.git -[submodule "lightblue-mongo"] - path = lightblue-mongo - url = git@github.com:lightblue-platform/lightblue-mongo.git -[submodule "lightblue-rest"] - path = lightblue-rest - url = git@github.com:lightblue-platform/lightblue-rest.git -[submodule "lightblue-audit-hook"] - path = lightblue-audit-hook - url = git@github.com:lightblue-platform/lightblue-audit-hook.git -[submodule "lightblue-applications"] - path = lightblue-applications - url = git@github.com:lightblue-platform/lightblue-applications.git -[submodule "lightblue-client"] - path = lightblue-client - url = git@github.com:lightblue-platform/lightblue-client.git -[submodule "lightblue-migrator"] - path = lightblue-migrator - url = git@github.com:lightblue-platform/lightblue-migrator.git -[submodule "lightblue-ldap"] - path = lightblue-ldap - url = git@github.com:lightblue-platform/lightblue-ldap.git diff --git a/lightblue-applications b/lightblue-applications deleted file mode 160000 index 473cce4..0000000 --- a/lightblue-applications +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 473cce4dfe98455b4515aa74817ae0a117d99cb8 diff --git a/lightblue-audit-hook b/lightblue-audit-hook deleted file mode 160000 index f54f967..0000000 --- a/lightblue-audit-hook +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f54f967762ecb330b0313ec3365e2d8e4ab2e1bd diff --git a/lightblue-client b/lightblue-client deleted file mode 160000 index e75577e..0000000 --- a/lightblue-client +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e75577eb5f98afaab7ce30a84678c25950d91ea4 diff --git a/lightblue-core b/lightblue-core deleted file mode 160000 index f3e81a5..0000000 --- a/lightblue-core +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f3e81a5c29043482ff61149f3acaea4d4c50bfcd diff --git a/lightblue-ldap b/lightblue-ldap deleted file mode 160000 index 490de5a..0000000 --- a/lightblue-ldap +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 490de5ace3f6c1ff8b1af4c3c8fa2c867b97a80f diff --git a/lightblue-migrator b/lightblue-migrator deleted file mode 160000 index 80033d8..0000000 --- a/lightblue-migrator +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 80033d8448b219ec5e17769e6bdc6722f57116fc diff --git a/lightblue-mongo b/lightblue-mongo deleted file mode 160000 index d96b668..0000000 --- a/lightblue-mongo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d96b6682ae678e6632bc24552a32118707455f79 diff --git a/lightblue-rdbms b/lightblue-rdbms deleted file mode 160000 index d9e4c17..0000000 --- a/lightblue-rdbms +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d9e4c17166f5921e3d17e27b2aa09fbf59590b3a diff --git a/lightblue-rest b/lightblue-rest deleted file mode 160000 index 2f49dce..0000000 --- a/lightblue-rest +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2f49dce8b442234899dd15f6c27fb72a1e6b8f56 From 87271ed2823c14b418b570fa7196db943011d773 Mon Sep 17 00:00:00 2001 From: Naveen Malik Date: Thu, 22 Jan 2015 12:59:08 -0500 Subject: [PATCH 2/7] Added submodules back in --- .gitmodules | 27 +++++++++++++++++++++++++++ lightblue-applications | 1 + lightblue-audit-hook | 1 + lightblue-client | 1 + lightblue-core | 1 + lightblue-ldap | 1 + lightblue-migrator | 1 + lightblue-mongo | 1 + lightblue-rdbms | 1 + lightblue-rest | 1 + 10 files changed, 36 insertions(+) create mode 160000 lightblue-applications create mode 160000 lightblue-audit-hook create mode 160000 lightblue-client create mode 160000 lightblue-core create mode 160000 lightblue-ldap create mode 160000 lightblue-migrator create mode 160000 lightblue-mongo create mode 160000 lightblue-rdbms create mode 160000 lightblue-rest diff --git a/.gitmodules b/.gitmodules index e69de29..86cffe6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,27 @@ +[submodule "lightblue-applications"] + path = lightblue-applications + url = https://github.com/lightblue-platform/lightblue-applications.git +[submodule "lightblue-audit-hook"] + path = lightblue-audit-hook + url = https://github.com/lightblue-platform/lightblue-audit-hook.git +[submodule "lightblue-client"] + path = lightblue-client + url = https://github.com/lightblue-platform/lightblue-client.git +[submodule "lightblue-core"] + path = lightblue-core + url = https://github.com/lightblue-platform/lightblue-core.git +[submodule "lightblue-ldap"] + path = lightblue-ldap + url = https://github.com/lightblue-platform/lightblue-ldap.git +[submodule "lightblue-mongo"] + path = lightblue-mongo + url = https://github.com/lightblue-platform/lightblue-mongo.git +[submodule "lightblue-rdbms"] + path = lightblue-rdbms + url = https://github.com/lightblue-platform/lightblue-rdbms.git +[submodule "lightblue-rest"] + path = lightblue-rest + url = https://github.com/lightblue-platform/lightblue-rest.git +[submodule "lightblue-migrator"] + path = lightblue-migrator + url = https://github.com/lightblue-platform/lightblue-migrator.git diff --git a/lightblue-applications b/lightblue-applications new file mode 160000 index 0000000..473cce4 --- /dev/null +++ b/lightblue-applications @@ -0,0 +1 @@ +Subproject commit 473cce4dfe98455b4515aa74817ae0a117d99cb8 diff --git a/lightblue-audit-hook b/lightblue-audit-hook new file mode 160000 index 0000000..f54f967 --- /dev/null +++ b/lightblue-audit-hook @@ -0,0 +1 @@ +Subproject commit f54f967762ecb330b0313ec3365e2d8e4ab2e1bd diff --git a/lightblue-client b/lightblue-client new file mode 160000 index 0000000..e75577e --- /dev/null +++ b/lightblue-client @@ -0,0 +1 @@ +Subproject commit e75577eb5f98afaab7ce30a84678c25950d91ea4 diff --git a/lightblue-core b/lightblue-core new file mode 160000 index 0000000..f3e81a5 --- /dev/null +++ b/lightblue-core @@ -0,0 +1 @@ +Subproject commit f3e81a5c29043482ff61149f3acaea4d4c50bfcd diff --git a/lightblue-ldap b/lightblue-ldap new file mode 160000 index 0000000..490de5a --- /dev/null +++ b/lightblue-ldap @@ -0,0 +1 @@ +Subproject commit 490de5ace3f6c1ff8b1af4c3c8fa2c867b97a80f diff --git a/lightblue-migrator b/lightblue-migrator new file mode 160000 index 0000000..80033d8 --- /dev/null +++ b/lightblue-migrator @@ -0,0 +1 @@ +Subproject commit 80033d8448b219ec5e17769e6bdc6722f57116fc diff --git a/lightblue-mongo b/lightblue-mongo new file mode 160000 index 0000000..d96b668 --- /dev/null +++ b/lightblue-mongo @@ -0,0 +1 @@ +Subproject commit d96b6682ae678e6632bc24552a32118707455f79 diff --git a/lightblue-rdbms b/lightblue-rdbms new file mode 160000 index 0000000..d9e4c17 --- /dev/null +++ b/lightblue-rdbms @@ -0,0 +1 @@ +Subproject commit d9e4c17166f5921e3d17e27b2aa09fbf59590b3a diff --git a/lightblue-rest b/lightblue-rest new file mode 160000 index 0000000..2f49dce --- /dev/null +++ b/lightblue-rest @@ -0,0 +1 @@ +Subproject commit 2f49dce8b442234899dd15f6c27fb72a1e6b8f56 From dcb0081df67eec295fb598034146d9dd4e45309b Mon Sep 17 00:00:00 2001 From: Naveen Malik Date: Thu, 22 Jan 2015 15:09:42 -0500 Subject: [PATCH 3/7] Updated use of coveralls plugin --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f6b88d9..dd736b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: - git submodule update --init --recursive - git submodule foreach git pull origin master script: - - mvn -B clean verify cobertura:cobertura coveralls:cobertura -Dorg.apache.maven.user-settings=~/settings.xml -Dorg.apache.maven.global-settings=~/settings.xml + - mvn -B clean verify cobertura:cobertura coveralls:report after_failure: ~/onFailure.sh notifications: email: false From 88dcf5ad5fe2abb59e8057abfb20dece2bd91615 Mon Sep 17 00:00:00 2001 From: Naveen Malik Date: Thu, 22 Jan 2015 15:36:07 -0500 Subject: [PATCH 4/7] Set logging level to ERROR --- etc/logging.properties | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/etc/logging.properties b/etc/logging.properties index 7c082ae..abbbfd4 100644 --- a/etc/logging.properties +++ b/etc/logging.properties @@ -4,12 +4,7 @@ handlers= java.util.logging.ConsoleHandler # Set the default logging level for new ConsoleHandler instances -java.util.logging.ConsoleHandler.level= FINEST +java.util.logging.ConsoleHandler.level= ERROR # Set global verbose level -.level= INFO - -# Set log verbose level for ShrinkWrap Resolvers -org.jboss.shrinkwrap.resolver.impl.maven.logging.LogTransferListener.level= FINEST -org.jboss.shrinkwrap.resolver.impl.maven.logging.LogRepositoryListener.level= FINEST -org.jboss.shrinkwrap.resolver.impl.maven.logging.LogModelProblemCollector.level= FINEST +.level= ERROR From ed2be2edd01c8d5ed74dcc55a95f3c267baf9572 Mon Sep 17 00:00:00 2001 From: Naveen Malik Date: Fri, 23 Jan 2015 10:06:19 -0500 Subject: [PATCH 5/7] Added configuration to surefire plugin to pick up logging.properties The debug output from unit tests is exceeding the 4MB output limit on travis. It stops the build. --- pom.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pom.xml b/pom.xml index 2710a84..d15d32b 100644 --- a/pom.xml +++ b/pom.xml @@ -110,4 +110,18 @@ along with this program. If not, see . http://127.0.0.1:8080 lightblue + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.18.1 + + + file:etc/logging.properties + + + + + From ca199350660b285e89ec8731598c352a6473ea82 Mon Sep 17 00:00:00 2001 From: Naveen Malik Date: Fri, 23 Jan 2015 11:16:37 -0500 Subject: [PATCH 6/7] Updated submodules --- lightblue-migrator | 2 +- lightblue-mongo | 2 +- lightblue-rdbms | 2 +- lightblue-rest | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lightblue-migrator b/lightblue-migrator index 80033d8..74e6915 160000 --- a/lightblue-migrator +++ b/lightblue-migrator @@ -1 +1 @@ -Subproject commit 80033d8448b219ec5e17769e6bdc6722f57116fc +Subproject commit 74e6915d3a0158b6d6ab8b097da6c40241e6c03b diff --git a/lightblue-mongo b/lightblue-mongo index d96b668..46013e5 160000 --- a/lightblue-mongo +++ b/lightblue-mongo @@ -1 +1 @@ -Subproject commit d96b6682ae678e6632bc24552a32118707455f79 +Subproject commit 46013e5a1902fc8055677f45a3cc238f7edd6f81 diff --git a/lightblue-rdbms b/lightblue-rdbms index d9e4c17..b1816e4 160000 --- a/lightblue-rdbms +++ b/lightblue-rdbms @@ -1 +1 @@ -Subproject commit d9e4c17166f5921e3d17e27b2aa09fbf59590b3a +Subproject commit b1816e44eb26ca8ddf018f94a80d135e996b587c diff --git a/lightblue-rest b/lightblue-rest index 2f49dce..5ea0489 160000 --- a/lightblue-rest +++ b/lightblue-rest @@ -1 +1 @@ -Subproject commit 2f49dce8b442234899dd15f6c27fb72a1e6b8f56 +Subproject commit 5ea0489563e602b252bc1ff2d2dcfa94925bb91e From b2903e17ea656800ab73780852a22c6fcf960397 Mon Sep 17 00:00:00 2001 From: Naveen Malik Date: Fri, 23 Jan 2015 12:09:37 -0500 Subject: [PATCH 7/7] Added coveralls and cobertura plugins to this project's pom --- pom.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pom.xml b/pom.xml index d15d32b..9dd0c8a 100644 --- a/pom.xml +++ b/pom.xml @@ -122,6 +122,22 @@ along with this program. If not, see . + + org.eluder.coveralls + coveralls-maven-plugin + 3.0.1 + + + org.codehaus.mojo + cobertura-maven-plugin + 2.6 + + xml + 256m + + true + +