From 4d4c8da91269a9ebc99e10ac8db17f792641b92d Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 3 Aug 2018 08:06:28 -0700 Subject: [PATCH] Revert "Maven cleanup, fix readme links" This reverts commit 450786aea3f263cb06a4c1cd4ca821d20e8524a8. --- .travis.yml | 30 +- README.md | 12 +- src/main/resources/config.yml => config.yml | 0 .../resources/locales => locales}/de-DE.yml | 0 .../resources/locales => locales}/en-GB.yml | 0 .../resources/locales => locales}/en-US.yml | 0 .../resources/locales => locales}/fr-FR.yml | 0 .../resources/locales => locales}/pl-PL.yml | 0 .../resources/locales => locales}/vi-VN.yml | 0 .../resources/locales => locales}/zh-CN.yml | 0 src/main/resources/plugin.yml => plugin.yml | 2 +- pom.xml | 433 ++++++++---------- 12 files changed, 227 insertions(+), 250 deletions(-) rename src/main/resources/config.yml => config.yml (100%) rename {src/main/resources/locales => locales}/de-DE.yml (100%) rename {src/main/resources/locales => locales}/en-GB.yml (100%) rename {src/main/resources/locales => locales}/en-US.yml (100%) rename {src/main/resources/locales => locales}/fr-FR.yml (100%) rename {src/main/resources/locales => locales}/pl-PL.yml (100%) rename {src/main/resources/locales => locales}/vi-VN.yml (100%) rename {src/main/resources/locales => locales}/zh-CN.yml (100%) rename src/main/resources/plugin.yml => plugin.yml (87%) mode change 100644 => 100755 diff --git a/.travis.yml b/.travis.yml index ac48a866d..51a50d93c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,23 @@ language: java sudo: false +install: true +before_install: +- sed -i.bak -e 's|https://nexus.codehaus.org/snapshots/|https://oss.sonatype.org/content/repositories/codehaus-snapshots/|g' + ~/.m2/settings.xml addons: - sonarcloud: - organization: "tastybento-github" - token: - secure: $SONAR_TOKEN - branches: - - develop - - master + sonarcloud: + organization: "tastybento-github" + token: + secure: $SONAR_TOKEN + branches: + - develop + - master jdk: - - oraclejdk8 + - oraclejdk8 script: - - mvn clean package -P sonar -B - - echo "${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}" + - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar + - echo "${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}" cache: - directories: - - '$HOME/.m2/repository' - - '$HOME/.sonar/cache' + directories: + - '$HOME/.m2/repository' + - '$HOME/.sonar/cache' \ No newline at end of file diff --git a/README.md b/README.md index d0d74baf2..b558cb68a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ BentoBox ======== -[![Build Status](https://ci.codemc.org/buildStatus/icon?job=BentoBoxWorld/bentobox)](https://ci.codemc.org/job/BentoBoxWorld/job/bentobox/) +[![Build Status](https://travis-ci.org/tastybento/bskyblock.svg?branch=master)](https://travis-ci.org/tastybento/bskyblock) ![Lines Of Code](https://sonarcloud.io/api/project_badges/measure?project=world.bentobox%3Abentobox%3Adevelop&metric=ncloc) ![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=world.bentobox%3Abentobox%3Adevelop&metric=sqale_rating) ![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=world.bentobox%3Abentobox%3Adevelop&metric=reliability_rating) @@ -32,7 +32,7 @@ This is an actively developed project but we are not currently accepting Pull Re Development Builds ================== -Jenkins: https://ci.codemc.org/job/BentoBoxWorld/job/bentobox/ +Jenkins: https://ci.codemc.org/job/Tastybento/job/bskyblock/ API === @@ -47,12 +47,12 @@ Maven dependency: - world.bentobox - bentobox - 0.8.0-SNAPSHOT + us.tastybento + bskyblock + FC-0.74 provided ``` -You can find the javadoc here: https://ci.codemc.org/job/BentoBoxWorld/job/bentobox/javadoc/ +You can find the javadoc here: https://ci.codemc.org/job/Tastybento/job/bskyblock/javadoc/ diff --git a/src/main/resources/config.yml b/config.yml similarity index 100% rename from src/main/resources/config.yml rename to config.yml diff --git a/src/main/resources/locales/de-DE.yml b/locales/de-DE.yml similarity index 100% rename from src/main/resources/locales/de-DE.yml rename to locales/de-DE.yml diff --git a/src/main/resources/locales/en-GB.yml b/locales/en-GB.yml similarity index 100% rename from src/main/resources/locales/en-GB.yml rename to locales/en-GB.yml diff --git a/src/main/resources/locales/en-US.yml b/locales/en-US.yml similarity index 100% rename from src/main/resources/locales/en-US.yml rename to locales/en-US.yml diff --git a/src/main/resources/locales/fr-FR.yml b/locales/fr-FR.yml similarity index 100% rename from src/main/resources/locales/fr-FR.yml rename to locales/fr-FR.yml diff --git a/src/main/resources/locales/pl-PL.yml b/locales/pl-PL.yml similarity index 100% rename from src/main/resources/locales/pl-PL.yml rename to locales/pl-PL.yml diff --git a/src/main/resources/locales/vi-VN.yml b/locales/vi-VN.yml similarity index 100% rename from src/main/resources/locales/vi-VN.yml rename to locales/vi-VN.yml diff --git a/src/main/resources/locales/zh-CN.yml b/locales/zh-CN.yml similarity index 100% rename from src/main/resources/locales/zh-CN.yml rename to locales/zh-CN.yml diff --git a/src/main/resources/plugin.yml b/plugin.yml old mode 100644 new mode 100755 similarity index 87% rename from src/main/resources/plugin.yml rename to plugin.yml index 7e32e56a9..4ba984c40 --- a/src/main/resources/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ name: BentoBox main: world.bentobox.bentobox.BentoBox -version: ${project.version} +version: ${version} api-version: 1.13 authors: [tastybento, Poslovitch] diff --git a/pom.xml b/pom.xml index cc68867fb..637be2a7f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,232 +1,205 @@ - - 4.0.0 - - world.bentobox - bentobox - 0.8.0-SNAPSHOT - - BentoBox - BentoBox is an expandable Minecraft Bukkit plugin for island-type games like ASkyBlock or AcidIsland. - https://github.com/BentoBoxWorld/bentobox - 2018 - - - scm:git:https://github.com/BentoBoxWorld/bentobox.git - scm:git:git@github.com:BentoBoxWorld/bentobox.git - https://github.com/BentoBoxWorld/bentobox - - - - jenkins - http://ci.codemc.org/job/BentoBoxWorld/job/bentobox - - - - GitHub - https://github.com/BentoBoxWorld/bentobox/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 - 1.7.4 - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots - - - - - - org.spigotmc - spigot-api - 1.13-R0.1-SNAPSHOT - provided - - - org.mockito - mockito-all - 1.10.19 - test - - - org.powermock - powermock-module-junit4 - ${powermock.version} - test - - - org.powermock - powermock-api-mockito - ${powermock.version} - test - - - org.mongodb - mongodb-driver - 3.8.0 - - - - - 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-shade-plugin - 3.1.1 - - false - - - - 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.1 - - true - - - - pre-unit-test - - prepare-agent - - - - post-unit-test - - report - - - - - - - - - - sonar - - https://sonarcloud.io - tastybento-github - - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - 5.1 - - - verify - - sonar - - - - - - - - + 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 + bentobox + jar + BentoBox + + 1.8 + 1.8 + UTF-8 + UTF-8 + 1.7.4 + + + clean package install + + + . + true + ${basedir} + + *.yml + + + + schems + false + ${basedir}/schems + + *.schem + + + + locales + false + ${basedir}/locales + + *.yml + + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.0.2 + + + schematic + + + + + maven-compiler-plugin + 3.5 + + 1.8 + 1.8 + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.0 + + -Xdoclint:none + + + + attach-javadocs + + jar + + + + + + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.3.0.603 + + + verify + + sonar + + + + + + org.jacoco + jacoco-maven-plugin + 0.8.1 + + true + + + + prepare-agent + + prepare-agent + + + + prepare-agent-integration + + prepare-agent-integration + + + + jacoco-site + verify + + report + + + + + + + + + + sonar + + https://sonarcloud.io + tastybento-github + + + + + org.jacoco + jacoco-maven-plugin + + + org.sonarsource.scanner.maven + sonar-maven-plugin + + + + + + + + org.spigotmc + spigot-api + 1.13-R0.1-SNAPSHOT + provided + + + org.mockito + mockito-all + 1.10.19 + test + + + org.powermock + powermock-module-junit4 + ${powermock.version} + test + + + org.powermock + powermock-api-mockito + ${powermock.version} + test + + + org.mongodb + mongodb-driver + 3.6.3 + + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots + + + FC-0.8