no transitive module declaration, IntelliJ IDEA craziness
This commit is contained in:
parent
38d45986ac
commit
b1048862bf
12 changed files with 42 additions and 16 deletions
|
@ -1,6 +1,6 @@
|
||||||
group = org.xbib
|
group = org.xbib
|
||||||
name = netty-http
|
name = netty-http
|
||||||
version = 4.1.58.0
|
version = 4.1.58.1
|
||||||
|
|
||||||
gradle.wrapper.version = 6.6.1
|
gradle.wrapper.version = 6.6.1
|
||||||
netty.version = 4.1.58.Final
|
netty.version = 4.1.58.Final
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
module org.xbib.netty.http.client.api {
|
module org.xbib.netty.http.client.api {
|
||||||
exports org.xbib.netty.http.client.api;
|
exports org.xbib.netty.http.client.api;
|
||||||
requires transitive org.xbib.netty.http.common;
|
requires org.xbib.netty.http.common;
|
||||||
|
requires org.xbib.net.url;
|
||||||
|
requires io.netty.transport;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
dependencies {
|
dependencies {
|
||||||
api project(':netty-http-client')
|
api project(':netty-http-client')
|
||||||
|
api project(':netty-http-client-api')
|
||||||
|
api project(':netty-http-common')
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,9 @@
|
||||||
module org.xbib.netty.http.client.rest {
|
module org.xbib.netty.http.client.rest {
|
||||||
exports org.xbib.netty.http.client.rest;
|
exports org.xbib.netty.http.client.rest;
|
||||||
requires transitive org.xbib.netty.http.client;
|
requires org.xbib.netty.http.common;
|
||||||
|
requires org.xbib.netty.http.client;
|
||||||
|
requires org.xbib.netty.http.client.api;
|
||||||
|
requires io.netty.buffer;
|
||||||
|
requires io.netty.codec.http;
|
||||||
|
requires org.xbib.net.url;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
api project(":netty-http-client-api")
|
api project(":netty-http-client-api")
|
||||||
|
api project(":netty-http-common")
|
||||||
api "io.netty:netty-handler-proxy:${project.property('netty.version')}"
|
api "io.netty:netty-handler-proxy:${project.property('netty.version')}"
|
||||||
testImplementation "com.fasterxml.jackson.core:jackson-databind:${project.property('jackson.version')}"
|
testImplementation "com.fasterxml.jackson.core:jackson-databind:${project.property('jackson.version')}"
|
||||||
testImplementation "org.conscrypt:conscrypt-openjdk-uber:${project.property('conscrypt.version')}"
|
testImplementation "org.conscrypt:conscrypt-openjdk-uber:${project.property('conscrypt.version')}"
|
||||||
|
|
|
@ -11,8 +11,16 @@ module org.xbib.netty.http.client {
|
||||||
exports org.xbib.netty.http.client.pool;
|
exports org.xbib.netty.http.client.pool;
|
||||||
exports org.xbib.netty.http.client.retry;
|
exports org.xbib.netty.http.client.retry;
|
||||||
exports org.xbib.netty.http.client.transport;
|
exports org.xbib.netty.http.client.transport;
|
||||||
requires transitive org.xbib.netty.http.client.api;
|
requires org.xbib.netty.http.client.api;
|
||||||
|
requires org.xbib.netty.http.common;
|
||||||
|
requires org.xbib.net.url;
|
||||||
requires io.netty.handler.proxy;
|
requires io.netty.handler.proxy;
|
||||||
requires java.logging;
|
requires java.logging;
|
||||||
|
requires io.netty.transport;
|
||||||
|
requires io.netty.buffer;
|
||||||
|
requires io.netty.codec.http;
|
||||||
|
requires io.netty.codec.http2;
|
||||||
|
requires io.netty.handler;
|
||||||
|
requires io.netty.common;
|
||||||
provides org.xbib.netty.http.client.api.ClientProtocolProvider with Http1, Http2;
|
provides org.xbib.netty.http.client.api.ClientProtocolProvider with Http1, Http2;
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,7 +36,7 @@ class PoolTest {
|
||||||
|
|
||||||
private static final int TEST_STEP_TIME_SECONDS = 50;
|
private static final int TEST_STEP_TIME_SECONDS = 50;
|
||||||
|
|
||||||
private static final int BATCH_SIZE = 0x1000;
|
private static final int BATCH_SIZE = 0x100;
|
||||||
|
|
||||||
@ParameterizedTest
|
@ParameterizedTest
|
||||||
@ValueSource(ints = {1,10,100})
|
@ValueSource(ints = {1,10,100})
|
||||||
|
|
|
@ -4,13 +4,13 @@ module org.xbib.netty.http.common {
|
||||||
exports org.xbib.netty.http.common.mime;
|
exports org.xbib.netty.http.common.mime;
|
||||||
exports org.xbib.netty.http.common.security;
|
exports org.xbib.netty.http.common.security;
|
||||||
exports org.xbib.netty.http.common.util;
|
exports org.xbib.netty.http.common.util;
|
||||||
requires transitive org.xbib.net.url;
|
requires org.xbib.net.url;
|
||||||
requires transitive io.netty.buffer;
|
requires io.netty.buffer;
|
||||||
requires transitive io.netty.common;
|
requires io.netty.common;
|
||||||
requires transitive io.netty.transport;
|
requires io.netty.transport;
|
||||||
requires transitive io.netty.handler;
|
requires io.netty.handler;
|
||||||
requires transitive io.netty.codec;
|
requires io.netty.codec;
|
||||||
requires transitive io.netty.codec.http;
|
requires io.netty.codec.http;
|
||||||
requires transitive io.netty.codec.http2;
|
requires io.netty.codec.http2;
|
||||||
requires java.logging;
|
requires java.logging;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,5 +2,8 @@ module org.xbib.netty.http.server.api {
|
||||||
exports org.xbib.netty.http.server.api;
|
exports org.xbib.netty.http.server.api;
|
||||||
exports org.xbib.netty.http.server.api.annotation;
|
exports org.xbib.netty.http.server.api.annotation;
|
||||||
exports org.xbib.netty.http.server.api.security;
|
exports org.xbib.netty.http.server.api.security;
|
||||||
requires transitive org.xbib.netty.http.common;
|
requires org.xbib.netty.http.common;
|
||||||
|
requires org.xbib.net.url;
|
||||||
|
requires io.netty.buffer;
|
||||||
|
requires io.netty.codec.http;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
module org.xbib.netty.http.server.rest {
|
module org.xbib.netty.http.server.rest {
|
||||||
exports org.xbib.netty.http.server.rest;
|
exports org.xbib.netty.http.server.rest;
|
||||||
exports org.xbib.netty.http.server.rest.util;
|
exports org.xbib.netty.http.server.rest.util;
|
||||||
requires transitive org.xbib.netty.http.server;
|
requires org.xbib.netty.http.server;
|
||||||
|
requires io.netty.transport;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
api project(":netty-http-server-api")
|
api project(":netty-http-server-api")
|
||||||
|
api project(":netty-http-common")
|
||||||
testImplementation project(":netty-http-client")
|
testImplementation project(":netty-http-client")
|
||||||
testImplementation project(":netty-http-bouncycastle")
|
testImplementation project(":netty-http-bouncycastle")
|
||||||
testRuntimeOnly "org.javassist:javassist:${project.property('javassist.version')}"
|
testRuntimeOnly "org.javassist:javassist:${project.property('javassist.version')}"
|
||||||
|
|
|
@ -13,7 +13,10 @@ module org.xbib.netty.http.server {
|
||||||
exports org.xbib.netty.http.server.protocol.http1;
|
exports org.xbib.netty.http.server.protocol.http1;
|
||||||
exports org.xbib.netty.http.server.protocol.http2;
|
exports org.xbib.netty.http.server.protocol.http2;
|
||||||
exports org.xbib.netty.http.server.util;
|
exports org.xbib.netty.http.server.util;
|
||||||
requires transitive org.xbib.netty.http.server.api;
|
requires org.xbib.netty.http.server.api;
|
||||||
|
requires org.xbib.netty.http.common;
|
||||||
|
requires org.xbib.net.url;
|
||||||
requires java.logging;
|
requires java.logging;
|
||||||
|
requires io.netty.transport;
|
||||||
provides org.xbib.netty.http.server.api.ServerProtocolProvider with Http1, Http2;
|
provides org.xbib.netty.http.server.api.ServerProtocolProvider with Http1, Http2;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue