From 8e837857c053260bd0e05132618e41ed4c855306 Mon Sep 17 00:00:00 2001 From: tastybento Date: Thu, 8 Aug 2019 07:06:30 -0700 Subject: [PATCH 1/2] Added build icon --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8d0a802..6d5b042 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ # Level +[![Build Status](https://ci.codemc.org/buildStatus/icon?job=BentoBoxWorld/Level)](https://ci.codemc.org/job/BentoBoxWorld/job/Level/) + Add-on for BentoBox to calculate island levels for BSkyBlock and AcidIsland. This add-on will work for game modes listed in the config.yml. From 62bf2a6e8858f937f26413cf9713a3e44cb1dea6 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 3 Nov 2019 18:14:10 -0800 Subject: [PATCH 2/2] Added SonarCloud --- .travis.yml | 11 +- pom.xml | 352 ++++++++++++++++++++++++++++++---------------------- 2 files changed, 210 insertions(+), 153 deletions(-) diff --git a/.travis.yml b/.travis.yml index ae6bc33..fb9babb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,12 +2,10 @@ language: java sudo: false addons: sonarcloud: - organization: "tastybento-github" + organization: "bentobox-world" token: secure: $SONAR_TOKEN - branches: - - develop - - master + jdk: - openjdk8 - openjdk11 @@ -17,8 +15,9 @@ matrix: - jdk: openjdk11 script: - - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package -P sonar sonar:sonar -B - - echo "${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}" + # the following command line builds the project, runs the tests with coverage and then execute the SonarCloud analysis + - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar -Dsonar.projectKey=BentoBoxWorld_addon-invSwitcher + cache: directories: - '$HOME/.m2/repository' diff --git a/pom.xml b/pom.xml index 3fb5302..3054232 100644 --- a/pom.xml +++ b/pom.xml @@ -1,20 +1,20 @@ - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - world.bentobox - level + world.bentobox + level ${revision} - Level - Level is an add-on for BentoBox, an expandable Minecraft Bukkit plugin for island-type games like SkyBlock or AcidIsland. - https://github.com/BentoBoxWorld/Level - 2017 + Level + Level is an add-on for BentoBox, an expandable Minecraft Bukkit plugin for island-type games like SkyBlock or AcidIsland. + https://github.com/BentoBoxWorld/Level + 2017 - + tastybento tastybento@bentobox.world -8 @@ -23,35 +23,35 @@ - - - scm:git:https://github.com/BentoBoxWorld/Level.git - scm:git:git@github.com:BentoBoxWorld/Level.git - https://github.com/BentoBoxWorld/Level - - - jenkins - http://ci.codemc.org/job/BentoBoxWorld/job/Level - + + scm:git:https://github.com/BentoBoxWorld/Level.git + scm:git:git@github.com:BentoBoxWorld/Level.git + https://github.com/BentoBoxWorld/Level + - - GitHub - https://github.com/BentoBoxWorld/Level/issues - + + jenkins + http://ci.codemc.org/job/BentoBoxWorld/job/Level + - - - codemc-snapshots - https://repo.codemc.org/repository/maven-snapshots - - - codemc-releases - https://repo.codemc.org/repository/maven-releases - - + + GitHub + https://github.com/BentoBoxWorld/Level/issues + - + + + codemc-snapshots + https://repo.codemc.org/repository/maven-snapshots + + + codemc-releases + https://repo.codemc.org/repository/maven-releases + + + + UTF-8 UTF-8 1.8 @@ -66,13 +66,14 @@ -LOCAL 1.8.0 - + - - + + ci @@ -85,10 +86,14 @@ - - - - + + + + master @@ -99,26 +104,50 @@ ${build.version} - + + + sonar + + https://sonarcloud.io + bentobox-world + + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.6.0.1398 + + + verify + + sonar + + + + + + + - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots - - - codemc-repo - https://repo.codemc.org/repository/maven-public/ - - - codemc-public - https://repo.codemc.org/repository/maven-public/ - - + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots + + + codemc-repo + https://repo.codemc.org/repository/maven-public/ + + + codemc-public + https://repo.codemc.org/repository/maven-public/ + + @@ -155,99 +184,128 @@ - + - + - + ${project.name}-${revision}${build.number} - - clean package - - - src/main/resources - true - - - src/main/resources/locales - ./locales - false - - - - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - org.apache.maven.plugins - maven-resources-plugin - 3.1.0 - - - org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 - - ${java.version} - ${java.version} - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.0 - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.0 - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.0.1 - - public - false - -Xdoclint:none - - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-install-plugin - 2.5.2 - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - - + + clean package + + + src/main/resources + true + + + src/main/resources/locales + ./locales + false + + + + + org.apache.maven.plugins + maven-clean-plugin + 3.1.0 + + + org.apache.maven.plugins + maven-resources-plugin + 3.1.0 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + ${java.version} + ${java.version} + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.0 + + + org.apache.maven.plugins + maven-jar-plugin + 3.1.0 + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.1 + + public + false + -Xdoclint:none + + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-install-plugin + 2.5.2 + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + + org.jacoco + jacoco-maven-plugin + 0.8.3 + + true + + + **/*Names* + + + + + pre-unit-test + + prepare-agent + + + + post-unit-test + + report + + + + + + \ No newline at end of file