diff --git a/all/pom.xml b/all/pom.xml index baf77cd591..9b1b0fa92f 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -505,7 +505,7 @@ -link http://code.google.com/apis/protocolbuffers/docs/reference/java/ -link http://docs.oracle.com/javaee/6/api/ -link http://www.slf4j.org/apidocs/ - -link http://commons.apache.org/proper/commons-logging/javadocs/api-1.1.2/ + -link https://commons.apache.org/proper/commons-logging/apidocs/ -link http://logging.apache.org/log4j/1.2/apidocs/ -group "Low-level data representation" io.netty.buffer* diff --git a/common/pom.xml b/common/pom.xml index 41e84b5e0c..4a5f5a1848 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -104,7 +104,7 @@ org.apache.felix maven-bundle-plugin - 2.4.0 + 2.5.4 generate-manifest diff --git a/common/src/main/java/io/netty/util/internal/PlatformDependent.java b/common/src/main/java/io/netty/util/internal/PlatformDependent.java index 0226c9693c..ca34bcd353 100644 --- a/common/src/main/java/io/netty/util/internal/PlatformDependent.java +++ b/common/src/main/java/io/netty/util/internal/PlatformDependent.java @@ -26,6 +26,7 @@ import org.jctools.queues.SpscLinkedQueue; import org.jctools.queues.atomic.MpscAtomicArrayQueue; import org.jctools.queues.atomic.MpscLinkedAtomicQueue; import org.jctools.queues.atomic.SpscLinkedAtomicQueue; +import org.jctools.util.Pow2; import java.io.BufferedReader; import java.io.File; @@ -83,12 +84,11 @@ public final class PlatformDependent { private static final boolean DIRECT_BUFFER_PREFERRED = HAS_UNSAFE && !SystemPropertyUtil.getBoolean("io.netty.noPreferDirect", false); private static final long MAX_DIRECT_MEMORY = maxDirectMemory0(); + private static final int MPSC_CHUNK_SIZE = 1024; private static final int MIN_MAX_MPSC_CAPACITY = MPSC_CHUNK_SIZE * 2; private static final int DEFAULT_MAX_MPSC_CAPACITY = MPSC_CHUNK_SIZE * MPSC_CHUNK_SIZE; - // This is currently the maximal allowed capacity in JCTools. - // See https://github.com/JCTools/JCTools/issues/115 - private static final int MAX_ALLOWED_MPSC_CAPACITY = Integer.MAX_VALUE >> 2; + private static final int MAX_ALLOWED_MPSC_CAPACITY = Pow2.MAX_POW2; private static final long ARRAY_BASE_OFFSET = arrayBaseOffset0(); diff --git a/pom.xml b/pom.xml index f0a13cc8ed..c2ba8dae3e 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ org.jacoco jacoco-maven-plugin - 0.7.5.201505241946 + 0.7.7.201606060606 jacoco-prepare-agent @@ -202,9 +202,9 @@ UTF-8 UTF-8 22 - 1.3.18.GA - 1.0.1.Final - "${settings.localRepository}"/kr/motd/javaagent/jetty-alpn-agent/${jetty.alpnAgent.version}/jetty-alpn-agent-${jetty.alpnAgent.version}.jar + 1.4.11.Final + 2.0.1 + "${settings.localRepository}"/org/mortbay/jetty/alpn/jetty-alpn-agent/${jetty.alpnAgent.version}/jetty-alpn-agent-${jetty.alpnAgent.version}.jar -server -dsa -da -ea:io.netty... @@ -229,6 +229,7 @@ ${os.detected.name}-${os.detected.arch} ${project.basedir}/../common/src/test/resources/logback-test.xml debug + 2.6.1 @@ -325,7 +326,7 @@ org.jctools jctools-core - 1.2 + 1.2.1 @@ -359,7 +360,7 @@ org.apache.logging.log4j log4j-api - 2.3 + ${log4j2.version} log4j @@ -415,7 +416,7 @@ org.easymock easymock - 3.2 + 3.4 test @@ -482,7 +483,7 @@ org.apache.logging.log4j log4j-core - 2.3 + ${log4j2.version} test @@ -551,7 +552,7 @@ kr.motd.maven os-maven-plugin - 1.4.1.Final + 1.5.0.Final @@ -588,7 +589,7 @@ maven-compiler-plugin - 3.1 + 3.5.1 1.7 true @@ -619,20 +620,20 @@ be used even when compiling with java 1.7+ --> org.codehaus.mojo animal-sniffer-maven-plugin - 1.9 + 1.11 org.ow2.asm asm-all - 5.0.3 + 5.1 org.codehaus.mojo.signature java16 - 1.0 + 1.1 sun.misc.Unsafe @@ -681,7 +682,7 @@ maven-checkstyle-plugin - 2.10 + 2.12.1 check-style @@ -743,7 +744,7 @@ get - kr.motd.javaagent + org.mortbay.jetty.alpn jetty-alpn-agent ${jetty.alpnAgent.version} @@ -779,7 +780,7 @@ org.apache.felix maven-bundle-plugin - 2.4.0 + 2.5.4 generate-manifest @@ -807,7 +808,7 @@ org.codehaus.mojo build-helper-maven-plugin - 1.8 + 1.10 parse-version @@ -820,7 +821,7 @@ maven-source-plugin - 2.2.1 + 3.0.1 @@ -861,7 +862,7 @@ maven-javadoc-plugin - 2.9.1 + 2.10.4 false true @@ -872,14 +873,15 @@ maven-deploy-plugin - 2.7 + 2.8.2 10 maven-release-plugin - 2.4.2 + + 2.5.3 false -P restricted-release,sonatype-oss-release,full @@ -891,12 +893,12 @@ org.apache.maven.scm maven-scm-api - 1.8.1 + 1.9.4 org.apache.maven.scm maven-scm-provider-gitexe - 1.8.1 + 1.9.4 @@ -979,12 +981,12 @@ org.apache.ant ant - 1.8.2 + 1.9.7 org.apache.ant ant-launcher - 1.8.2 + 1.9.7 ant-contrib @@ -1005,33 +1007,33 @@ maven-enforcer-plugin - 1.3.1 + 1.4.1 com.ceilfors.maven.plugin enforcer-rules - 1.1.0 + 1.2.0 maven-surefire-plugin - 2.15 + 2.19.1 maven-failsafe-plugin - 2.15 + 2.19.1 maven-clean-plugin - 2.5 + 3.0.0 maven-resources-plugin - 2.6 + 3.0.1 org.ops4j.pax.exam @@ -1040,7 +1042,7 @@ maven-jar-plugin - 2.5 + 3.0.2 default-jar @@ -1058,11 +1060,11 @@ maven-dependency-plugin - 2.8 + 2.10 maven-assembly-plugin - 2.4 + 2.6 @@ -1071,7 +1073,7 @@ maven-antrun-plugin - 1.7 + 1.8 ant-contrib @@ -1089,12 +1091,12 @@ org.codehaus.mojo build-helper-maven-plugin - 1.8 + 1.10 org.fusesource.hawtjni maven-hawtjni-plugin - 1.10 + 1.14 kr.motd.maven diff --git a/testsuite-osgi/pom.xml b/testsuite-osgi/pom.xml index 2cc6a278c5..1b23041812 100644 --- a/testsuite-osgi/pom.xml +++ b/testsuite-osgi/pom.xml @@ -29,7 +29,7 @@ Netty/Testsuite/OSGI - 4.4.0 + 4.9.1 false @@ -137,19 +137,19 @@ org.ops4j.pax.url pax-url-wrap - 2.3.0 + 2.4.7 org.osgi org.osgi.core - 5.0.0 + 6.0.0 test org.apache.felix org.apache.felix.framework - 4.6.0 + 5.4.0 test