diff --git a/build.gradle b/build.gradle index 356bb11..c731b56 100644 --- a/build.gradle +++ b/build.gradle @@ -35,17 +35,15 @@ subprojects { configurations { asciidoclet - wagon } dependencies { testImplementation "org.junit.jupiter:junit-jupiter-api:${project.property('junit.version')}" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${project.property('junit.version')}" testImplementation "org.apache.logging.log4j:log4j-core:${project.property('log4j.version')}" testImplementation "org.apache.logging.log4j:log4j-jul:${project.property('log4j.version')}" testImplementation "org.apache.logging.log4j:log4j-slf4j-impl:${project.property('log4j.version')}" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${project.property('junit.version')}" asciidoclet "org.xbib:asciidoclet:${project.property('asciidoclet.version')}" - wagon "org.apache.maven.wagon:wagon-ssh:${project.property('wagon.version')}" } compileJava { diff --git a/elx-http/src/main/java/org/xbib/elx/http/HttpAction.java b/elx-http/src/main/java/org/xbib/elx/http/HttpAction.java index 2d647c8..57e0dc8 100644 --- a/elx-http/src/main/java/org/xbib/elx/http/HttpAction.java +++ b/elx-http/src/main/java/org/xbib/elx/http/HttpAction.java @@ -49,13 +49,6 @@ public abstract class HttpAction getActionInstance(); - /*public final ActionFuture execute(HttpActionContext httpActionContext) { - PlainActionFuture future = PlainActionFuture.newFuture(); - //HttpActionFuture future = new HttpActionFuture<>(); - execute(httpActionContext, future); - return future; - }*/ - final void execute(HttpActionContext httpActionContext, ActionListener listener) throws IOException { try { ActionRequestValidationException validationException = httpActionContext.getRequest().validate(); @@ -66,11 +59,12 @@ public abstract class HttpAction { - logger.log(Level.DEBUG, "got response: " + fullHttpResponse.status().code() + - " headers = " + fullHttpResponse.headers().entries() + - " content = " + fullHttpResponse.content().toString(StandardCharsets.UTF_8)); + if (logger.isDebugEnabled()) { + logger.log(Level.DEBUG, "got response: " + fullHttpResponse.status().code() + + " headers = " + fullHttpResponse.headers().entries() + + " content = " + fullHttpResponse.content().toString(StandardCharsets.UTF_8)); + } httpActionContext.setHttpResponse(fullHttpResponse); if (fullHttpResponse.status().equals(HttpResponseStatus.OK)) { listener.onResponse(parseToResponse(httpActionContext)); diff --git a/gradle.properties b/gradle.properties index ec849f4..6b7b5a6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,6 @@ xbib-netty-http.version = 4.1.35.0 # test junit.version = 5.4.2 -wagon.version = 3.3.2 asciidoclet.version = 1.6.0.0 org.gradle.warning.mode = all diff --git a/gradle/publish.gradle b/gradle/publish.gradle index 8675487..4b652e4 100644 --- a/gradle/publish.gradle +++ b/gradle/publish.gradle @@ -5,22 +5,6 @@ ext { scmDeveloperConnection = 'scm:git:git://github.com/jprante/elx.git' } -task xbibUpload(type: Upload, dependsOn: build) { - group = 'publish' - configuration = configurations.archives - uploadDescriptor = true - repositories { - if (project.hasProperty("xbibUsername")) { - mavenDeployer { - configuration = configurations.wagon - repository(url: uri(project.property('xbibUrl'))) { - authentication(userName: xbibUsername, privateKey: xbibPrivateKey) - } - } - } - } -} - task sonaTypeUpload(type: Upload, dependsOn: build) { group = 'publish' configuration = configurations.archives