From 909df74ba57f590010cd04ec1f8da1ad914d7eb8 Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 18:55:10 -0400 Subject: [PATCH 01/30] Bump version for upcoming features --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 04f4734..cd88541 100644 --- a/pom.xml +++ b/pom.xml @@ -6,12 +6,12 @@ it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . --> @@ -20,7 +20,7 @@ 4.0.0 info.ronjenkins slf4bukkit - 0.1.5-SNAPSHOT + 0.2.0-SNAPSHOT SLF4Bukkit ${project.name} is an SLF4J binding that uses Bukkit's plugin logging system. http://rjenkinsjr.github.io/slf4bukkit @@ -347,7 +347,7 @@ 2.8.2 - internal.repo::default::file://${maven2.repo.dir} + internal.repo::default::file://${maven2.repo.dir} @@ -425,4 +425,4 @@ - \ No newline at end of file + From 6696c576ea8186eb86eb252285770a2ff74e834d Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 18:57:16 -0400 Subject: [PATCH 02/30] Drop all SonarQube support --- pom.xml | 43 ------------------------------------------- 1 file changed, 43 deletions(-) diff --git a/pom.xml b/pom.xml index cd88541..5587575 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,6 @@ 1.7 1.7 2.10.3 - ${maven.compiler.source} true ${project.basedir}/src/site ${project.basedir}/target/site-src @@ -143,26 +142,6 @@ - - - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - 3.0.1 - - - sonarqube-analysis - verify - - sonar - - - - - - @@ -254,23 +233,6 @@ - - - sonarqube - - - sonar.host.url - - - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - - - - release @@ -336,11 +298,6 @@ - - - org.sonarsource.scanner.maven - sonar-maven-plugin - maven-deploy-plugin From dadf31fa0a4229bee8498c23a0d418290045e150 Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 19:45:44 -0400 Subject: [PATCH 03/30] Initial impl of CircleCI build --- circle.yml | 18 ++++++++++++++++++ pom.xml | 21 --------------------- settings.xml | 12 ++++++++++++ 3 files changed, 30 insertions(+), 21 deletions(-) create mode 100644 circle.yml create mode 100644 settings.xml diff --git a/circle.yml b/circle.yml new file mode 100644 index 0000000..1a472c5 --- /dev/null +++ b/circle.yml @@ -0,0 +1,18 @@ +machine: + java: + version: oraclejdk7 + +dependencies: + override: + - exit 0 # Handled during compile phase. + +test: + override: + - exit 0 # Handled during compile phase. + +deployment: + production: + branch: production # TBD + commands: + - mvn -Drtr.disabled=true clean + - mvn -s settings.xml -Drtr.release=true diff --git a/pom.xml b/pom.xml index 5587575..12f09e4 100644 --- a/pom.xml +++ b/pom.xml @@ -249,27 +249,6 @@ clean deploy site-deploy - - - maven-antrun-plugin - 1.8 - - - write-properties-file - initialize - - run - - - - - - - - - - - maven-source-plugin diff --git a/settings.xml b/settings.xml new file mode 100644 index 0000000..90730cc --- /dev/null +++ b/settings.xml @@ -0,0 +1,12 @@ + + + + + + github + ${env.GMSP_OAUTHTOKEN} + + + From d012050290874c500f6d2eba81036605df813061 Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 19:50:34 -0400 Subject: [PATCH 04/30] Improve comoments --- circle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 1a472c5..f5687b4 100644 --- a/circle.yml +++ b/circle.yml @@ -4,11 +4,11 @@ machine: dependencies: override: - - exit 0 # Handled during compile phase. + - exit 0 # Handled during CircleCI compile phase. test: override: - - exit 0 # Handled during compile phase. + - exit 0 # Handled during CircleCI compile phase. deployment: production: From 1336e27286f892f41aac08b577db58ef46374723 Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 19:52:55 -0400 Subject: [PATCH 05/30] Add Spigot repo --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 12f09e4..010cc7e 100644 --- a/pom.xml +++ b/pom.xml @@ -50,6 +50,12 @@ + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + org.slf4j From bce0c58c9d60ecf8c37acf36dec3f7a15b14aa11 Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 19:53:15 -0400 Subject: [PATCH 06/30] Call Maven from Circle --- circle.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/circle.yml b/circle.yml index f5687b4..22f45ba 100644 --- a/circle.yml +++ b/circle.yml @@ -6,6 +6,10 @@ dependencies: override: - exit 0 # Handled during CircleCI compile phase. +compile: + override: + - mvn + test: override: - exit 0 # Handled during CircleCI compile phase. From a70b87d21d028d5769f4b9f87e5ec0dee4ff0e13 Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 19:55:45 -0400 Subject: [PATCH 07/30] Print Maven version during build --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 22f45ba..0639687 100644 --- a/circle.yml +++ b/circle.yml @@ -8,7 +8,7 @@ dependencies: compile: override: - - mvn + - mvn -V test: override: From aa6c20d505664b18d90a0393c389bd21df58929c Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 19:58:16 -0400 Subject: [PATCH 08/30] Improve Maven/Circle behavior --- circle.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/circle.yml b/circle.yml index 0639687..d3e0065 100644 --- a/circle.yml +++ b/circle.yml @@ -4,15 +4,11 @@ machine: dependencies: override: - - exit 0 # Handled during CircleCI compile phase. - -compile: - override: - - mvn -V + - mvn -V -DskipTests clean install dependency:resolve-plugins dependency:go-offline test: override: - - exit 0 # Handled during CircleCI compile phase. + - exit # We don't have any tests right now. deployment: production: From 2c2743dd90006a2c96f85117a6b28a36b30ff855 Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 20:03:43 -0400 Subject: [PATCH 09/30] Use Maven 3.3.9 --- circle.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/circle.yml b/circle.yml index d3e0065..b2448a8 100644 --- a/circle.yml +++ b/circle.yml @@ -1,8 +1,15 @@ machine: java: version: oraclejdk7 + environment: + PATH: "~/maven/bin:${PATH}" dependencies: + pre: + - wget https://archive.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz + - tar -xvzf apache-maven-3.3.9-bin.tar.gz + - rm apache-maven-3.3.9-bin.tar.gz + - mv apache-maven-3.3.9 maven override: - mvn -V -DskipTests clean install dependency:resolve-plugins dependency:go-offline From 0d993194e2d87df79973f8ab8bee57fb2a199e0e Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 20:08:40 -0400 Subject: [PATCH 10/30] Fix Maven 3.3.9 --- circle.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index b2448a8..b5fd58d 100644 --- a/circle.yml +++ b/circle.yml @@ -1,15 +1,13 @@ machine: java: version: oraclejdk7 - environment: - PATH: "~/maven/bin:${PATH}" dependencies: pre: - wget https://archive.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz - - tar -xvzf apache-maven-3.3.9-bin.tar.gz + - sudo tar -zxf apache-maven-3.3.9-bin.tar.gz -C /usr/local/ - rm apache-maven-3.3.9-bin.tar.gz - - mv apache-maven-3.3.9 maven + - sudo ln -s /usr/local/apache-maven-3.3.9/bin/mvn /usr/bin/mvn override: - mvn -V -DskipTests clean install dependency:resolve-plugins dependency:go-offline From 745189fcc86406ed58d5690fee0886debf0096e1 Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 20:17:57 -0400 Subject: [PATCH 11/30] Fix Maven 3.3.9 again --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index b5fd58d..17811dc 100644 --- a/circle.yml +++ b/circle.yml @@ -7,7 +7,7 @@ dependencies: - wget https://archive.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz - sudo tar -zxf apache-maven-3.3.9-bin.tar.gz -C /usr/local/ - rm apache-maven-3.3.9-bin.tar.gz - - sudo ln -s /usr/local/apache-maven-3.3.9/bin/mvn /usr/bin/mvn + - sudo ln -sfn /usr/local/apache-maven-3.3.9 /usr/local/apache-maven override: - mvn -V -DskipTests clean install dependency:resolve-plugins dependency:go-offline From 326a136675ebc4699b3b19096f3eb5bb2d16f40f Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 20:21:28 -0400 Subject: [PATCH 12/30] Make wget less verbose --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 17811dc..348d4e0 100644 --- a/circle.yml +++ b/circle.yml @@ -4,7 +4,7 @@ machine: dependencies: pre: - - wget https://archive.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz + - wget -nv https://archive.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz - sudo tar -zxf apache-maven-3.3.9-bin.tar.gz -C /usr/local/ - rm apache-maven-3.3.9-bin.tar.gz - sudo ln -sfn /usr/local/apache-maven-3.3.9 /usr/local/apache-maven From 121f88c36bee7cfdc6e08a944211b091b8b0a467 Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 20:23:54 -0400 Subject: [PATCH 13/30] Try JDK8 to silence Maven warnings --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 348d4e0..5135f64 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ machine: java: - version: oraclejdk7 + version: oraclejdk8 dependencies: pre: From c37801e877eb234da2a44d66ef5bacc966bbf139 Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 20:29:03 -0400 Subject: [PATCH 14/30] Downgrading for technical release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 010cc7e..b3a17c9 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 4.0.0 info.ronjenkins slf4bukkit - 0.2.0-SNAPSHOT + 0.1.5-SNAPSHOT SLF4Bukkit ${project.name} is an SLF4J binding that uses Bukkit's plugin logging system. http://rjenkinsjr.github.io/slf4bukkit From 67b441a5aff5cdc3a3732aca0e5fd60a92bc675d Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 20:29:36 -0400 Subject: [PATCH 15/30] Master branch is now latest release --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 5135f64..490788f 100644 --- a/circle.yml +++ b/circle.yml @@ -17,7 +17,7 @@ test: deployment: production: - branch: production # TBD + branch: master commands: - mvn -Drtr.disabled=true clean - mvn -s settings.xml -Drtr.release=true From 686d0f673c2bf9dc08ac93b06effe2d2c7e67e99 Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 20:38:43 -0400 Subject: [PATCH 16/30] Make Git tag during deploy --- circle.yml | 4 +++- pom.xml | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 490788f..c121329 100644 --- a/circle.yml +++ b/circle.yml @@ -19,5 +19,7 @@ deployment: production: branch: master commands: - - mvn -Drtr.disabled=true clean + - mvn clean - mvn -s settings.xml -Drtr.release=true + - git tag $(cat .version) + - git push origin $(cat .version) diff --git a/pom.xml b/pom.xml index b3a17c9..9aae376 100644 --- a/pom.xml +++ b/pom.xml @@ -255,6 +255,25 @@ clean deploy site-deploy + + + maven-antrun-plugin + 1.8 + + + write-properties-file + initialize + + run + + + + + + + + + maven-source-plugin From 7eb47703939a2e47954c934668a2c8f459ca9e2f Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 20:41:37 -0400 Subject: [PATCH 17/30] Rename deployment --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index c121329..6fb04a4 100644 --- a/circle.yml +++ b/circle.yml @@ -16,7 +16,7 @@ test: - exit # We don't have any tests right now. deployment: - production: + master: branch: master commands: - mvn clean From 504a6bc1af6e159456a115d1e8fabdc74cefa9a4 Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 20:58:02 -0400 Subject: [PATCH 18/30] Include release POM in tag --- circle.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/circle.yml b/circle.yml index 6fb04a4..d701433 100644 --- a/circle.yml +++ b/circle.yml @@ -21,5 +21,8 @@ deployment: commands: - mvn clean - mvn -s settings.xml -Drtr.release=true + - git add pom.xml + - git commit -m "Committing release $(cat .version)" + - git push - git tag $(cat .version) - git push origin $(cat .version) From 08148d73315cc3fbee59b1f3507591fdc9fa0e7f Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 21:34:51 -0400 Subject: [PATCH 19/30] Do not push to master again --- circle.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/circle.yml b/circle.yml index d701433..cd04568 100644 --- a/circle.yml +++ b/circle.yml @@ -23,6 +23,5 @@ deployment: - mvn -s settings.xml -Drtr.release=true - git add pom.xml - git commit -m "Committing release $(cat .version)" - - git push - git tag $(cat .version) - git push origin $(cat .version) From 4bc9099108df8f8e7106775827dcbf105a8e697b Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 21:35:49 -0400 Subject: [PATCH 20/30] Set Git user --- circle.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/circle.yml b/circle.yml index cd04568..425f1e0 100644 --- a/circle.yml +++ b/circle.yml @@ -21,6 +21,8 @@ deployment: commands: - mvn clean - mvn -s settings.xml -Drtr.release=true + - git config --global user.email "me@ronjenkins.info" + - git config --global user.name "Ronald Jack Jenkins Jr." - git add pom.xml - git commit -m "Committing release $(cat .version)" - git tag $(cat .version) From b2fb40c59bd9f9779702baa7e0e3a5ecb9247837 Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 21:36:03 -0400 Subject: [PATCH 21/30] Fix Maven release activation --- circle.yml | 2 +- pom.xml | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/circle.yml b/circle.yml index 425f1e0..36b495a 100644 --- a/circle.yml +++ b/circle.yml @@ -20,7 +20,7 @@ deployment: branch: master commands: - mvn clean - - mvn -s settings.xml -Drtr.release=true + - mvn -s settings.xml -Drtr.release=true -P release - git config --global user.email "me@ronjenkins.info" - git config --global user.name "Ronald Jack Jenkins Jr." - git add pom.xml diff --git a/pom.xml b/pom.xml index 9aae376..1aaec3d 100644 --- a/pom.xml +++ b/pom.xml @@ -242,12 +242,6 @@ release - - - rtr.release - true - - github - ${env.GMSP_OAUTHTOKEN} + GMSP_OAUTHTOKEN From b81ff6d90c35e835a9480ff74d4f8205f0be0991 Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 22:42:54 -0400 Subject: [PATCH 27/30] More deploy fixes --- deploy.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/deploy.sh b/deploy.sh index ae21ffc..4c8b79a 100644 --- a/deploy.sh +++ b/deploy.sh @@ -5,9 +5,8 @@ mvn clean source .env sed -i -e "s/GMSP_OAUTHTOKEN/${GMSP_OAUTHTOKEN}/" settings.xml -rm .env -mvn -s settings.xml -Drtr.release=true -P release +mvn -s ./settings.xml -Drtr.release=true -P release git config --global user.email "me@ronjenkins.info" git config --global user.name "Ronald Jack Jenkins Jr." From 92025d4a9154c23e03882597bebb51c989f4b260 Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 23:01:24 -0400 Subject: [PATCH 28/30] Fixing version in docs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f592627..916e82b 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ If you wish to use [SLF4J](http://slf4j.org) in your Bukkit plugin, or if your p info.ronjenkins slf4bukkit - 0.1.4 + 0.1.5 ``` From 9b0c73b2c5a6c3fc5734e61f14872864597798d6 Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 23:07:12 -0400 Subject: [PATCH 29/30] Include README.md changes in release --- deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.sh b/deploy.sh index 4c8b79a..d1859fb 100644 --- a/deploy.sh +++ b/deploy.sh @@ -13,7 +13,7 @@ git config --global user.name "Ronald Jack Jenkins Jr." POM_VERSION=$(cat .version | xargs) -git add pom.xml +git add pom.xml README.md git commit -m "Committing release $POM_VERSION" git tag "$POM_VERSION" From 5cb23fd058ef688858efda72bf2e74e913c03866 Mon Sep 17 00:00:00 2001 From: Ronald Jack Jenkins Jr Date: Sun, 30 Jul 2017 23:08:22 -0400 Subject: [PATCH 30/30] Bump version for technical release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1aaec3d..f27acd1 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 4.0.0 info.ronjenkins slf4bukkit - 0.1.5-SNAPSHOT + 0.1.6-SNAPSHOT SLF4Bukkit ${project.name} is an SLF4J binding that uses Bukkit's plugin logging system. http://rjenkinsjr.github.io/slf4bukkit