Skip to content

Commit 2e2cf5c

Browse files
rrobettirrobetti
committed
Commit for release version 0.3.1-beta.
1 parent 947b569 commit 2e2cf5c

File tree

6 files changed

+29
-29
lines changed

6 files changed

+29
-29
lines changed

‎.github/workflows/main.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686

8787
- name: Test and Run (ojp-server)
8888
run: |
89-
nohup java -jar ojp-server/target/ojp-server-0.3.1-snapshot-shaded.jar > /tmp/ojp-server.log 2>&1 &
89+
nohup java -jar ojp-server/target/ojp-server-0.3.1-beta-shaded.jar > /tmp/ojp-server.log 2>&1 &
9090
echo $! > /tmp/ojp-server.pid
9191
9292
- name: Wait for ojp-server to start
@@ -176,7 +176,7 @@ jobs:
176176

177177
- name: Test and Run (ojp-server)
178178
run: |
179-
nohup java -jar ojp-server/target/ojp-server-0.3.1-snapshot-shaded.jar > /tmp/ojp-server.log 2>&1 &
179+
nohup java -jar ojp-server/target/ojp-server-0.3.1-beta-shaded.jar > /tmp/ojp-server.log 2>&1 &
180180
echo $! > /tmp/ojp-server.pid
181181
182182
- name: Wait for ojp-server to start
@@ -264,7 +264,7 @@ jobs:
264264

265265
- name: Test and Run (ojp-server)
266266
run: |
267-
nohup java -jar ojp-server/target/ojp-server-0.3.1-snapshot-shaded.jar > /tmp/ojp-server.log 2>&1 &
267+
nohup java -jar ojp-server/target/ojp-server-0.3.1-beta-shaded.jar > /tmp/ojp-server.log 2>&1 &
268268
echo $! > /tmp/ojp-server.pid
269269
270270
- name: Wait for ojp-server to start
@@ -352,7 +352,7 @@ jobs:
352352

353353
- name: Test and Run (ojp-server)
354354
run: |
355-
nohup java -jar ojp-server/target/ojp-server-0.3.1-snapshot-shaded.jar > /tmp/ojp-server.log 2>&1 &
355+
nohup java -jar ojp-server/target/ojp-server-0.3.1-beta-shaded.jar > /tmp/ojp-server.log 2>&1 &
356356
echo $! > /tmp/ojp-server.pid
357357
358358
- name: Wait for ojp-server to start
@@ -430,7 +430,7 @@ jobs:
430430

431431
- name: Test and Run (ojp-server)
432432
run: |
433-
nohup java -jar ojp-server/target/ojp-server-0.3.1-snapshot-shaded.jar > /tmp/ojp-server.log 2>&1 &
433+
nohup java -jar ojp-server/target/ojp-server-0.3.1-beta-shaded.jar > /tmp/ojp-server.log 2>&1 &
434434
echo $! > /tmp/ojp-server.pid
435435
436436
- name: Wait for ojp-server to start
@@ -590,7 +590,7 @@ jobs:
590590

591591
- name: Test and Run (ojp-server)
592592
run: |
593-
nohup java -jar ojp-server/target/ojp-server-0.3.1-snapshot-shaded.jar > /tmp/ojp-server.log 2>&1 &
593+
nohup java -jar ojp-server/target/ojp-server-0.3.1-beta-shaded.jar > /tmp/ojp-server.log 2>&1 &
594594
echo $! > /tmp/ojp-server.pid
595595
596596
- name: Wait for ojp-server to start
@@ -680,15 +680,15 @@ jobs:
680680
- name: Start OJP Server 1 on port 10591
681681
run: |
682682
# Start first server on port 10591 with Prometheus on 9159
683-
nohup java -Dojp.server.port=10591 -Dojp.prometheus.port=9159 -jar ojp-server/target/ojp-server-0.3.1-snapshot-shaded.jar > /tmp/ojp-server-1.log 2>&1 &
683+
nohup java -Dojp.server.port=10591 -Dojp.prometheus.port=9159 -jar ojp-server/target/ojp-server-0.3.1-beta-shaded.jar > /tmp/ojp-server-1.log 2>&1 &
684684
echo $! > /tmp/ojp-server-1.pid
685685
echo "Started OJP Server 1 on gRPC port 10591, Prometheus port 9159 with PID $(cat /tmp/ojp-server-1.pid)"
686686
687687
# Start second OJP server instance on port 10592
688688
- name: Start OJP Server 2 on port 10592
689689
run: |
690690
# Start second server on port 10592 with Prometheus on 9160
691-
nohup java -Dojp.server.port=10592 -Dojp.prometheus.port=9160 -jar ojp-server/target/ojp-server-0.3.1-snapshot-shaded.jar > /tmp/ojp-server-2.log 2>&1 &
691+
nohup java -Dojp.server.port=10592 -Dojp.prometheus.port=9160 -jar ojp-server/target/ojp-server-0.3.1-beta-shaded.jar > /tmp/ojp-server-2.log 2>&1 &
692692
echo $! > /tmp/ojp-server-2.pid
693693
echo "Started OJP Server 2 on gRPC port 10592, Prometheus port 9160 with PID $(cat /tmp/ojp-server-2.pid)"
694694
@@ -795,7 +795,7 @@ jobs:
795795
- name: Restart OJP Server 1
796796
run: |
797797
echo "Restarting OJP Server 1..."
798-
nohup java -Dojp.server.port=10591 -Dojp.prometheus.port=9159 -jar ojp-server/target/ojp-server-0.3.1-snapshot-shaded.jar > /tmp/ojp-server-1-restart.log 2>&1 &
798+
nohup java -Dojp.server.port=10591 -Dojp.prometheus.port=9159 -jar ojp-server/target/ojp-server-0.3.1-beta-shaded.jar > /tmp/ojp-server-1-restart.log 2>&1 &
799799
echo $! > /tmp/ojp-server-1-restart.pid
800800
echo "OJP Server 1 restarted with PID $(cat /tmp/ojp-server-1-restart.pid)"
801801
sleep 10
@@ -878,7 +878,7 @@ jobs:
878878
- name: Restart OJP Server 2
879879
run: |
880880
echo "Restarting OJP Server 2..."
881-
nohup java -Dojp.server.port=10592 -Dojp.prometheus.port=9160 -jar ojp-server/target/ojp-server-0.3.1-snapshot-shaded.jar > /tmp/ojp-server-2-restart.log 2>&1 &
881+
nohup java -Dojp.server.port=10592 -Dojp.prometheus.port=9160 -jar ojp-server/target/ojp-server-0.3.1-beta-shaded.jar > /tmp/ojp-server-2-restart.log 2>&1 &
882882
echo $! > /tmp/ojp-server-2-restart.pid
883883
echo "OJP Server 2 restarted with PID $(cat /tmp/ojp-server-2-restart.pid)"
884884
sleep 10
@@ -981,7 +981,7 @@ jobs:
981981
if: always()
982982
run: |
983983
# Kill any remaining OJP server processes
984-
pkill -f "ojp-server-0.3.1-snapshot-shaded.jar" || true
984+
pkill -f "ojp-server-0.3.1-beta-shaded.jar" || true
985985
# Stop Postgres container
986986
docker stop ojp-postgres-multinode || true
987987
docker rm ojp-postgres-multinode || true
@@ -1056,15 +1056,15 @@ jobs:
10561056
- name: Start OJP Server 1 on port 10591
10571057
run: |
10581058
# Start first server on port 10591 with Prometheus on 9159
1059-
nohup java -Dojp.server.port=10591 -Dojp.prometheus.port=9159 -jar ojp-server/target/ojp-server-0.3.1-snapshot-shaded.jar > /tmp/ojp-server-xa-1.log 2>&1 &
1059+
nohup java -Dojp.server.port=10591 -Dojp.prometheus.port=9159 -jar ojp-server/target/ojp-server-0.3.1-beta-shaded.jar > /tmp/ojp-server-xa-1.log 2>&1 &
10601060
echo $! > /tmp/ojp-server-xa-1.pid
10611061
echo "Started OJP Server 1 on gRPC port 10591, Prometheus port 9159 with PID $(cat /tmp/ojp-server-xa-1.pid)"
10621062
10631063
# Start second OJP server instance on port 10592
10641064
- name: Start OJP Server 2 on port 10592
10651065
run: |
10661066
# Start second server on port 10592 with Prometheus on 9160
1067-
nohup java -Dojp.server.port=10592 -Dojp.prometheus.port=9160 -jar ojp-server/target/ojp-server-0.3.1-snapshot-shaded.jar > /tmp/ojp-server-xa-2.log 2>&1 &
1067+
nohup java -Dojp.server.port=10592 -Dojp.prometheus.port=9160 -jar ojp-server/target/ojp-server-0.3.1-beta-shaded.jar > /tmp/ojp-server-xa-2.log 2>&1 &
10681068
echo $! > /tmp/ojp-server-xa-2.pid
10691069
echo "Started OJP Server 2 on gRPC port 10592, Prometheus port 9160 with PID $(cat /tmp/ojp-server-xa-2.pid)"
10701070
@@ -1179,7 +1179,7 @@ jobs:
11791179
- name: Restart OJP Server 1
11801180
run: |
11811181
echo "Restarting OJP Server 1..."
1182-
nohup java -Dojp.server.port=10591 -Dojp.prometheus.port=9159 -jar ojp-server/target/ojp-server-0.3.1-snapshot-shaded.jar > /tmp/ojp-server-xa-1-restart.log 2>&1 &
1182+
nohup java -Dojp.server.port=10591 -Dojp.prometheus.port=9159 -jar ojp-server/target/ojp-server-0.3.1-beta-shaded.jar > /tmp/ojp-server-xa-1-restart.log 2>&1 &
11831183
echo $! > /tmp/ojp-server-xa-1-restart.pid
11841184
echo "OJP Server 1 restarted with PID $(cat /tmp/ojp-server-xa-1-restart.pid)"
11851185
sleep 10
@@ -1268,7 +1268,7 @@ jobs:
12681268
- name: Restart OJP Server 2
12691269
run: |
12701270
echo "Restarting OJP Server 2..."
1271-
nohup java -Dojp.server.port=10592 -Dojp.prometheus.port=9160 -jar ojp-server/target/ojp-server-0.3.1-snapshot-shaded.jar > /tmp/ojp-server-xa-2-restart.log 2>&1 &
1271+
nohup java -Dojp.server.port=10592 -Dojp.prometheus.port=9160 -jar ojp-server/target/ojp-server-0.3.1-beta-shaded.jar > /tmp/ojp-server-xa-2-restart.log 2>&1 &
12721272
echo $! > /tmp/ojp-server-xa-2-restart.pid
12731273
echo "OJP Server 2 restarted with PID $(cat /tmp/ojp-server-xa-2-restart.pid)"
12741274
sleep 10
@@ -1374,7 +1374,7 @@ jobs:
13741374
if: always()
13751375
run: |
13761376
# Kill any remaining OJP server processes
1377-
pkill -f "ojp-server-0.3.1-snapshot-shaded.jar" || true
1377+
pkill -f "ojp-server-0.3.1-beta-shaded.jar" || true
13781378
# Stop Postgres container
13791379
docker stop ojp-postgres-multinode-xa || true
13801380
docker rm ojp-postgres-multinode-xa || true
@@ -1518,7 +1518,7 @@ jobs:
15181518

15191519
- name: Test and Run (ojp-server)
15201520
run: |
1521-
nohup java -jar ojp-server/target/ojp-server-0.3.1-snapshot-shaded.jar > /tmp/ojp-server.log 2>&1 &
1521+
nohup java -jar ojp-server/target/ojp-server-0.3.1-beta-shaded.jar > /tmp/ojp-server.log 2>&1 &
15221522
echo $! > /tmp/ojp-server.pid
15231523
15241524
- name: Wait for ojp-server to start
@@ -1615,7 +1615,7 @@ jobs:
16151615

16161616
- name: Test and Run (ojp-server)
16171617
run: |
1618-
nohup java -jar ojp-server/target/ojp-server-0.3.1-snapshot-shaded.jar > /tmp/ojp-server.log 2>&1 &
1618+
nohup java -jar ojp-server/target/ojp-server-0.3.1-beta-shaded.jar > /tmp/ojp-server.log 2>&1 &
16191619
echo $! > /tmp/ojp-server.pid
16201620
16211621
- name: Wait for ojp-server to start

‎documents/SQLSERVER_TESTCONTAINER_GUIDE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ All SQL Server test classes have been updated:
3838
#### Local Execution
3939
```bash
4040
# Start OJP server first (requires Java 21+)
41-
java -jar ojp-server/target/ojp-server-0.3.1-snapshot-shaded.jar &
41+
java -jar ojp-server/target/ojp-server-0.3.1-beta-shaded.jar &
4242

4343
# Run SQL Server tests
4444
mvn test -pl ojp-jdbc-driver -DenableSqlServerTests=true -Dtest="SQLServer*"

‎ojp-grpc-commons/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
<name>OJP Commons</name>
88
<artifactId>ojp-grpc-commons</artifactId>
9-
<version>0.3.1-snapshot</version>
9+
<version>0.3.1-beta</version>
1010

1111
<parent>
1212
<groupId>org.openjproxy</groupId>
1313
<artifactId>ojp-parent</artifactId>
14-
<version>0.3.1-snapshot</version>
14+
<version>0.3.1-beta</version>
1515
<relativePath>../pom.xml</relativePath>
1616
</parent>
1717

‎ojp-jdbc-driver/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
<name>OJP JDBC Driver</name>
88
<artifactId>ojp-jdbc-driver</artifactId>
9-
<version>0.3.1-snapshot</version>
9+
<version>0.3.1-beta</version>
1010

1111
<parent>
1212
<groupId>org.openjproxy</groupId>
1313
<artifactId>ojp-parent</artifactId>
14-
<version>0.3.1-snapshot</version>
14+
<version>0.3.1-beta</version>
1515
<relativePath>../pom.xml</relativePath>
1616
</parent>
1717

@@ -25,7 +25,7 @@
2525
<dependency>
2626
<groupId>org.openjproxy</groupId>
2727
<artifactId>ojp-grpc-commons</artifactId>
28-
<version>0.3.1-snapshot</version>
28+
<version>0.3.1-beta</version>
2929
</dependency>
3030

3131

‎ojp-server/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<artifactId>ojp-server</artifactId>
8-
<version>0.3.1-snapshot</version>
8+
<version>0.3.1-beta</version>
99

1010
<parent>
1111
<groupId>org.openjproxy</groupId>
1212
<artifactId>ojp-parent</artifactId>
13-
<version>0.3.1-snapshot</version>
13+
<version>0.3.1-beta</version>
1414
<relativePath>../pom.xml</relativePath>
1515
</parent>
1616

@@ -26,7 +26,7 @@
2626
<dependency>
2727
<groupId>org.openjproxy</groupId>
2828
<artifactId>ojp-grpc-commons</artifactId>
29-
<version>0.3.1-snapshot</version>
29+
<version>0.3.1-beta</version>
3030
</dependency>
3131

3232
<dependency>
@@ -242,7 +242,7 @@
242242
<image>eclipse-temurin:22-jre</image>
243243
</from>
244244
<to>
245-
<image>rrobetti/ojp:0.3.1-snapshot</image>
245+
<image>rrobetti/ojp:0.3.1-beta</image>
246246
</to>
247247
<container>
248248
<mainClass>org.openjproxy.grpc.server.GrpcServer</mainClass>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>org.openjproxy</groupId>
77
<artifactId>ojp-parent</artifactId>
8-
<version>0.3.1-snapshot</version>
8+
<version>0.3.1-beta</version>
99
<packaging>pom</packaging>
1010

1111
<name>OJP Parent</name>

0 commit comments

Comments
 (0)