diff --git a/README.md b/README.md index 78f4b57..28fab72 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # HttpStatus JSP Tag Library -[![release](https://img.shields.io/github/release/ethauvin/httpstatus.svg)](https://github.com/ethauvin/httpstatus/releases/latest) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/net.thauvin.erik.httpstatus/httpstatus/badge.svg)](https://maven-badges.herokuapp.com/maven-central/net.thauvin.erik.httpstatus/httpstatus) [![Download](https://api.bintray.com/packages/ethauvin/maven/HttpStatus/images/download.svg)](https://bintray.com/ethauvin/maven/HttpStatus/_latestVersion) +[![release](https://img.shields.io/github/release/ethauvin/httpstatus.svg)](https://github.com/ethauvin/httpstatus/releases/latest) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/net.thauvin.erik.httpstatus/httpstatus/badge.svg)](https://maven-badges.herokuapp.com/maven-central/net.thauvin.erik.httpstatus/httpstatus) [![License (3-Clause BSD)](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square)](http://opensource.org/licenses/BSD-3-Clause) [![Known Vulnerabilities](https://snyk.io/test/github/ethauvin/httpstatus/badge.svg?targetFile=build.gradle)](https://snyk.io/test/github/ethauvin/httpstatus?targetFile=build.gradle) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=ethauvin_HttpStatus&metric=alert_status)](https://sonarcloud.io/dashboard?id=ethauvin_HttpStatus) [![Build Status](https://travis-ci.com/ethauvin/HttpStatus.svg?branch=master)](https://travis-ci.com/ethauvin/HttpStatus) [![Build status](https://ci.appveyor.com/api/projects/status/w5j4kul3w2rkigxb?svg=true)](https://ci.appveyor.com/project/ethauvin/httpstatus) [![CircleCI](https://circleci.com/gh/ethauvin/HttpStatus/tree/master.svg?style=shield)](https://circleci.com/gh/ethauvin/HttpStatus/tree/master) diff --git a/build.gradle b/build.gradle index a05ddd8..b1316be 100644 --- a/build.gradle +++ b/build.gradle @@ -6,8 +6,8 @@ plugins { id 'application' id 'maven' id 'maven-publish' + id 'signing' id 'pmd' - id 'com.jfrog.bintray' version '1.8.5' id 'com.github.ben-manes.versions' version '0.38.0' id 'net.thauvin.erik.gradle.semver' version '1.0.4' id 'com.github.spotbugs' version '4.7.0' @@ -46,7 +46,6 @@ ext { repositories { mavenLocal() mavenCentral() - jcenter() } dependencies { @@ -71,15 +70,20 @@ tasks.withType(JavaCompile) { java { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 + withJavadocJar() + withSourcesJar() } javadoc { - title = mavenDescription + ' ' + version + doFirst { + title = mavenDescription + ' ' + project.version + } options.source = 8 options.tags = ['created'] options.author = true options.links('https://docs.oracle.com/javase/8/docs/api/') options.addStringOption('Xdoclint:none', '-quiet') + } jar { @@ -115,61 +119,10 @@ tasks.withType(Checkstyle) { } } -bintray { - user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER') - key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY') - publications = ['MyPublication'] - dryRun = false - pkg { - repo = 'maven' - name = mavenName - licenses = pkgLicenses - desc = mavenDescription - websiteUrl = mavenUrl - issueTrackerUrl = pkgIssueTrackerUrl - vcsUrl = mavenScmCon - labels = pkgLabels - publicDownloadNumbers = true - version { - gpg { - sign = true - } - } - } -} - -bintrayUpload { - versionName = "$project.version" - versionDesc = "$mavenName $project.version" - versionVcsTag = "$project.version" - versionReleased = new Date() -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - group = 'Build' - description = 'Builds an archive of the javadoc docs.' - archiveClassifier = 'javadoc' - from javadoc.destinationDir -} - -task sourcesJar(type: Jar) { - group = 'Build' - description = 'Builds an archive of the source code.' - archiveClassifier = 'sources' - from sourceSets.main.allSource -} - -artifacts { - archives javadocJar - archives sourcesJar -} - publishing { publications { - MyPublication(MavenPublication) { + mavenJava(MavenPublication) { from components.java - artifact sourcesJar - artifact javadocJar groupId project.group artifactId rootProject.name @@ -189,6 +142,7 @@ publishing { id = 'ethauvin' name = 'Erik C. Thauvin' email = 'erik@thauvin.net' + url = 'https://erik.thauvin.net/' } } scm { @@ -201,6 +155,20 @@ publishing { } } +uploadArchives { + repositories.mavenDeployer { + repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") { + authentication(userName: ossrhUsername, password: ossrhPassword) + } + } +} + +signing { + if (project.hasProperty('signing.keyId') && project.hasProperty('signing.password') && project.hasProperty('signing.secretKeyRingFile')) { + sign publishing.publications.mavenJava + } +} + task copyToDeploy(type: Copy) { from(configurations.runtime) { exclude 'javax.servlet-api-*.jar' diff --git a/docs/README.html b/docs/README.html index e127ca7..42b3c8c 100644 --- a/docs/README.html +++ b/docs/README.html @@ -78,7 +78,7 @@ code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warni

HttpStatus JSP Tag Library

-

release Maven Central Download
+

release Maven Central
License (3-Clause BSD) Known Vulnerabilities Quality Gate Status
Build Status Build status CircleCI

A simple JSP Tag Library to display the code, reason and/or cause for HTTP status codes in JSP error pages.