diff --git a/CHANGELOG.md b/CHANGELOG.md index f705cbeb..67f42081 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,14 +4,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [1.6.0] - unreleased +## [1.7.0] - unreleased -See [Release](https://github.com/itsallcode/white-rabbit/releases/tag/v1.6.0) / [Milestone](https://github.com/itsallcode/white-rabbit/milestone/8?closed=1) +See [Release](https://github.com/itsallcode/white-rabbit/releases/tag/v1.7.0) / [Milestone](https://github.com/itsallcode/white-rabbit/milestone/9?closed=1) -* [#149](https://github.com/itsallcode/white-rabbit/pull/149): Enlarged width/height of scrollbars to make them easier to click on. -* [#152](https://github.com/itsallcode/white-rabbit/issues/152): Display short day of week without dot or comma. -* [#111](https://github.com/itsallcode/white-rabbit/pull/111): Display week ends in other color. -* [#151](https://github.com/itsallcode/white-rabbit/pull/151): Fixed failure in PM Smart export if current month view showed a day number and the same number being used as the number of a calendar week. +## [1.6.0] - 2021-05-30 + +See [Release](https://github.com/itsallcode/white-rabbit/releases/tag/v1.6.0) / [Milestone](https://github.com/itsallcode/white-rabbit/milestone/8?closed=1) ### Added @@ -26,10 +25,17 @@ See [Release](https://github.com/itsallcode/white-rabbit/releases/tag/v1.6.0) / ### Fixed +* [#151](https://github.com/itsallcode/white-rabbit/pull/151): Fixed failure in PM Smart export if current month view showed a day number and the same number being used as the number of a calendar week. * [#127](https://github.com/itsallcode/white-rabbit/issues/127): Autocomplete must show most frequently text on top. * [#133](https://github.com/itsallcode/white-rabbit/pull/133): Fix pmsmart export: skip non-working days. * Opening the logs, data or plugin directory now creates the directory if it does not yet exist. +### Changed + +* [#149](https://github.com/itsallcode/white-rabbit/pull/149): Enlarged width/height of scrollbars to make them easier to click on. +* [#152](https://github.com/itsallcode/white-rabbit/issues/152): Display short day of week without dot or comma. +* [#111](https://github.com/itsallcode/white-rabbit/pull/111): Display week ends in other color. + ## [1.5.0] - 2021-02-20 See [Release](https://github.com/itsallcode/white-rabbit/releases/tag/v1.5.0) / [Milestone](https://github.com/itsallcode/white-rabbit/milestone/7?closed=1) diff --git a/README.md b/README.md index 0845bdcd..c1a1804e 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,12 @@ A time recording tool [![Build](https://github.com/itsallcode/white-rabbit/workflows/Build/badge.svg)](https://github.com/itsallcode/white-rabbit/actions?query=workflow%3ABuild) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode.whiterabbit%3Awhite-rabbit&metric=alert_status)](https://sonarcloud.io/dashboard?id=org.itsallcode.whiterabbit%3Awhite-rabbit) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode.whiterabbit%3Awhite-rabbit&metric=coverage)](https://sonarcloud.io/dashboard?id=org.itsallcode.whiterabbit%3Awhite-rabbit) +[![Maven Central](https://img.shields.io/maven-central/v/org.itsallcode.whiterabbit/whiterabbit-plugin-api.svg?label=Maven%20Central)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.itsallcode.whiterabbit%22%20a%3A%22whiterabbit-plugin-api%22) * [Features](README.md#features) * [Usage](README.md#usage) * [Changelog](CHANGELOG.md) +* [Development](README.md#development) ![Screenshot of WhiteRabbit](screenshot.png) @@ -158,7 +160,7 @@ WhiteRabbit logs to stdout and to `$data/logs/white-rabbit.log` where `$data` is 1. Select menu Reports > Project report 1. Click the "Export to pmsmart" button -### Development +### Development #### Clone and configure @@ -219,19 +221,14 @@ This will build WhiteRabbit, upload it to the AWS S3 bucket and publish the plug 2. Run the following command: ```bash - ./gradlew clean build publish webstart:publishWebstart --info -PreleaseVersion= + ./gradlew clean build publish closeAndReleaseRepository webstart:publishWebstart --info -PreleaseVersion= ``` The release will be written to `jfxui/build/libs/white-rabbit-fx-.jar` and the uploaded content will be available at [https://whiterabbit.chp1.net](https://whiterabbit.chp1.net). Snapshots will be available at [https://oss.sonatype.org/content/repositories/snapshots/org/itsallcode/whiterabbit/](https://oss.sonatype.org/content/repositories/snapshots/org/itsallcode/whiterabbit/). -4. Release the artifacts at Maven Central: - 1. Login at [oss.sonatype.org](https://oss.sonatype.org). - 2. Go to the [staging repositories](https://oss.sonatype.org/#stagingRepositories). - 3. Select repository named `orgitsallcode-*` and click the "Close" button. - 4. When closing was successfull, click the "Release" button. - 5. After some time the release will be available at [Maven Central](https://repo1.maven.org/maven2/org/itsallcode/whiterabbit/). 3. Create a new [release](https://github.com/itsallcode/white-rabbit/releases) in GitHub and attach the built jar. 4. Close the [milestone](https://github.com/itsallcode/white-rabbit/milestones) in GitHub. +5. After some time the release will be available at [Maven Central](https://repo1.maven.org/maven2/org/itsallcode/whiterabbit/). #### Managing WebStart configuration in a private branch diff --git a/build.gradle b/build.gradle index 117359f7..fe38acaa 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ plugins { id 'eclipse' id "org.sonarqube" version "3.2.0" id "org.jetbrains.gradle.plugin.idea-ext" version "1.0" + id "io.codearte.nexus-staging" version "0.30.0" id 'com.github.johnrengelman.shadow' version '7.0.0' apply false id "com.moowork.node" version "1.3.1" apply false } @@ -71,3 +72,17 @@ subprojects { rootProject.tasks["sonarqube"].dependsOn(tasks["jacocoTestReport"]) } + +def getOptionalProperty(String name) { + if(project.hasProperty(name)) { + return project.property(name) + } + logger.info("Project property '${name}' not available. Please it to ~/.gradle/gradle.properties") + return null +} + +nexusStaging { + packageGroup = "org.itsallcode" + username = getOptionalProperty("ossrhUsername") + password = getOptionalProperty("ossrhPassword") +}