From 74333d93be3809c9da8341f2af5c35aa41e61ccf Mon Sep 17 00:00:00 2001 From: Benoit Plessis Date: Thu, 4 Dec 2025 10:35:11 +0100 Subject: [PATCH 1/8] #12 - add a flatten pom step to fix published pom.xml --- pom.xml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pom.xml b/pom.xml index 2b9efea..dd56049 100755 --- a/pom.xml +++ b/pom.xml @@ -93,6 +93,31 @@ + + org.codehaus.mojo + flatten-maven-plugin + 1.7.3 + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + From fee2a0b719881e2ab17e3537f8652befefdacdc7 Mon Sep 17 00:00:00 2001 From: Benoit Plessis Date: Thu, 4 Dec 2025 10:39:13 +0100 Subject: [PATCH 2/8] formatting --- .gitignore | 3 +++ pom.xml | 34 ++++++++++++++++++---------------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 37b730b..b203882 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,6 @@ replay_pid* # maven build directories target/* + +# Flattened POM files (generated by flatten-maven-plugin) +.flattened-pom.xml diff --git a/pom.xml b/pom.xml index dd56049..72a7b1c 100755 --- a/pom.xml +++ b/pom.xml @@ -98,24 +98,26 @@ flatten-maven-plugin 1.7.3 - true - resolveCiFriendliesOnly + true + oss - - flatten - process-resources - - flatten - - - - flatten.clean - clean - - clean - - + + + flatten + process-resources + + flatten + + + + + flatten.clean + clean + + clean + + From 14c1fba6b6f075bdf0a64145fd216f0aba413e6f Mon Sep 17 00:00:00 2001 From: Benoit Plessis Date: Thu, 4 Dec 2025 10:43:08 +0100 Subject: [PATCH 3/8] fix release tag --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d18db78..2c8ea15 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: - name: Checkout code uses: actions/checkout@v6 with: - fetch-depth: 1 + fetch-depth: 0 # required to get all tags - name: Set up JDK 17 uses: actions/setup-java@v5 From d231e455eb2ceafb4b83d9f0f7d8afcf8ef3ea76 Mon Sep 17 00:00:00 2001 From: Benoit Plessis Date: Thu, 4 Dec 2025 11:05:20 +0100 Subject: [PATCH 4/8] Fix groupId --- pom.xml | 2 +- proxy-socket-core/pom.xml | 2 +- proxy-socket-guava/pom.xml | 2 +- proxy-socket-udp/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 72a7b1c..9b2b9ca 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - net.airvantage + net.airvantage.proxysocket proxy-socket-java ${revision} pom diff --git a/proxy-socket-core/pom.xml b/proxy-socket-core/pom.xml index 0e2ffa2..1479c78 100644 --- a/proxy-socket-core/pom.xml +++ b/proxy-socket-core/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - net.airvantage + net.airvantage.proxysocket proxy-socket-java ${revision} diff --git a/proxy-socket-guava/pom.xml b/proxy-socket-guava/pom.xml index 7246c15..7c94cb2 100644 --- a/proxy-socket-guava/pom.xml +++ b/proxy-socket-guava/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - net.airvantage + net.airvantage.proxysocket proxy-socket-java ${revision} diff --git a/proxy-socket-udp/pom.xml b/proxy-socket-udp/pom.xml index 58fc62c..b54553b 100644 --- a/proxy-socket-udp/pom.xml +++ b/proxy-socket-udp/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - net.airvantage + net.airvantage.proxysocket proxy-socket-java ${revision} From 3428f58ab5fa1227308366ed265e321cc4fdf35c Mon Sep 17 00:00:00 2001 From: Benoit Plessis Date: Thu, 4 Dec 2025 11:08:11 +0100 Subject: [PATCH 5/8] fix groupId -- 2 --- proxy-socket-guava/pom.xml | 2 +- proxy-socket-udp/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/proxy-socket-guava/pom.xml b/proxy-socket-guava/pom.xml index 7c94cb2..fab242d 100644 --- a/proxy-socket-guava/pom.xml +++ b/proxy-socket-guava/pom.xml @@ -14,7 +14,7 @@ - net.airvantage + net.airvantage.proxysocket proxy-socket-core ${project.version} diff --git a/proxy-socket-udp/pom.xml b/proxy-socket-udp/pom.xml index b54553b..c596220 100644 --- a/proxy-socket-udp/pom.xml +++ b/proxy-socket-udp/pom.xml @@ -14,12 +14,12 @@ - net.airvantage + net.airvantage.proxysocket proxy-socket-core ${project.version} - net.airvantage + net.airvantage.proxysocket proxy-socket-core ${project.version} test-jar From 36bfa01076f0851c8eddb49c2d729a5b42a53a03 Mon Sep 17 00:00:00 2001 From: Benoit Plessis Date: Thu, 4 Dec 2025 11:29:32 +0100 Subject: [PATCH 6/8] do not deploy root package --- README.md | 18 ++---------------- pom.xml | 13 ++++++++++++- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 08435b4..4b0d69e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Proxy Socket Java (UDP + TCP, Java 17) +# Proxy Socket Java (UDP, Java 17) ## Overview @@ -6,9 +6,7 @@ Library providing HAProxy Proxy Protocol v2 support for UDP and TCP. Multi-modul - proxy-socket-core: zero dependencies, parser, models, interfaces - proxy-socket-udp: DatagramSocket wrapper -- proxy-socket-tcp: ServerSocket/Socket wrappers - proxy-socket-guava: optional Guava-based cache -- proxy-socket-examples: runnable samples Reference: [HAProxy Proxy Protocol Specifications](https://www.haproxy.org/download/3.3/doc/proxy-protocol.txt) @@ -27,21 +25,9 @@ socket.receive(packet); // header stripped, source set to real client socket.send(packet); // destination rewritten to LB if cached ``` -## Quick start (TCP) - -```java -try (var server = new net.airvantage.proxysocket.tcp.ProxyServerSocket(9998)) { - for (;;) { - var s = (net.airvantage.proxysocket.tcp.ProxySocket) server.accept(); - var header = s.getHeader(); - // header.getSourceAddress() is the real client address - } -} -``` - ## License -MIT License © 2025 Semtech. See `LICENSE`. +BSD-3-Clause License © 2025 Semtech. See [LICENSE.BSD-3-Clause](./LICENSE.BSD-3-Clause). ## Metrics hook diff --git a/pom.xml b/pom.xml index 9b2b9ca..cc6d3bd 100755 --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,7 @@ 1.7.3 true - oss + ossrh @@ -120,6 +120,17 @@ + + + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.1 + + true + + false + From 43ad6b3b5ef95748dec90fd92b3802c99b6a9649 Mon Sep 17 00:00:00 2001 From: Benoit Plessis Date: Thu, 4 Dec 2025 11:34:47 +0100 Subject: [PATCH 7/8] bump plugin --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cc6d3bd..e4015f5 100755 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.1 + 3.1.4 true From a6d093ef56b19cebbc481bd042426edac696ad03 Mon Sep 17 00:00:00 2001 From: Benoit Plessis Date: Thu, 4 Dec 2025 14:43:21 +0100 Subject: [PATCH 8/8] move the flattened pom in the target directory --- .gitignore | 3 --- pom.xml | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b203882..37b730b 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,3 @@ replay_pid* # maven build directories target/* - -# Flattened POM files (generated by flatten-maven-plugin) -.flattened-pom.xml diff --git a/pom.xml b/pom.xml index e4015f5..8716359 100755 --- a/pom.xml +++ b/pom.xml @@ -100,6 +100,8 @@ true ossrh + ${project.build.directory} + ${project.artifactId}-${project.version}.pom