erik/HttpStatus
erik/HttpStatus
1
1
Fork 0
Code Issues Pull requests Releases Activity

Moved to Jakarta EE. Closes #7

Browse source
This commit is contained in:
Erik C. Thauvin 2022-08-27 18:08:57 -07:00
parent c4edb4fd1f
commit 45af218f39
20 changed files with 224 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

48
build.gradle
View file

@ -8,8 +8,8 @@ plugins {
id 'pmd'
id 'com.github.ben-manes.versions' version '0.42.0'
id 'net.thauvin.erik.gradle.semver' version '1.0.4'
id 'com.github.spotbugs' version '5.0.6'
id 'org.sonarqube' version '3.3'
id 'com.github.spotbugs' version '5.0.10'
id 'org.sonarqube' version '3.4.0.2513'
}
import com.github.spotbugs.snom.SpotBugsTask
@ -33,8 +33,8 @@ mainClassName = 'net.thauvin.erik.httpstatus.Reasons'
ext {
versions = [
pmd: '6.35.0',
spotbugs: '4.6.0'
pmd : '6.47.0',
spotbugs: '4.7.1'
]
}
@ -45,9 +45,13 @@ repositories {
}
dependencies {
compileOnly 'javax.servlet:javax.servlet-api:4.0.1'
compileOnly 'javax.servlet.jsp:jsp-api:2.2.1-b03'
compileOnly 'javax.el:javax.el-api:3.0.1-b06'
// compileOnly 'javax.servlet:javax.servlet-api:4.0.1'
// compileOnly 'javax.servlet.jsp:jsp-api:2.2.1-b03'
// compileOnly 'javax.el:javax.el-api:3.0.1-b06'
compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0'
compileOnly 'jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.1.0'
compileOnly 'jakarta.el:jakarta.el-api:5.0.1'
spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.12.0'
spotbugsPlugins 'com.mebigfatguy.sb-contrib:sb-contrib:7.4.7'
@ -55,7 +59,7 @@ dependencies {
compileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs"
testCompileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs"
testImplementation 'org.testng:testng:7.5'
testImplementation 'org.testng:testng:7.6.1'
}
tasks.withType(JavaCompile) {
@ -63,8 +67,8 @@ tasks.withType(JavaCompile) {
}
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
withJavadocJar()
withSourcesJar()
}
@ -106,7 +110,7 @@ spotbugs {
}
pmd {
toolVersion = versions.pmd
toolVersion = versions.pmd
ignoreFailures = true
ruleSets = []
ruleSetFiles = files("${projectDir}/config/pmd.xml")
@ -160,7 +164,7 @@ publishing {
url = project.version.contains('SNAPSHOT')
? 'https://oss.sonatype.org/content/repositories/snapshots/'
: 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
}
}
credentials(PasswordCredentials)
}
}
@ -173,7 +177,11 @@ signing {
task copyToDeploy(type: Copy) {
from(configurations.runtimeClasspath) {
exclude('javax.servlet-api-*.jar', 'jsp-api-*.jar')
exclude('javax.servlet-api-*.jar',
'jsp-api-*.jar',
'jakarta.servlet-*.jar',
'jakarta-servlet.*.jar',
'jakarta.el-api*.jar')
}
from jar
into deployDir
@ -197,12 +205,12 @@ task release {
task pandoc(type: Exec) {
group = 'Documentation'
final def pandoc_args = ['--from', 'gfm',
'--to', 'html5',
'--metadata', "pagetitle=$mavenDescription",
'-s',
'-c', 'github-pandoc.css',
'-o', 'docs/README.html',
'README.md']
'--to', 'html5',
'--metadata', "pagetitle=$mavenDescription",
'-s',
'-c', 'github-pandoc.css',
'-o', 'docs/README.html',
'README.md']
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
commandLine(['cmd', '/c', 'pandoc'] + pandoc_args)
} else {
@ -216,7 +224,7 @@ task pandoc(type: Exec) {
}
jacoco {
toolVersion = '0.8.9-SNAPSHOT'
toolVersion = '0.8.9-SNAPSHOT'
}
jacocoTestReport {