From f6aae2ed1cb2cd27873cf1382cba203e901420c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Esteban=20Guti=C3=A9rrez?= Date: Fri, 18 Dec 2015 09:28:58 +0100 Subject: [PATCH 01/19] Bumped version number to 0.3.0-SNAPSHOT --- build/pom.xml | 8 ++++---- config/pom.xml | 6 +++--- config/src/main/resources/ci/settings.xml | 4 ++-- config/src/main/resources/quality/checkstyle.xml | 4 ++-- config/src/main/resources/quality/pmd.xml | 4 ++-- pom.xml | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build/pom.xml b/build/pom.xml index 54324a0..43ae570 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -22,8 +22,8 @@ See the License for the specific language governing permissions and limitations under the License. #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# - Artifact : org.smartdeveloperhub:sdh-build:0.2.0 - Bundle : sdh-build-0.2.0.pom + Artifact : org.smartdeveloperhub:sdh-build:0.3.0-SNAPSHOT + Bundle : sdh-build-0.3.0-SNAPSHOT.pom #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# --> @@ -38,7 +38,7 @@ org.smartdeveloperhub sdh-parent - 0.2.0 + 0.3.0-SNAPSHOT ../pom.xml @@ -105,7 +105,7 @@ - 0.2.0 + 0.3.0-SNAPSHOT 1.7.12 1.3 diff --git a/config/pom.xml b/config/pom.xml index e4b1b61..a53f906 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -22,8 +22,8 @@ See the License for the specific language governing permissions and limitations under the License. #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# - Artifact : org.smartdeveloperhub:sdh-config:0.2.0 - Bundle : sdh-config-0.2.0.jar + Artifact : org.smartdeveloperhub:sdh-config:0.3.0-SNAPSHOT + Bundle : sdh-config-0.3.0-SNAPSHOT.jar #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# --> @@ -38,7 +38,7 @@ org.smartdeveloperhub sdh-parent - 0.2.0 + 0.3.0-SNAPSHOT ../pom.xml diff --git a/config/src/main/resources/ci/settings.xml b/config/src/main/resources/ci/settings.xml index 1414bed..9553a3e 100644 --- a/config/src/main/resources/ci/settings.xml +++ b/config/src/main/resources/ci/settings.xml @@ -21,8 +21,8 @@ See the License for the specific language governing permissions and limitations under the License. #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# - Artifact : org.smartdeveloperhub:sdh-config:0.2.0 - Bundle : sdh-config-0.2.0.jar + Artifact : org.smartdeveloperhub:sdh-config:0.3.0-SNAPSHOT + Bundle : sdh-config-0.3.0-SNAPSHOT.jar #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# --> diff --git a/config/src/main/resources/quality/checkstyle.xml b/config/src/main/resources/quality/checkstyle.xml index 47deed5..0ff983f 100644 --- a/config/src/main/resources/quality/checkstyle.xml +++ b/config/src/main/resources/quality/checkstyle.xml @@ -22,8 +22,8 @@ See the License for the specific language governing permissions and limitations under the License. #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# - Artifact : org.smartdeveloperhub:sdh-config:0.2.0 - Bundle : sdh-config-0.2.0.jar + Artifact : org.smartdeveloperhub:sdh-config:0.3.0-SNAPSHOT + Bundle : sdh-config-0.3.0-SNAPSHOT.jar #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# --> diff --git a/config/src/main/resources/quality/pmd.xml b/config/src/main/resources/quality/pmd.xml index 26f20cc..ec0f056 100644 --- a/config/src/main/resources/quality/pmd.xml +++ b/config/src/main/resources/quality/pmd.xml @@ -22,8 +22,8 @@ See the License for the specific language governing permissions and limitations under the License. #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# - Artifact : org.smartdeveloperhub:sdh-config:0.2.0 - Bundle : sdh-config-0.2.0.jar + Artifact : org.smartdeveloperhub:sdh-config:0.3.0-SNAPSHOT + Bundle : sdh-config-0.3.0-SNAPSHOT.jar #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# --> diff --git a/pom.xml b/pom.xml index 725b70d..14b4dc6 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ org.smartdeveloperhub sdh-parent - 0.2.0 + 0.3.0-SNAPSHOT pom From a1c0defc06195150410d4366512cfde23aba4f6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Esteban=20Guti=C3=A9rrez?= Date: Tue, 22 Dec 2015 08:43:57 +0100 Subject: [PATCH 02/19] Disabled SonarQube analysis until it is available again --- .travis.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index f4030a7..0532a8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,15 +26,15 @@ script: else echo mvn clean install -B -Dcoverage.reports.dir=`pwd`/target/all --settings config/src/main/resources/ci/settings.xml; fi -- if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; - then - case "${TRAVIS_BRANCH}" in - master) mvn sonar:sonar -B -Dsonar.branch=$TRAVIS_BRANCH -Dcoverage.reports.dir=`pwd`/target/all --settings config/src/main/resources/ci/settings.xml;; - develop) mvn sonar:sonar -B -Dsonar.branch=$TRAVIS_BRANCH -Dcoverage.reports.dir=`pwd`/target/all --settings config/src/main/resources/ci/settings.xml;; - feature*) mvn sonar:sonar -B -Dsonar.branch=$TRAVIS_BRANCH -Dcoverage.reports.dir=`pwd`/target/all --settings config/src/main/resources/ci/settings.xml;; - *) echo "Skip SonarQube analysis (${TRAVIS_BRANCH})";; - esac - fi +#- if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; +# then +# case "${TRAVIS_BRANCH}" in +# master) mvn sonar:sonar -B -Dsonar.branch=$TRAVIS_BRANCH -Dcoverage.reports.dir=`pwd`/target/all --settings config/src/main/resources/ci/settings.xml;; +# develop) mvn sonar:sonar -B -Dsonar.branch=$TRAVIS_BRANCH -Dcoverage.reports.dir=`pwd`/target/all --settings config/src/main/resources/ci/settings.xml;; +# feature*) mvn sonar:sonar -B -Dsonar.branch=$TRAVIS_BRANCH -Dcoverage.reports.dir=`pwd`/target/all --settings config/src/main/resources/ci/settings.xml;; +# *) echo "Skip SonarQube analysis (${TRAVIS_BRANCH})";; +# esac +# fi - mkdir /tmp/cache-trick - mv $HOME/.m2/repository/org/smartdeveloperhub /tmp/cache-trick/ env: From 65951037ebadc4c148c28a236ee99c8764ddd7fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Esteban=20Guti=C3=A9rrez?= Date: Fri, 22 Jan 2016 07:50:25 +0100 Subject: [PATCH 03/19] Updated copyright notice to include 2015-2016 period --- build/pom.xml | 4 ++-- config/pom.xml | 4 ++-- config/src/main/resources/ci/settings.xml | 2 +- config/src/main/resources/legal/asf2/header.txt.ftl | 8 ++++---- config/src/main/resources/legal/asf2/license.txt | 6 +++--- config/src/main/resources/legal/cmd_header.xml | 6 +++--- config/src/main/resources/legal/description.ftl | 6 +++--- config/src/main/resources/legal/licenses.properties | 6 +++--- config/src/main/resources/quality/checkstyle.xml | 2 +- config/src/main/resources/quality/pmd.xml | 2 +- pom.xml | 6 +++--- 11 files changed, 26 insertions(+), 26 deletions(-) diff --git a/build/pom.xml b/build/pom.xml index 43ae570..e5f5ed8 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -8,7 +8,7 @@ Center for Open Middleware http://www.centeropenmiddleware.com/ #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# - Copyright (C) 2015 Center for Open Middleware. + Copyright (C) 2015-2016 Center for Open Middleware. #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -66,7 +66,7 @@ Smart Developer Hub http://www.smartdeveloperhub.org/ ${project.organization.name} - 2015 + ${project.inceptionYear}-2016 ${project.inceptionYear} ${project.organization.name} ${project.organization.url} diff --git a/config/pom.xml b/config/pom.xml index a53f906..89663a5 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -8,7 +8,7 @@ Center for Open Middleware http://www.centeropenmiddleware.com/ #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# - Copyright (C) 2015 Center for Open Middleware. + Copyright (C) 2015-2016 Center for Open Middleware. #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -59,7 +59,7 @@ Smart Developer Hub http://www.smartdeveloperhub.org ${project.organization.name} - 2015 + ${project.inceptionYear}-2016 ${project.inceptionYear} ${project.organization.name} ${project.organization.url} diff --git a/config/src/main/resources/ci/settings.xml b/config/src/main/resources/ci/settings.xml index 9553a3e..ff25f24 100644 --- a/config/src/main/resources/ci/settings.xml +++ b/config/src/main/resources/ci/settings.xml @@ -7,7 +7,7 @@ Center for Open Middleware http://www.centeropenmiddleware.com/ #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# - Copyright (C) 2015 Center for Open Middleware. + Copyright (C) 2015-2016 Center for Open Middleware. #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/config/src/main/resources/legal/asf2/header.txt.ftl b/config/src/main/resources/legal/asf2/header.txt.ftl index dad7fd4..4589a0f 100644 --- a/config/src/main/resources/legal/asf2/header.txt.ftl +++ b/config/src/main/resources/legal/asf2/header.txt.ftl @@ -7,7 +7,7 @@ Center for Open Middleware http://www.centeropenmiddleware.com/ #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# - Copyright (C) 2015 Center for Open Middleware. + Copyright (C) 2015-2016 Center for Open Middleware. #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,8 +21,8 @@ See the License for the specific language governing permissions and limitations under the License. #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# - Artifact : org.smartdeveloperhub:sdh-config:1.0.0-SNAPSHOT - Bundle : sdh-config-1.0.0-SNAPSHOT.jar + Artifact : org.smartdeveloperhub:sdh-config:0.3.0-SNAPSHOT + Bundle : sdh-config-0.3.0-SNAPSHOT.jar #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# --> @@ -34,7 +34,7 @@ You may obtain a copy of the License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing per- missions and limitations under the License. #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# diff --git a/config/src/main/resources/legal/asf2/license.txt b/config/src/main/resources/legal/asf2/license.txt index b3d99ab..f00ddb1 100644 --- a/config/src/main/resources/legal/asf2/license.txt +++ b/config/src/main/resources/legal/asf2/license.txt @@ -6,7 +6,7 @@ Center for Open Middleware http://www.centeropenmiddleware.com/ #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# - Copyright (C) 2015 Center for Open Middleware. + Copyright (C) 2015-2016 Center for Open Middleware. #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,8 +20,8 @@ See the License for the specific language governing permissions and limitations under the License. #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# - Artifact : org.smartdeveloperhub:sdh-config:1.0.0-SNAPSHOT - Bundle : sdh-config-1.0.0-SNAPSHOT.jar + Artifact : org.smartdeveloperhub:sdh-config:0.3.0-SNAPSHOT + Bundle : sdh-config-0.3.0-SNAPSHOT.jar #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# ==== diff --git a/config/src/main/resources/legal/cmd_header.xml b/config/src/main/resources/legal/cmd_header.xml index 23f4e83..3185107 100644 --- a/config/src/main/resources/legal/cmd_header.xml +++ b/config/src/main/resources/legal/cmd_header.xml @@ -8,7 +8,7 @@ Center for Open Middleware http://www.centeropenmiddleware.com/ #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# - Copyright (C) 2015 Center for Open Middleware. + Copyright (C) 2015-2016 Center for Open Middleware. #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,8 +22,8 @@ See the License for the specific language governing permissions and limitations under the License. #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# - Artifact : org.smartdeveloperhub:sdh-config:1.0.0-SNAPSHOT - Bundle : sdh-config-1.0.0-SNAPSHOT.jar + Artifact : org.smartdeveloperhub:sdh-config:0.3.0-SNAPSHOT + Bundle : sdh-config-0.3.0-SNAPSHOT.jar #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# --> diff --git a/config/src/main/resources/legal/description.ftl b/config/src/main/resources/legal/description.ftl index 5791193..30be270 100644 --- a/config/src/main/resources/legal/description.ftl +++ b/config/src/main/resources/legal/description.ftl @@ -7,7 +7,7 @@ Center for Open Middleware http://www.centeropenmiddleware.com/ #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# - Copyright (C) 2015 Center for Open Middleware. + Copyright (C) 2015-2016 Center for Open Middleware. #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,8 +21,8 @@ See the License for the specific language governing permissions and limitations under the License. #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# - Artifact : org.smartdeveloperhub:sdh-config:1.0.0-SNAPSHOT - Bundle : sdh-config-1.0.0-SNAPSHOT.jar + Artifact : org.smartdeveloperhub:sdh-config:0.3.0-SNAPSHOT + Bundle : sdh-config-0.3.0-SNAPSHOT.jar #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# --> diff --git a/config/src/main/resources/legal/licenses.properties b/config/src/main/resources/legal/licenses.properties index c934139..d7afa25 100644 --- a/config/src/main/resources/legal/licenses.properties +++ b/config/src/main/resources/legal/licenses.properties @@ -6,7 +6,7 @@ # Center for Open Middleware # http://www.centeropenmiddleware.com/ # #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# -# Copyright (C) 2015 Center for Open Middleware. +# Copyright (C) 2015-2016 Center for Open Middleware. # #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,8 +20,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# -# Artifact : org.smartdeveloperhub:sdh-config:1.0.0-SNAPSHOT -# Bundle : sdh-config-1.0.0-SNAPSHOT.jar +# Artifact : org.smartdeveloperhub:sdh-config:0.3.0-SNAPSHOT +# Bundle : sdh-config-0.3.0-SNAPSHOT.jar # #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# # diff --git a/config/src/main/resources/quality/checkstyle.xml b/config/src/main/resources/quality/checkstyle.xml index 0ff983f..9e45c44 100644 --- a/config/src/main/resources/quality/checkstyle.xml +++ b/config/src/main/resources/quality/checkstyle.xml @@ -8,7 +8,7 @@ Center for Open Middleware http://www.centeropenmiddleware.com/ #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# - Copyright (C) 2015 Center for Open Middleware. + Copyright (C) 2015-2016 Center for Open Middleware. #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/config/src/main/resources/quality/pmd.xml b/config/src/main/resources/quality/pmd.xml index ec0f056..dc82f66 100644 --- a/config/src/main/resources/quality/pmd.xml +++ b/config/src/main/resources/quality/pmd.xml @@ -8,7 +8,7 @@ Center for Open Middleware http://www.centeropenmiddleware.com/ #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# - Copyright (C) 2015 Center for Open Middleware. + Copyright (C) 2015-2016 Center for Open Middleware. #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pom.xml b/pom.xml index 14b4dc6..f046638 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ Center for Open Middleware http://www.centeropenmiddleware.com/ #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# - Copyright (C) 2015 Center for Open Middleware. + Copyright (C) 2015-2016 Center for Open Middleware. #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,8 +22,8 @@ See the License for the specific language governing permissions and limitations under the License. #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# - Artifact : org.sdh:sdh-parent:1.0.0-SNAPSHOT - Bundle : sdh-parent-1.0.0-SNAPSHOT.pom + Artifact : org.sdh:sdh-parent:0.3.0-SNAPSHOT + Bundle : sdh-parent-0.3.0-SNAPSHOT.pom #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# --> From dd56c4cdb7b0f7ce74a3a68df6785289fecd9fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Esteban=20Guti=C3=A9rrez?= Date: Fri, 22 Jan 2016 07:58:03 +0100 Subject: [PATCH 04/19] Improved Travis CI Build configuration - Refactored build scripts to leverage Travis CI build phases. Core building logic will remain in the ".travis/build.sh" script. The Q.A. logic is moved to the ".travis/qa.sh" script which is run during the "after_success" phase. Maven Repository backup and restoration logic used to avoid caching built artifacts whilst enabling its reuse across build phases is moved to the ".travis/utils.sh" script. Decryption of the keys required for signing the Maven artifacts produced during the build, as well as the unshallowing of the Git repository moved to the ".travis/utils.sh" script. --- .travis.yml | 52 +++++++++++++++--------------------- .travis/build.sh | 35 +++++++++++++++++++++++++ .travis/qa.sh | 42 ++++++++++++++++++++++++++++++ .travis/utils.sh | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 166 insertions(+), 31 deletions(-) create mode 100644 .travis/build.sh create mode 100644 .travis/qa.sh create mode 100644 .travis/utils.sh diff --git a/.travis.yml b/.travis.yml index 0532a8b..0516aef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,42 +1,32 @@ sudo: false +language: java +jdk: +- oraclejdk7 + +notifications: + slack: sdhub:ti8lMh7ERZIqLzWF4dHkcgwt + cache: directories: - $HOME/.m2/repository - $HOME/.sonar -notifications: - slack: sdhub:ti8lMh7ERZIqLzWF4dHkcgwt -language: java -jdk: -- oraclejdk7 + +before_cache: + - source ./.travis/utils.sh backup-maven-repo + before_install: -- openssl aes-256-cbc -pass pass:$ENCRYPTION_PASSWORD -in config/src/main/resources/ci/secring.gpg.enc - -out local.secring.gpg -d -- openssl aes-256-cbc -pass pass:$ENCRYPTION_PASSWORD -in config/src/main/resources/ci/pubring.gpg.enc - -out local.pubring.gpg -d -- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi + - source ./.travis/utils.sh prepare-build-bom $ENCRYPTION_PASSWORD + install: -- /bin/true + - "/bin/true" + script: -- if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; - then - if [ "${TRAVIS_BRANCH}" = "master" ] || [ "${TRAVIS_BRANCH}" = "develop" ]; - then mvn clean deploy -B -Dcodebase.directory=`pwd` -Dcoverage.reports.dir=`pwd`/target/all --settings config/src/main/resources/ci/settings.xml; - else mvn clean install -B -Dcoverage.reports.dir=`pwd`/target/all --settings config/src/main/resources/ci/settings.xml; - fi - else - echo mvn clean install -B -Dcoverage.reports.dir=`pwd`/target/all --settings config/src/main/resources/ci/settings.xml; - fi -#- if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; -# then -# case "${TRAVIS_BRANCH}" in -# master) mvn sonar:sonar -B -Dsonar.branch=$TRAVIS_BRANCH -Dcoverage.reports.dir=`pwd`/target/all --settings config/src/main/resources/ci/settings.xml;; -# develop) mvn sonar:sonar -B -Dsonar.branch=$TRAVIS_BRANCH -Dcoverage.reports.dir=`pwd`/target/all --settings config/src/main/resources/ci/settings.xml;; -# feature*) mvn sonar:sonar -B -Dsonar.branch=$TRAVIS_BRANCH -Dcoverage.reports.dir=`pwd`/target/all --settings config/src/main/resources/ci/settings.xml;; -# *) echo "Skip SonarQube analysis (${TRAVIS_BRANCH})";; -# esac -# fi -- mkdir /tmp/cache-trick -- mv $HOME/.m2/repository/org/smartdeveloperhub /tmp/cache-trick/ + - source ./.travis/build.sh + +after_success: + - source ./.travis/utils.sh restore-maven-repo + - source ./.travis/qa.sh + env: global: - secure: JslDK1Own9RevKDwXNvXBpp/Fza4+9rATZLKIFiS8WjnugZaA8dMrn87AmbH5Yg+Aq3AV5aAYQKo4MoEHJEVU6wgp5p7INaVGPpC5p8CgjTFYJu0TC0oIXzVvEQy49uTDV8iM0icQcOn6MpFEQq6qlL9JW9Lt9Eu+Am5UKfKWPWQhe63Qf2LoLRfKWZ4IoekWGlMFF+qsRxmXkNdbniIkmzu0PVj9vTg7I7igupDPC3W9r9+YgVu0PoatBgx8Jhe8iSlnW6tLrb/GKI77wQolRylm77pD3F2DFeNag8SWCYoy6tgIPUpTCZ6sjGb/Ydbus5MRBjvnRIZ6Zu4HzbvixApK5E6pjFDAoE2xuAbBuVe2aSJ2d2bMbmpI444Y56Cdzf5a0D2zz7TdTXWyv96qXQB/GHX8Ccp67nziiaoSTGRVkdVratJHTclxUFVjNSrgtVmCjrzTz1XP0Q4gB2M7G7p0eczU2riCEPembAGC4NRhCDYJ9FsvE0WDtb5JBLZhGu82WFyrMs51FoMNv0Mu6pg8TVjvrj+q418jY2uDTlLh8xYuRmNkNscwE5L+WQLVJ63D3fTgMOwuUeaGnq38oQWTB/sokG2ISimNufSfttkjyBNFBPr/ismMyJVlB4t6kqAZRy4idwblT2SjyVhSphp8QipmxwopJjX0qDr0tI= diff --git a/.travis/build.sh b/.travis/build.sh new file mode 100644 index 0000000..db4a726 --- /dev/null +++ b/.travis/build.sh @@ -0,0 +1,35 @@ +#!/bin/bash +set -e + +function deploy() { + if [ "$1" != "porcelain" ]; + then + echo "Executing Maven deploy (${TRAVIS_BRANCH})..." + mvn clean deploy -B -Dcodebase.directory=$(pwd) -Dcoverage.reports.dir=$(pwd)/target/all --settings config/src/main/resources/ci/settings.xml + else + echo "Skipped Maven deploy (${TRAVIS_BRANCH}): Porcelain" + fi +} + +function install() { + if [ "$1" != "porcelain" ]; + then + echo "Executing Maven install (${TRAVIS_BRANCH})..." + mvn clean install -B -Dcoverage.reports.dir=$(pwd)/target/all --settings config/src/main/resources/ci/settings.xml + else + echo "Skipped Maven install (${TRAVIS_BRANCH}): Porcelain" + fi +} + +mode=$1 + +if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; +then + case "${TRAVIS_BRANCH}" in + master | develop ) deploy "$mode";; + feature\/* ) install "$mode";; + * ) install "$mode";; + esac +else + install "$mode" +fi diff --git a/.travis/qa.sh b/.travis/qa.sh new file mode 100644 index 0000000..4e9c9f6 --- /dev/null +++ b/.travis/qa.sh @@ -0,0 +1,42 @@ +#!/bin/bash +set -e + +function analyzeBranch() { + if [ "$2" != "porcelain" ]; + then + echo "Checking SonarQube Server..." + curl --head "$1" > /dev/null 2>&1 + if [ "$?" = "0" ]; + then + echo "Executing SonarQube analysis (${TRAVIS_BRANCH})..." + # If SSL network failures happen, execute the analysis with -Djavax.net.debug=all + mvn sonar:sonar -B -Dsonar.branch=$TRAVIS_BRANCH -Dcoverage.reports.dir=$(pwd)/target/all --settings config/src/main/resources/ci/settings.xml + else + echo "Skipped SonarQube analysis (${TRAVIS_BRANCH}): Cannot connect to SonarQube Server ($1)" + fi + else + echo "Skipped SonarQube analysis (${TRAVIS_BRANCH}): Porcelain" + fi +} + +function skipBranchAnalysis() { + echo "Skipped SonarQube analysis (${TRAVIS_BRANCH}): Non Q.A. branch" +} + +function skipPullRequestAnalysis() { + echo "Skipped SonarQube analysis (${TRAVIS_BRANCH}): Pull request" +} + +mode=$1 +server=http://www.smartdeveloperhub.org/sonar/ + +if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; +then + case "${TRAVIS_BRANCH}" in + master | develop ) analyzeBranch "$server" "$mode";; + feature\/* ) analyzeBranch "$server" "$mode";; + * ) skipBranchAnalysis ;; + esac +else + skipPullRequestAnalysis +fi diff --git a/.travis/utils.sh b/.travis/utils.sh new file mode 100644 index 0000000..62dd5c6 --- /dev/null +++ b/.travis/utils.sh @@ -0,0 +1,68 @@ +#!/bin/bash +set -e + +function backupMavenRepo() { + if [ "$1" != "porcelain" ]; + then + mkdir /tmp/cache-trick + mv "$HOME/.m2/repository/org/smartdeveloperhub" /tmp/cache-trick/ + else + echo "Skipped Maven Repo backup" + fi +} + +function restoreMavenRepo() { + if [ "$1" != "porcelain" ]; + then + mv /tmp/cache-trick/smartdeveloperhub "$HOME/.m2/repository/org/" + else + echo "Skipped Maven Repo restoration" + fi +} + +function fail() { + echo "ERROR: Unknown command '${1}'." + exit 1 +} + +function prepareBuild() { + if [ "$#" != "2" ]; + then + echo "ERROR: No encryption password specified." + exit 2 + fi + + if [ "$1" != "porcelain" ]; + then + echo "Preparing Build's bill-of-materials..." + echo "- Decrypting private key..." + openssl aes-256-cbc -pass pass:"$2" -in config/src/main/resources/ci/secring.gpg.enc -out local.secring.gpg -d + echo "- Decrypting public key..." + openssl aes-256-cbc -pass pass:"$2" -in config/src/main/resources/ci/pubring.gpg.enc -out local.pubring.gpg -d + if [[ -a .git/shallow ]]; + then + echo "- Unshallowing Git repository..." + git fetch --unshallow + fi + else + echo "Skipped preparation of the Build's bill-of-materials" + fi +} + +mode=$1 +shift +if [ "$mode" = "porcelain" ]; +then + action=$1 + shift +else + action=$mode + mode=execute +fi + +case "$action" in + backup-maven-repo ) backupMavenRepo "$mode" "$@";; + restore-maven-repo) restoreMavenRepo "$mode" "$@";; + prepare-build-bom ) prepareBuild "$mode" "$@";; + * ) fail "$action";; +esac From a7c442998f6c8017c2fb3b897520c4c4ddb59bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Esteban=20Guti=C3=A9rrez?= Date: Fri, 22 Jan 2016 08:15:11 +0100 Subject: [PATCH 05/19] Upgraded Maven plugin versions - Build Helper Maven Plugin v1.10 - Findbugs Maven Plugin v3.0.3 - JaCoCo Maven Plugin v0.7.5.201505241946 - CodeHaus GMaven Plugin v2.0 - Maven Assembly Plugin v2.6 - Maven Checkstyle Plugin v2.17 - Maven Clean Plugin v3.0.0 - Maven Compiler Plugin v3.5 - Maven FailSafe Plugin v2.19.1 - Maven PMD Plugin v3.6 - Maven Project Info Reports Plugin v2.8.1 - Maven Release Plugin v2.5.3 - Maven SureFire Plugin v2.19.1 - Nexus Stating Maven Plugin v1.6.6 - Sonar Maven Plugin 2.7.1 (v3.0.1 blocks build) --- pom.xml | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index f046638..b20d38a 100644 --- a/pom.xml +++ b/pom.xml @@ -104,37 +104,37 @@ 1.14 - 1.9.1 - 3.0.1 - 0.7.4.201502262128 + 1.10 + 3.0.3 + 0.7.5.201505241946 1.0 - 1.5 + 2.0 2.11 1.8 - 2.5.5 - 2.16 - 2.6.1 - 3.3 + 2.6 + 2.17 + 3.0.0 + 3.5 2.10 2.8.2 1.4.1 - 2.18.1 + 2.19.1 1.6 2.5.2 2.6 2.10.3 1.2.10 2.5 - 3.5 - 2.8 - 2.5.2 + 3.6 + 2.8.1 + 2.5.3 2.7 1.9.4 2.4 - 2.18.1 + 2.19.1 2.6 - 1.6.3 - 2.6 + 1.6.6 + 2.7.1 2.4 1.2 1.0-m5.1 @@ -287,7 +287,8 @@ ${maven.assembly.plugin.version} - + org.codehaus.mojo sonar-maven-plugin From 8087766c5401bd3d16a594c03b070a5cde2e7f74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Esteban=20Guti=C3=A9rrez?= Date: Fri, 22 Jan 2016 08:42:13 +0100 Subject: [PATCH 06/19] Migration to Groovy Maven Plugin - Dropped dependency for old CodeHaus GMaven Plugins - Added dependency to new Groovy Maven Plugin v2.0.0 --- build/pom.xml | 4 ++-- pom.xml | 13 +++---------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/build/pom.xml b/build/pom.xml index e5f5ed8..5fcc49b 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -485,8 +485,8 @@ - org.codehaus.groovy.maven - gmaven-plugin + org.codehaus.gmaven + groovy-maven-plugin buildNumber diff --git a/pom.xml b/pom.xml index b20d38a..c2c406f 100644 --- a/pom.xml +++ b/pom.xml @@ -107,8 +107,7 @@ 1.10 3.0.3 0.7.5.201505241946 - 1.0 - 2.0 + 2.0 2.11 1.8 2.6 @@ -245,16 +244,10 @@ ${maven.jgit.buildnumber.plugin.version} - - org.codehaus.groovy.maven - gmaven-plugin - ${gmaven.plugin.version} - - org.codehaus.gmaven - gmaven-plugin - ${org.codehaus.gmaven.gmaven.plugin.version} + groovy-maven-plugin + ${groovy.maven.plugin.version} From 0b096ecd16d6d61e4d1cd535f6df4bf893cc76d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Esteban=20Guti=C3=A9rrez?= Date: Wed, 17 Feb 2016 15:07:37 +0100 Subject: [PATCH 07/19] Updated plugin exclusions for the Licfecycle Mapping M2E plugin --- pom.xml | 105 ++++++++++++-------------------------------------------- 1 file changed, 22 insertions(+), 83 deletions(-) diff --git a/pom.xml b/pom.xml index c2c406f..67769a5 100644 --- a/pom.xml +++ b/pom.xml @@ -360,15 +360,9 @@ - - org.apache.maven.plugins - - - maven-dependency-plugin - - - [2.5.1,) - + org.apache.maven.plugins + maven-dependency-plugin + [2.5.1,) unpack @@ -379,20 +373,12 @@ - - org.codehaus.mojo - - - build-helper-maven-plugin - + org.codehaus.mojo + build-helper-maven-plugin [1.7,) - - timestamp-property - - - reserve-network-port - + timestamp-property + reserve-network-port @@ -401,19 +387,11 @@ - - org.jacoco - - - jacoco-maven-plugin - - - [0.6.4.201312101107,) - + org.jacoco + jacoco-maven-plugin + [0.6.4.201312101107,) - - prepare-agent-integration - + prepare-agent-integration @@ -435,17 +413,11 @@ - - org.codehaus.groovy.maven - - - gmaven-plugin - - - [1.0,) - + ru.concerteza.buildnumber + maven-jgit-buildnumber-plugin + [1.2.8,) - execute + extract-buildnumber @@ -454,19 +426,11 @@ - - ru.concerteza.buildnumber - - - maven-jgit-buildnumber-plugin - - - [1.2.8,) - + org.apache.maven.plugins + maven-clean-plugin + [2.6.1,) - - extract-buildnumber - + clean @@ -475,15 +439,9 @@ - - org.codehaus.gmaven - - - gmaven-plugin - - - [1.5,) - + org.codehaus.gmaven + groovy-maven-plugin + [2.0,) execute @@ -492,25 +450,6 @@ - - - - org.apache.maven.plugins - - - maven-clean-plugin - - - [2.6.1,) - - - clean - - - - - - From 6a39dc131dd68f8a642f9bbaa04893b82fb41d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Esteban=20Guti=C3=A9rrez?= Date: Mon, 14 Mar 2016 11:13:26 +0100 Subject: [PATCH 08/19] Enabled tuning build process in Travis CI - Updated build scripts in '.travis/' to leverage the CI environment variable for tuning the execution. Thus, if the variable equals to 'skip' the execution of the scripts' functionalities will be totally skipped. However, if the value is 'porcelain' all the checks prior to their execution will be carried out, but no the functionalities themselves. In addition, the qa.sh script checks if the value is 'noqa' in which case, the SonarQube analysis is skipped. --- .travis/build.sh | 10 ++++++++++ .travis/qa.sh | 18 +++++++++++++++++- .travis/utils.sh | 17 ++++++++++++++--- 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/.travis/build.sh b/.travis/build.sh index db4a726..67d4d2f 100644 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -21,7 +21,17 @@ function install() { fi } +if [ "${CI}" = "skip" ]; +then + echo "Skipping build..." + exit $? +fi + mode=$1 +if [ "$mode" != "porcelain" ]; +then + mode=${CI} +fi if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then diff --git a/.travis/qa.sh b/.travis/qa.sh index 4e9c9f6..be4eeca 100644 --- a/.travis/qa.sh +++ b/.travis/qa.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e function analyzeBranch() { if [ "$2" != "porcelain" ]; @@ -27,7 +26,24 @@ function skipPullRequestAnalysis() { echo "Skipped SonarQube analysis (${TRAVIS_BRANCH}): Pull request" } +if [ "${CI}" = "skip" ]; +then + echo "Skipping build..." + exit $? +fi + +if [ "${CI}" = "noqa" ]; +then + echo "Skipping SonarQube analysis..." + exit $? +fi + mode=$1 +if [ "$mode" != "porcelain" ]; +then + mode=${CI} +fi + server=http://www.smartdeveloperhub.org/sonar/ if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; diff --git a/.travis/utils.sh b/.travis/utils.sh index 62dd5c6..575f1a2 100644 --- a/.travis/utils.sh +++ b/.travis/utils.sh @@ -49,15 +49,26 @@ function prepareBuild() { fi } +if [ "${CI}" = "skip" ]; +then + echo "Skipping build..." + exit $? +fi + mode=$1 +if [ "$mode" != "porcelain" ]; +then + mode=${CI} +fi + +check=$1 shift -if [ "$mode" = "porcelain" ]; +if [ "$check" = "porcelain" ]; then action=$1 shift else - action=$mode - mode=execute + action=$check fi case "$action" in From b584c0dd21f03c1f3ea27373f55c238cff497055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Esteban=20Guti=C3=A9rrez?= Date: Mon, 14 Mar 2016 15:41:37 +0100 Subject: [PATCH 09/19] Enabled tuning build process in Travis CI, continued - Rewritten build tuning mechanism to avoid using the 'exit' built-in command as it may interfere with the CI internals (see https://docs.travis-ci.com/user/customizing-the-build/ #How-does-this-work%3F-(Or%2C-why-you-should-not-use-exit-in-build- steps)) --- .travis/build.sh | 41 +++++++++++++++++++------------------ .travis/qa.sh | 45 ++++++++++++++++++++-------------------- .travis/utils.sh | 53 ++++++++++++++++++++++++++---------------------- 3 files changed, 72 insertions(+), 67 deletions(-) diff --git a/.travis/build.sh b/.travis/build.sh index 67d4d2f..365ccfc 100644 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -21,25 +21,26 @@ function install() { fi } -if [ "${CI}" = "skip" ]; -then - echo "Skipping build..." - exit $? -fi +function runBuild() { + mode=$1 + if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; + then + case "${TRAVIS_BRANCH}" in + master | develop ) deploy "$mode";; + feature\/* ) install "$mode";; + * ) install "$mode";; + esac + else + install "$mode" + fi +} -mode=$1 -if [ "$mode" != "porcelain" ]; -then - mode=${CI} -fi +function skipBuild() { + echo "Skipping build..." +} -if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; -then - case "${TRAVIS_BRANCH}" in - master | develop ) deploy "$mode";; - feature\/* ) install "$mode";; - * ) install "$mode";; - esac -else - install "$mode" -fi +case "${CI}" in + skip ) skipBuild ;; + porcelain ) runBuild porcelain ;; + * ) runBuild "$1" ;; +esac diff --git a/.travis/qa.sh b/.travis/qa.sh index be4eeca..3b47ae4 100644 --- a/.travis/qa.sh +++ b/.travis/qa.sh @@ -26,33 +26,32 @@ function skipPullRequestAnalysis() { echo "Skipped SonarQube analysis (${TRAVIS_BRANCH}): Pull request" } -if [ "${CI}" = "skip" ]; -then +function skipBuild() { echo "Skipping build..." - exit $? -fi +} -if [ "${CI}" = "noqa" ]; -then +function skipSonarQubeAnalysis() { echo "Skipping SonarQube analysis..." - exit $? -fi +} -mode=$1 -if [ "$mode" != "porcelain" ]; -then - mode=${CI} -fi +function runSonarQubeAnalysis() { + if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; + then + case "${TRAVIS_BRANCH}" in + master | develop ) analyzeBranch "$1" "$2";; + feature\/* ) analyzeBranch "$2" "$2";; + * ) skipBranchAnalysis ;; + esac + else + skipPullRequestAnalysis + fi +} server=http://www.smartdeveloperhub.org/sonar/ -if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; -then - case "${TRAVIS_BRANCH}" in - master | develop ) analyzeBranch "$server" "$mode";; - feature\/* ) analyzeBranch "$server" "$mode";; - * ) skipBranchAnalysis ;; - esac -else - skipPullRequestAnalysis -fi +case "${CI}" in + skip ) skipBuild ;; + noqa ) skipSonarQubeAnalysis ;; + porcelain ) runSonarQubeAnalysis "$server" porcelain ;; + * ) runSonarQubeAnalysis "$server" "$1" ;; +esac diff --git a/.travis/utils.sh b/.travis/utils.sh index 575f1a2..cb6a987 100644 --- a/.travis/utils.sh +++ b/.travis/utils.sh @@ -49,31 +49,36 @@ function prepareBuild() { fi } -if [ "${CI}" = "skip" ]; -then - echo "Skipping build..." - exit $? -fi - -mode=$1 -if [ "$mode" != "porcelain" ]; -then - mode=${CI} -fi +function runUtility() { + mode=$1 + if [ "$mode" != "porcelain" ]; + then + mode=${CI} + fi -check=$1 -shift -if [ "$check" = "porcelain" ]; -then - action=$1 + check=$1 shift -else - action=$check -fi + if [ "$check" = "porcelain" ]; + then + action=$1 + shift + else + action=$check + fi + + case "$action" in + backup-maven-repo ) backupMavenRepo "$mode" "$@";; + restore-maven-repo) restoreMavenRepo "$mode" "$@";; + prepare-build-bom ) prepareBuild "$mode" "$@";; + * ) fail "$action";; + esac +} + +function skipBuild() { + echo "Skipping build..." +} -case "$action" in - backup-maven-repo ) backupMavenRepo "$mode" "$@";; - restore-maven-repo) restoreMavenRepo "$mode" "$@";; - prepare-build-bom ) prepareBuild "$mode" "$@";; - * ) fail "$action";; +case "${CI}" in + skip ) skipBuild ;; + * ) runUtility "$@" ;; esac From c33eada7300ac5a1f11ac21f58211637908ef7f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Esteban=20Guti=C3=A9rrez?= Date: Mon, 14 Mar 2016 18:37:08 +0100 Subject: [PATCH 10/19] Improved QA script of the Travis CI build configuration - Enhanced the way in which the script checks whether or not the SonarQube server is available. Apart from enforcing the success of the curl command (i.e., a response is received), check that the response is an OK. - Additional information is provided in case of failure. --- .travis/qa.sh | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/.travis/qa.sh b/.travis/qa.sh index 3b47ae4..20ac443 100644 --- a/.travis/qa.sh +++ b/.travis/qa.sh @@ -1,23 +1,41 @@ #!/bin/bash +function checkSonarQubeServer() { + error=1 + echo "Checking SonarQube Server..." + curl --head --silent --verbose --connect-timeout 5 "$1" > data.txt 2> log.txt + if [ "$?" = "0" ]; + then + status=$(head -n 1 data.txt | awk '{print $2}') + if [ "$status" = "200" ]; + then + error=0 + else + echo "Skipped SonarQube analysis (${TRAVIS_BRANCH}). SonarQube Server is not available ($status)" + fi + else + echo "Skipped SonarQube analysis (${TRAVIS_BRANCH}). Could not connect to SonarQube Server: " + cat log.txt + fi + rm data.txt + rm log.txt + return $error +} + function analyzeBranch() { - if [ "$2" != "porcelain" ]; + checkSonarQubeServer "$1" + if [ "$1" = "0" ]; then - echo "Checking SonarQube Server..." - curl --head "$1" > /dev/null 2>&1 - if [ "$?" = "0" ]; + if [ "$2" != "porcelain" ]; then echo "Executing SonarQube analysis (${TRAVIS_BRANCH})..." # If SSL network failures happen, execute the analysis with -Djavax.net.debug=all - mvn sonar:sonar -B -Dsonar.branch=$TRAVIS_BRANCH -Dcoverage.reports.dir=$(pwd)/target/all --settings config/src/main/resources/ci/settings.xml + mvn sonar:sonar -B -Dsonar.branch="$TRAVIS_BRANCH" -Dcoverage.reports.dir="$(pwd)/target/all" --settings config/src/main/resources/ci/settings.xml else - echo "Skipped SonarQube analysis (${TRAVIS_BRANCH}): Cannot connect to SonarQube Server ($1)" + echo "Skipped SonarQube analysis (${TRAVIS_BRANCH}): Porcelain" fi - else - echo "Skipped SonarQube analysis (${TRAVIS_BRANCH}): Porcelain" fi } - function skipBranchAnalysis() { echo "Skipped SonarQube analysis (${TRAVIS_BRANCH}): Non Q.A. branch" } @@ -39,7 +57,7 @@ function runSonarQubeAnalysis() { then case "${TRAVIS_BRANCH}" in master | develop ) analyzeBranch "$1" "$2";; - feature\/* ) analyzeBranch "$2" "$2";; + feature\/* ) analyzeBranch "$1" "$2";; * ) skipBranchAnalysis ;; esac else From 75442be13b4cb96ecbffe90269d25a8ed62dc92a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Esteban=20Guti=C3=A9rrez?= Date: Mon, 14 Mar 2016 23:24:37 +0100 Subject: [PATCH 11/19] Improved QA script of the Travis CI build configuration, continued - Fixed failure when checking the result from the server connectivity checking. - Enabled using which application to use for carrying out the checks (curl/wget) leveraging the CHECKER environment variable. By default, wget will be used. - Enabled showing additional log messages w.r.t. the checking process leveraging the DEBUG environment variable when its value is 'verbose'. --- .travis/qa.sh | 70 +++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 62 insertions(+), 8 deletions(-) diff --git a/.travis/qa.sh b/.travis/qa.sh index 20ac443..38aef92 100644 --- a/.travis/qa.sh +++ b/.travis/qa.sh @@ -1,30 +1,84 @@ #!/bin/bash +function logCheckResults() { + if [ "${DEBUG}" = "verbose" ]; + then + echo "Trace:" + cat log.txt + echo "Response:" + cat data.txt + fi +} + +function checkWithCurl() { + if [ "${DEBUG}" = "verbose" ]; + then + curl --version + fi + curl --head --silent --verbose --connect-timeout 5 "$1" > data.txt 2> log.txt + error=$? + logCheckResults + return "$error" +} + +function checkWithWget() { + if [ "${DEBUG}" = "verbose" ]; + then + wget --version + fi + # Write response (and headers) to 'data.txt', (verbose) activity to 'log.txt' + # including additional debug entries (e.g., requests and responses), with a + # generic timeout of 5s, and retry only once. + # In addition, discard the additional output (both standard and error) + wget --output-document=data.txt --output-file=log.txt --verbose --debug --timeout=5 --tries 1 --save-headers "$1" > error.log 2>&1 + error=$? + if [ "$error" != "0" ]; + then + # If a failure happens, but the server sent a response... + if [ "$(grep -c "response begin" log.txt)" -gt 0 ] + then + # ... we extract the response from the log... + from=$(awk '/response begin/{ print NR; exit }' log.txt) + to=$(awk '/response end/{ print NR; exit }' log.txt) + head -n $((to - 1)) log.txt | tail -n $((to - from - 1)) > data.txt + # ... and clear the failure status. + error=0 + fi + fi + logCheckResults + return "$error" +} + function checkSonarQubeServer() { - error=1 echo "Checking SonarQube Server..." - curl --head --silent --verbose --connect-timeout 5 "$1" > data.txt 2> log.txt - if [ "$?" = "0" ]; + + case "${CHECKER}" in + curl ) checkWithCurl "$1";; + * ) checkWithWget "$1";; + esac + + error=$? + if [ "$error" = "0" ]; then status=$(head -n 1 data.txt | awk '{print $2}') - if [ "$status" = "200" ]; + if [ "$status" != "200" ]; then - error=0 - else echo "Skipped SonarQube analysis (${TRAVIS_BRANCH}). SonarQube Server is not available ($status)" + error=1 fi else echo "Skipped SonarQube analysis (${TRAVIS_BRANCH}). Could not connect to SonarQube Server: " cat log.txt + error=2 fi rm data.txt rm log.txt - return $error + return "$error" } function analyzeBranch() { checkSonarQubeServer "$1" - if [ "$1" = "0" ]; + if [ "$?" = "0" ]; then if [ "$2" != "porcelain" ]; then From ef017b270ab531f2c090fad5bc445b9e0689336f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Esteban=20Guti=C3=A9rrez?= Date: Mon, 14 Mar 2016 23:36:57 +0100 Subject: [PATCH 12/19] Improved QA script of the Travis CI build configuration, continued - Add additional log message when the SonarQube check fails so that the last command executed in the function does not fail, and thus causes the whole script end with a failure, breaking the build as a result. --- .travis/qa.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis/qa.sh b/.travis/qa.sh index 38aef92..296f691 100644 --- a/.travis/qa.sh +++ b/.travis/qa.sh @@ -63,11 +63,11 @@ function checkSonarQubeServer() { status=$(head -n 1 data.txt | awk '{print $2}') if [ "$status" != "200" ]; then - echo "Skipped SonarQube analysis (${TRAVIS_BRANCH}). SonarQube Server is not available ($status)" + echo "SonarQube Server is not available (response status code: $status)" error=1 fi else - echo "Skipped SonarQube analysis (${TRAVIS_BRANCH}). Could not connect to SonarQube Server: " + echo "Could not connect to SonarQube Server: " cat log.txt error=2 fi @@ -88,6 +88,8 @@ function analyzeBranch() { else echo "Skipped SonarQube analysis (${TRAVIS_BRANCH}): Porcelain" fi + else + echo "Skipped SonarQube analysis (${TRAVIS_BRANCH})" fi } function skipBranchAnalysis() { From 4aabefaa518e55d1e0e052e928d9ce38cbf40294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Esteban=20Guti=C3=A9rrez?= Date: Mon, 14 Mar 2016 23:46:44 +0100 Subject: [PATCH 13/19] Improved QA script of the Travis CI build configuration, continued - Forced clean termination (always return 0) to prevent accidental failures (i.e., unexpected error codes leaked) like the one in build #42 (see https://travis-ci.org/SmartDeveloperHub/sdh-maven/builds/115993691) --- .travis/qa.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis/qa.sh b/.travis/qa.sh index 296f691..a303f2f 100644 --- a/.travis/qa.sh +++ b/.travis/qa.sh @@ -129,3 +129,5 @@ case "${CI}" in porcelain ) runSonarQubeAnalysis "$server" porcelain ;; * ) runSonarQubeAnalysis "$server" "$1" ;; esac + +return 0 From 73f6f069701e8085340ef275d5d6ba51a5ce986b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Esteban=20Guti=C3=A9rrez?= Date: Tue, 15 Mar 2016 00:18:40 +0100 Subject: [PATCH 14/19] Improved QA script of the Travis CI build configuration, continued - Enabled debugging the shell script leveraging the DEBUG environment variable. A value 'trace' will enable the 'xtrace' Bash option (see http://tldp.org/LDP/abs/html/options.html). --- .travis/qa.sh | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/.travis/qa.sh b/.travis/qa.sh index a303f2f..92d9cc9 100644 --- a/.travis/qa.sh +++ b/.travis/qa.sh @@ -1,13 +1,17 @@ #!/bin/bash function logCheckResults() { - if [ "${DEBUG}" = "verbose" ]; - then - echo "Trace:" - cat log.txt - echo "Response:" - cat data.txt - fi + case "${DEBUG}" in + trace | verbose ) + echo "-> Trace:" + cat log.txt + echo "-> Response:" + cat data.txt + ;; + * ) + : + ;; + esac } function checkWithCurl() { @@ -92,6 +96,7 @@ function analyzeBranch() { echo "Skipped SonarQube analysis (${TRAVIS_BRANCH})" fi } + function skipBranchAnalysis() { echo "Skipped SonarQube analysis (${TRAVIS_BRANCH}): Non Q.A. branch" } @@ -121,6 +126,11 @@ function runSonarQubeAnalysis() { fi } +if [ "${DEBUG}" = "trace" ]; +then + set -x +fi + server=http://www.smartdeveloperhub.org/sonar/ case "${CI}" in @@ -130,4 +140,6 @@ case "${CI}" in * ) runSonarQubeAnalysis "$server" "$1" ;; esac +set +x + return 0 From 1d00cf362f675b1d0b269345bbc2ce6dd23e6782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Esteban=20Guti=C3=A9rrez?= Date: Tue, 15 Mar 2016 00:25:50 +0100 Subject: [PATCH 15/19] Improved QA script of the Travis CI build configuration, continued - Disabled 'errexit' Bash option, so that the first failure does not abort the execution of the script. --- .travis/qa.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis/qa.sh b/.travis/qa.sh index 92d9cc9..ed20f12 100644 --- a/.travis/qa.sh +++ b/.travis/qa.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Avoid aborting script on failure +set +e function logCheckResults() { case "${DEBUG}" in From 5e3eb8bdd11b6a0ee7a10a33f4ecef6182501499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Esteban=20Guti=C3=A9rrez?= Date: Tue, 15 Mar 2016 00:55:25 +0100 Subject: [PATCH 16/19] Enabled tuning build process in Travis CI, continued - Enabled debugging the 'build.sh' and 'utils.sh' shell scripts leveraging the DEBUG environment variable. A value 'trace' will enable the 'xtrace' Bash option (see http://tldp.org/LDP/abs/html/ options.html). - Updated 'utils.sh' script to avoid using the 'exit' command. --- .travis/build.sh | 6 ++++++ .travis/utils.sh | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.travis/build.sh b/.travis/build.sh index 365ccfc..a186043 100644 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -1,4 +1,5 @@ #!/bin/bash +# Abort script on first failure set -e function deploy() { @@ -39,6 +40,11 @@ function skipBuild() { echo "Skipping build..." } +if [ "${DEBUG}" = "trace" ]; +then + set -x +fi + case "${CI}" in skip ) skipBuild ;; porcelain ) runBuild porcelain ;; diff --git a/.travis/utils.sh b/.travis/utils.sh index cb6a987..5934c7c 100644 --- a/.travis/utils.sh +++ b/.travis/utils.sh @@ -1,4 +1,5 @@ #!/bin/bash +# Abort script on first failure set -e function backupMavenRepo() { @@ -22,14 +23,14 @@ function restoreMavenRepo() { function fail() { echo "ERROR: Unknown command '${1}'." - exit 1 + return 1 } function prepareBuild() { if [ "$#" != "2" ]; then echo "ERROR: No encryption password specified." - exit 2 + return 2 fi if [ "$1" != "porcelain" ]; @@ -78,6 +79,11 @@ function skipBuild() { echo "Skipping build..." } +if [ "${DEBUG}" = "trace" ]; +then + set -x +fi + case "${CI}" in skip ) skipBuild ;; * ) runUtility "$@" ;; From 8b5c5d6865d3efbde90dacdeeb9d26d2f19ce671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Esteban=20Guti=C3=A9rrez?= Date: Tue, 15 Mar 2016 01:39:43 +0100 Subject: [PATCH 17/19] Improved Utils script of the Travis CI build configuration - Improved debugging capabilities by hiding sensible information (i.e., passwords). - Provide additional information if the unshallowing of the git repository fails. --- .travis/utils.sh | 74 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 59 insertions(+), 15 deletions(-) diff --git a/.travis/utils.sh b/.travis/utils.sh index 5934c7c..bd3f13c 100644 --- a/.travis/utils.sh +++ b/.travis/utils.sh @@ -17,7 +17,7 @@ function restoreMavenRepo() { then mv /tmp/cache-trick/smartdeveloperhub "$HOME/.m2/repository/org/" else - echo "Skipped Maven Repo restoration" + echo "Skipped Maven Repo restoration" fi } @@ -26,7 +26,42 @@ function fail() { return 1 } +function beginSensibleBlock() { + set +x + if [ "${DEBUG}" = "trace" ]; + then + set -v + fi +} + +function endSensibleBlock() { + set +v + if [ "${DEBUG}" = "trace" ]; + then + set -x + fi +} + +function unshallowGitRepository() { + if [[ -a .git/shallow ]]; + then + echo "- Unshallowing Git repository..." + set +e + git fetch --unshallow --verbose; + set -e + error=$? + if [[ $error -ne 0 ]]; + then + echo "Unshallowing failed with $error status code" + git --version + return $error + fi + fi +} + function prepareBuild() { + endSensitiveBlock + if [ "$#" != "2" ]; then echo "ERROR: No encryption password specified." @@ -35,22 +70,25 @@ function prepareBuild() { if [ "$1" != "porcelain" ]; then + beginSensitiveBlock + echo "Preparing Build's bill-of-materials..." echo "- Decrypting private key..." openssl aes-256-cbc -pass pass:"$2" -in config/src/main/resources/ci/secring.gpg.enc -out local.secring.gpg -d echo "- Decrypting public key..." openssl aes-256-cbc -pass pass:"$2" -in config/src/main/resources/ci/pubring.gpg.enc -out local.pubring.gpg -d - if [[ -a .git/shallow ]]; - then - echo "- Unshallowing Git repository..." - git fetch --unshallow - fi + + endSensitiveBlock + + unshallowGitRepository else echo "Skipped preparation of the Build's bill-of-materials" fi } function runUtility() { + beginSensibleBlock + mode=$1 if [ "$mode" != "porcelain" ]; then @@ -68,10 +106,21 @@ function runUtility() { fi case "$action" in - backup-maven-repo ) backupMavenRepo "$mode" "$@";; - restore-maven-repo) restoreMavenRepo "$mode" "$@";; - prepare-build-bom ) prepareBuild "$mode" "$@";; - * ) fail "$action";; + backup-maven-repo ) + endSensibleBlock + backupMavenRepo "$mode" "$@" + ;; + restore-maven-repo) + endSensibleBlock + restoreMavenRepo "$mode" "$@" + ;; + prepare-build-bom ) + prepareBuild "$mode" "$@" + ;; + * ) + endSensibleBlock + fail "$action" + ;; esac } @@ -79,11 +128,6 @@ function skipBuild() { echo "Skipping build..." } -if [ "${DEBUG}" = "trace" ]; -then - set -x -fi - case "${CI}" in skip ) skipBuild ;; * ) runUtility "$@" ;; From 4b5e0e779cf127fd9518ec890bca638b96fe1af5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Esteban=20Guti=C3=A9rrez?= Date: Tue, 15 Mar 2016 01:43:41 +0100 Subject: [PATCH 18/19] Improved Utils script of the Travis CI build configuration - Fixed usage of legacy methods. --- .travis/utils.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis/utils.sh b/.travis/utils.sh index bd3f13c..3a6281e 100644 --- a/.travis/utils.sh +++ b/.travis/utils.sh @@ -60,7 +60,7 @@ function unshallowGitRepository() { } function prepareBuild() { - endSensitiveBlock + endSensibleBlock if [ "$#" != "2" ]; then @@ -70,7 +70,7 @@ function prepareBuild() { if [ "$1" != "porcelain" ]; then - beginSensitiveBlock + beginSensibleBlock echo "Preparing Build's bill-of-materials..." echo "- Decrypting private key..." @@ -78,7 +78,7 @@ function prepareBuild() { echo "- Decrypting public key..." openssl aes-256-cbc -pass pass:"$2" -in config/src/main/resources/ci/pubring.gpg.enc -out local.pubring.gpg -d - endSensitiveBlock + endSensibleBlock unshallowGitRepository else From d8ccd23216aed4624af4cdf044f07f894e8f7072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Esteban=20Guti=C3=A9rrez?= Date: Wed, 6 Jul 2016 20:17:34 +0200 Subject: [PATCH 19/19] Bumped version number to 0.3.0 --- build/pom.xml | 8 +- config/pom.xml | 368 +++--- config/src/main/resources/ci/settings.xml | 142 +-- .../src/main/resources/quality/checkstyle.xml | 340 +++--- config/src/main/resources/quality/pmd.xml | 138 +-- pom.xml | 1084 ++++++++--------- 6 files changed, 1040 insertions(+), 1040 deletions(-) diff --git a/build/pom.xml b/build/pom.xml index 5fcc49b..241010d 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -22,8 +22,8 @@ See the License for the specific language governing permissions and limitations under the License. #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# - Artifact : org.smartdeveloperhub:sdh-build:0.3.0-SNAPSHOT - Bundle : sdh-build-0.3.0-SNAPSHOT.pom + Artifact : org.smartdeveloperhub:sdh-build:0.3.0 + Bundle : sdh-build-0.3.0.pom #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=# --> @@ -38,7 +38,7 @@ org.smartdeveloperhub sdh-parent - 0.3.0-SNAPSHOT + 0.3.0 ../pom.xml @@ -105,7 +105,7 @@ - 0.3.0-SNAPSHOT + 0.3.0 1.7.12 1.3 diff --git a/config/pom.xml b/config/pom.xml index 89663a5..9920a09 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -1,185 +1,185 @@ - - - - 4.0.0 - - - - - - - org.smartdeveloperhub - sdh-parent - 0.3.0-SNAPSHOT - ../pom.xml - - - sdh-config - - - - - - SDH :: Build Resources - - Smart Developer Hub Build Resources - - - ${basedir}${file.separator}src${file.separator}main${file.separator}resources - UTF-8 - - Smart Developer Hub - http://www.smartdeveloperhub.org - ${project.organization.name} - ${project.inceptionYear}-2016 - ${project.inceptionYear} - ${project.organization.name} - ${project.organization.url} - ${project.groupId}:${project.artifactId}:${project.version} - ${project.build.finalName}.${project.packaging} - - - - - - - org.apache.maven.plugins - maven-resources-plugin - - ${source.encoding} - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - install-legal-files - generate-resources - - add-resource - - - - - ${config.dir}${file.separator}legal - true - - NOTICE - LICENSE - - - - - - - timestamp-property - process-sources - - timestamp-property - - - currentYear - yyyy - year - - - - - - - - com.mycila - license-maven-plugin - -
${config.dir}${file.separator}legal${file.separator}header.txt
- true - - XML_STYLE - XML_STYLE - SCRIPT_STYLE - XML_STYLE - SCRIPT_STYLE - SCRIPT_STYLE - CMD_STYLE - - - pom.xml - **/pom.xml - src/** - target/generated-sources/** - - - target/** - **/*.bak - src/main/resources/legal/** - src/main/resources/ci/**.enc - - true - ${source.encoding} - true - - ${license.project.url} - ${license.project.duration} - ${license.project.owner} - ${license.project.name} - ${license.project.inceptionYear} - ${license.organization.url} - ${license.organization.name} - ${license.bundle} - ${license.artifact} - - - ${config.dir}${file.separator}legal${file.separator}cmd_header.xml - - - - - update-licenses - process-sources - - format - - - - check-licenses - verify - - check - - - - - - + + + + 4.0.0 + + + + + + + org.smartdeveloperhub + sdh-parent + 0.3.0 + ../pom.xml + + + sdh-config + + + + + + SDH :: Build Resources + + Smart Developer Hub Build Resources + + + ${basedir}${file.separator}src${file.separator}main${file.separator}resources + UTF-8 + + Smart Developer Hub + http://www.smartdeveloperhub.org + ${project.organization.name} + ${project.inceptionYear}-2016 + ${project.inceptionYear} + ${project.organization.name} + ${project.organization.url} + ${project.groupId}:${project.artifactId}:${project.version} + ${project.build.finalName}.${project.packaging} + + + + + + + org.apache.maven.plugins + maven-resources-plugin + + ${source.encoding} + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + install-legal-files + generate-resources + + add-resource + + + + + ${config.dir}${file.separator}legal + true + + NOTICE + LICENSE + + + + + + + timestamp-property + process-sources + + timestamp-property + + + currentYear + yyyy + year + + + + + + + + com.mycila + license-maven-plugin + +
${config.dir}${file.separator}legal${file.separator}header.txt
+ true + + XML_STYLE + XML_STYLE + SCRIPT_STYLE + XML_STYLE + SCRIPT_STYLE + SCRIPT_STYLE + CMD_STYLE + + + pom.xml + **/pom.xml + src/** + target/generated-sources/** + + + target/** + **/*.bak + src/main/resources/legal/** + src/main/resources/ci/**.enc + + true + ${source.encoding} + true + + ${license.project.url} + ${license.project.duration} + ${license.project.owner} + ${license.project.name} + ${license.project.inceptionYear} + ${license.organization.url} + ${license.organization.name} + ${license.bundle} + ${license.artifact} + + + ${config.dir}${file.separator}legal${file.separator}cmd_header.xml + + + + + update-licenses + process-sources + + format + + + + check-licenses + verify + + check + + + + + + \ No newline at end of file diff --git a/config/src/main/resources/ci/settings.xml b/config/src/main/resources/ci/settings.xml index ff25f24..721e6ab 100644 --- a/config/src/main/resources/ci/settings.xml +++ b/config/src/main/resources/ci/settings.xml @@ -1,72 +1,72 @@ - - - - - ossrh - ${env.CI_DEPLOY_USERNAME} - ${env.CI_DEPLOY_PASSWORD} - - - - - ci - - - codebase.directory - - - ${codebase.directory}${file.separator}local.secring.gpg - - - - gpg - false - ${env.KEYNAME} - ${env.ENCRYPTION_PASSWORD} - ${codebase.directory}${file.separator}local.pubring.gpg - ${codebase.directory}${file.separator}local.secring.gpg - - - - sonar - - - sonar.branch - - - - jdbc:mysql://${env.SONARQUBE_JDBC_HOST}:${env.SONARQUBE_JDBC_PORT}/${env.SONARQUBE_JDBC_SCHEMA}?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useConfigs=maxPerformance - ${env.SONARQUBE_JDBC_USERNAME} - ${env.SONARQUBE_JDBC_PASSWORD} - http://www.smartdeveloperhub.org/sonar/ - - - + + + + + ossrh + ${env.CI_DEPLOY_USERNAME} + ${env.CI_DEPLOY_PASSWORD} + + + + + ci + + + codebase.directory + + + ${codebase.directory}${file.separator}local.secring.gpg + + + + gpg + false + ${env.KEYNAME} + ${env.ENCRYPTION_PASSWORD} + ${codebase.directory}${file.separator}local.pubring.gpg + ${codebase.directory}${file.separator}local.secring.gpg + + + + sonar + + + sonar.branch + + + + jdbc:mysql://${env.SONARQUBE_JDBC_HOST}:${env.SONARQUBE_JDBC_PORT}/${env.SONARQUBE_JDBC_SCHEMA}?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useConfigs=maxPerformance + ${env.SONARQUBE_JDBC_USERNAME} + ${env.SONARQUBE_JDBC_PASSWORD} + http://www.smartdeveloperhub.org/sonar/ + + + \ No newline at end of file diff --git a/config/src/main/resources/quality/checkstyle.xml b/config/src/main/resources/quality/checkstyle.xml index 9e45c44..a79189f 100644 --- a/config/src/main/resources/quality/checkstyle.xml +++ b/config/src/main/resources/quality/checkstyle.xml @@ -1,171 +1,171 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/config/src/main/resources/quality/pmd.xml b/config/src/main/resources/quality/pmd.xml index dc82f66..dcaae1c 100644 --- a/config/src/main/resources/quality/pmd.xml +++ b/config/src/main/resources/quality/pmd.xml @@ -1,70 +1,70 @@ - - - - - Customized rules set - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Customized rules set + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 67769a5..b7b0a55 100644 --- a/pom.xml +++ b/pom.xml @@ -1,543 +1,543 @@ - - - - 4.0.0 - - - - - - org.smartdeveloperhub - sdh-parent - 0.3.0-SNAPSHOT - pom - - - - - - SDH :: Smart Developer Hub - - Smart Developer Hub - - 2015 - - http://www.smartdeveloperhub.org/ - - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - A business-friendly OSS license - - - - - - - Center for Open Middleware - http://www.centeropenmiddleware.com/ - - - - - - - mestebangutierrez - Miguel Esteban Gutiérrez - m.esteban.gutierrez@gmail.com - - architect - developer - product owner - - +1 - - - andresgs77 - Andrés García Silva - andresgs77@gmail.com - - developer - - +1 - - - - - - - - - - - - 1.14 - 1.10 - 3.0.3 - 0.7.5.201505241946 - 2.0 - 2.11 - 1.8 - 2.6 - 2.17 - 3.0.0 - 3.5 - 2.10 - 2.8.2 - 1.4.1 - 2.19.1 - 1.6 - 2.5.2 - 2.6 - 2.10.3 - 1.2.10 - 2.5 - 3.6 - 2.8.1 - 2.5.3 - 2.7 - 1.9.4 - 2.4 - 2.19.1 - 2.6 - 1.6.6 - 2.7.1 - 2.4 - 1.2 - 1.0-m5.1 - - - - install - - - true - org.apache.maven.plugins - maven-enforcer-plugin - ${maven.enforcer.plugin.version} - - - enforce-maven-3 - - enforce - - - - - [3.2.3,) - - - 1.7 - - - true - - - - - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - ${maven.dependency.plugin.version} - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.plugin.version} - - - - org.apache.maven.plugins - maven-resources-plugin - ${maven.resources.plugin.version} - - - - org.codehaus.mojo - build-helper-maven-plugin - ${build.helper.maven.plugin.version} - - - - com.mycila - license-maven-plugin - ${mycila.license.maven.plugin.version} - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.surefire.plugin.version} - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven.jar.plugin.version} - - - - org.apache.maven.plugins - maven-clean-plugin - ${maven.clean.plugin.version} - - - - org.apache.maven.plugins - maven-install-plugin - ${maven.install.plugin.version} - - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven.deploy.plugin.version} - - - - - - - - ru.concerteza.buildnumber - maven-jgit-buildnumber-plugin - ${maven.jgit.buildnumber.plugin.version} - - - - org.codehaus.gmaven - groovy-maven-plugin - ${groovy.maven.plugin.version} - - - - org.apache.maven.plugins - maven-source-plugin - ${maven.source.plugin.version} - - - - org.apache.maven.plugins - maven-war-plugin - ${maven.war.plugin.version} - - - - org.codehaus.mojo - truezip-maven-plugin - ${truezip.maven.plugin.version} - - - - org.apache.maven.plugins - maven-release-plugin - ${maven.release.plugin.version} - - - - org.apache.maven.plugins - maven-assembly-plugin - ${maven.assembly.plugin.version} - - - - - org.codehaus.mojo - sonar-maven-plugin - ${sonar.maven.plugin.version} - - - - - - - - org.apache.maven.plugins - maven-scm-plugin - ${maven.scm.plugin.version} - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven.javadoc.plugin.version} - - - - org.codehaus.mojo - animal-sniffer-maven-plugin - ${animal.sniffer.maven.plugin.version} - - - - org.codehaus.mojo - license-maven-plugin - ${codehaus.license.maven.plugin.version} - - - - - - - - org.jacoco - jacoco-maven-plugin - ${jacoco.maven.plugin.version} - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven.failsafe.plugin.version} - - - - - - - config - build - - - - - - only-eclipse - - - m2e.version - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-dependency-plugin - [2.5.1,) - - unpack - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - [1.7,) - - timestamp-property - reserve-network-port - - - - - - - - - org.jacoco - jacoco-maven-plugin - [0.6.4.201312101107,) - - prepare-agent-integration - - - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - [1.0,) - - enforce - - - - - - - - - ru.concerteza.buildnumber - maven-jgit-buildnumber-plugin - [1.2.8,) - - extract-buildnumber - - - - - - - - - org.apache.maven.plugins - maven-clean-plugin - [2.6.1,) - - clean - - - - - - - - - org.codehaus.gmaven - groovy-maven-plugin - [2.0,) - - execute - - - - - - - - - - - - - - - - gpg - - - gpg.secretKeyring - - - - - - org.apache.maven.plugins - maven-gpg-plugin - ${maven.gpg.plugin.version} - - - sign-artifacts - verify - - sign - - - - - - - - - travis-ossrh - - - ossrh - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus.staging.maven.plugin.version} - true - - ossrh - https://oss.sonatype.org/ - false - - - - - - - - - - - - - GitHub - https://github.com/SmartDeveloperHub/sdh-maven/issues - - - - Travis-CI - https://travis-ci.org/SmartDeveloperHub/sdh-maven - - - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - - - scm:git:git://git@github.com:SmartDeveloperHub/sdh-maven.git - scm:git:ssh://github.com/SmartDeveloperHub/sdh-maven.git - git://github.com/SmartDeveloperHub/sdh-maven.git - - + + + + 4.0.0 + + + + + + org.smartdeveloperhub + sdh-parent + 0.3.0 + pom + + + + + + SDH :: Smart Developer Hub + + Smart Developer Hub + + 2015 + + http://www.smartdeveloperhub.org/ + + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + A business-friendly OSS license + + + + + + + Center for Open Middleware + http://www.centeropenmiddleware.com/ + + + + + + + mestebangutierrez + Miguel Esteban Gutiérrez + m.esteban.gutierrez@gmail.com + + architect + developer + product owner + + +1 + + + andresgs77 + Andrés García Silva + andresgs77@gmail.com + + developer + + +1 + + + + + + + + + + + + 1.14 + 1.10 + 3.0.3 + 0.7.5.201505241946 + 2.0 + 2.11 + 1.8 + 2.6 + 2.17 + 3.0.0 + 3.5 + 2.10 + 2.8.2 + 1.4.1 + 2.19.1 + 1.6 + 2.5.2 + 2.6 + 2.10.3 + 1.2.10 + 2.5 + 3.6 + 2.8.1 + 2.5.3 + 2.7 + 1.9.4 + 2.4 + 2.19.1 + 2.6 + 1.6.6 + 2.7.1 + 2.4 + 1.2 + 1.0-m5.1 + + + + install + + + true + org.apache.maven.plugins + maven-enforcer-plugin + ${maven.enforcer.plugin.version} + + + enforce-maven-3 + + enforce + + + + + [3.2.3,) + + + 1.7 + + + true + + + + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven.dependency.plugin.version} + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.plugin.version} + + + + org.apache.maven.plugins + maven-resources-plugin + ${maven.resources.plugin.version} + + + + org.codehaus.mojo + build-helper-maven-plugin + ${build.helper.maven.plugin.version} + + + + com.mycila + license-maven-plugin + ${mycila.license.maven.plugin.version} + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven.surefire.plugin.version} + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven.jar.plugin.version} + + + + org.apache.maven.plugins + maven-clean-plugin + ${maven.clean.plugin.version} + + + + org.apache.maven.plugins + maven-install-plugin + ${maven.install.plugin.version} + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven.deploy.plugin.version} + + + + + + + + ru.concerteza.buildnumber + maven-jgit-buildnumber-plugin + ${maven.jgit.buildnumber.plugin.version} + + + + org.codehaus.gmaven + groovy-maven-plugin + ${groovy.maven.plugin.version} + + + + org.apache.maven.plugins + maven-source-plugin + ${maven.source.plugin.version} + + + + org.apache.maven.plugins + maven-war-plugin + ${maven.war.plugin.version} + + + + org.codehaus.mojo + truezip-maven-plugin + ${truezip.maven.plugin.version} + + + + org.apache.maven.plugins + maven-release-plugin + ${maven.release.plugin.version} + + + + org.apache.maven.plugins + maven-assembly-plugin + ${maven.assembly.plugin.version} + + + + + org.codehaus.mojo + sonar-maven-plugin + ${sonar.maven.plugin.version} + + + + + + + + org.apache.maven.plugins + maven-scm-plugin + ${maven.scm.plugin.version} + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven.javadoc.plugin.version} + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + ${animal.sniffer.maven.plugin.version} + + + + org.codehaus.mojo + license-maven-plugin + ${codehaus.license.maven.plugin.version} + + + + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco.maven.plugin.version} + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven.failsafe.plugin.version} + + + + + + + config + build + + + + + + only-eclipse + + + m2e.version + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-dependency-plugin + [2.5.1,) + + unpack + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + [1.7,) + + timestamp-property + reserve-network-port + + + + + + + + + org.jacoco + jacoco-maven-plugin + [0.6.4.201312101107,) + + prepare-agent-integration + + + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + [1.0,) + + enforce + + + + + + + + + ru.concerteza.buildnumber + maven-jgit-buildnumber-plugin + [1.2.8,) + + extract-buildnumber + + + + + + + + + org.apache.maven.plugins + maven-clean-plugin + [2.6.1,) + + clean + + + + + + + + + org.codehaus.gmaven + groovy-maven-plugin + [2.0,) + + execute + + + + + + + + + + + + + + + + gpg + + + gpg.secretKeyring + + + + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven.gpg.plugin.version} + + + sign-artifacts + verify + + sign + + + + + + + + + travis-ossrh + + + ossrh + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${nexus.staging.maven.plugin.version} + true + + ossrh + https://oss.sonatype.org/ + false + + + + + + + + + + + + + GitHub + https://github.com/SmartDeveloperHub/sdh-maven/issues + + + + Travis-CI + https://travis-ci.org/SmartDeveloperHub/sdh-maven + + + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + + + scm:git:git://git@github.com:SmartDeveloperHub/sdh-maven.git + scm:git:ssh://github.com/SmartDeveloperHub/sdh-maven.git + git://github.com/SmartDeveloperHub/sdh-maven.git + + \ No newline at end of file