Skip to content

Commit 58159b9

Browse files
Merge pull request #998 from fbacchella/ipc_unix_socket
IPC using unix socket with Java 16.
2 parents 30b2bf4 + c82fe6c commit 58159b9

37 files changed

+1116
-574
lines changed

.circleci/config.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ jobs:
99
key: jeromq-{{ checksum "pom.xml" }}
1010
- run: mkdir -p /home/circleci/.sonar/cache /home/circleci/.m2/repository
1111
- run:
12-
command: "mvn -B dependency:resolve dependency:resolve-plugins sonar:help jacoco:help checkstyle:help -Psonar,versions,android -s .circleci/settings.xml"
12+
command: |
13+
mvn -B dependency:resolve dependency:resolve-plugins sonar:help jacoco:help gpg:help checkstyle:help -Psonar,versions -fn
1314
- persist_to_workspace:
1415
root: /
1516
paths:
@@ -28,7 +29,7 @@ jobs:
2829
mv -n /tmp/ws/home/circleci/project/* /home/circleci/project/
2930
mv -n /tmp/ws/home/circleci/project/.??* /home/circleci/project/
3031
- run:
31-
command: mvn -B clean compile -Pcheckstyle -s .circleci/settings.xml
32+
command: mvn -B clean verify -DskipTests -s .circleci/settings.xml
3233
environment:
3334
MAVEN_OPTS: "-Xmx2048m"
3435
- persist_to_workspace:
@@ -102,7 +103,9 @@ jobs:
102103
- run:
103104
command: |
104105
mkdir -p /tmp/$CIRCLE_JOB
105-
mvn -B test -Pskip -Darg.line="-Xmx2048m" -Djava.io.tmpdir="/tmp/$CIRCLE_JOB" -s .circleci/settings.xml
106+
# only test core module
107+
cd jeromq-core
108+
mvn -B test -Pskip -Darg.line="-Xmx2048m" -Djava.io.tmpdir="/tmp/$CIRCLE_JOB" -s ../.circleci/settings.xml
106109
environment:
107110
MAVEN_OPTS: "-Xmx512m"
108111
- store_test_results:
@@ -134,7 +137,7 @@ jobs:
134137
PUBLISH="install"
135138
fi
136139
echo "publishing jobs: $PUBLISH"
137-
mvn -B $PUBLISH -Pskip $GPGSIGN -Dmaven.test.skip=true -Dmaven.javadoc.skip=false -s .circleci/settings.xml
140+
mvn -B $PUBLISH -Pskip $GPGSIGN -DskipTests -Dmaven.javadoc.skip=false -s .circleci/settings.xml
138141
environment:
139142
MAVEN_OPTS: "-Xmx2048m"
140143
- store_artifacts:

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ Pieter Hintjens
7373
Piotr Trojanek
7474
Robert G. Jakabosky
7575
Sebastian Otaegui
76+
Spencer Park
7677
Steven McCoy
7778
Stuart Webster
7879
Tamara Kustarova

jeromq-core/pom.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,27 @@
5656
</execution>
5757
</executions>
5858
</plugin>
59+
<plugin>
60+
<groupId>org.apache.maven.plugins</groupId>
61+
<artifactId>maven-jar-plugin</artifactId>
62+
<executions>
63+
<execution>
64+
<goals>
65+
<goal>test-jar</goal>
66+
</goals>
67+
<configuration>
68+
<includes>
69+
<include>zmq/TermEndpointIpcTest.class</include>
70+
<include>zmq/TestTermEndpoint.class</include>
71+
<include>zmq/socket/pair/TestPairIpc.class</include>
72+
<include>zmq/socket/reqrep/TestReqrepIpc.class</include>
73+
<include>zmq/Helper.class</include>
74+
<include>zmq/Helper*.class</include>
75+
</includes>
76+
</configuration>
77+
</execution>
78+
</executions>
79+
</plugin>
5980
</plugins>
6081
</build>
6182
</project>

jeromq-core/src/main/java/zmq/SocketBase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package zmq;
22

33
import java.io.IOException;
4-
import java.net.InetSocketAddress;
4+
import java.net.SocketAddress;
55
import java.nio.channels.SelectableChannel;
66
import java.nio.channels.SocketChannel;
77
import java.util.Collection;
@@ -747,7 +747,7 @@ public final boolean termEndpoint(String addr)
747747
endpoint = endpoints.hasValues(resolvedAddress);
748748
if (!endpoint) {
749749
// no luck, try with local resolution
750-
InetSocketAddress socketAddress = address.resolve(uri.getAddress(), options.ipv6, true);
750+
SocketAddress socketAddress = address.resolve(uri.getAddress(), options.ipv6, true);
751751
resolvedAddress = socketAddress.toString();
752752
}
753753
}

0 commit comments

Comments
 (0)