From d158a1094b6ec71f0097908cf0b814a8435db705 Mon Sep 17 00:00:00 2001 From: Vulpovile Date: Sat, 11 Jan 2025 11:33:13 -0800 Subject: [PATCH 1/4] Update to use Java 5, remove annotation --- .classpath | 2 +- .settings/org.eclipse.jdt.core.prefs | 6 +++--- src/com/flaremicro/crossjeeves/net/StreamForwarder.java | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.classpath b/.classpath index 519f65c..9df503b 100644 --- a/.classpath +++ b/.classpath @@ -2,7 +2,7 @@ - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 8000cd6..416f4fb 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,11 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/src/com/flaremicro/crossjeeves/net/StreamForwarder.java b/src/com/flaremicro/crossjeeves/net/StreamForwarder.java index 1a5828f..ab79a12 100644 --- a/src/com/flaremicro/crossjeeves/net/StreamForwarder.java +++ b/src/com/flaremicro/crossjeeves/net/StreamForwarder.java @@ -60,7 +60,6 @@ public class StreamForwarder { System.out.println(s); } - @Override public void run() { BufferedReader reader = null; try -- 2.39.5 From 293ffc604a31b810bce55c1ef572242c051d3f0a Mon Sep 17 00:00:00 2001 From: Vulpovile Date: Sat, 11 Jan 2025 11:36:58 -0800 Subject: [PATCH 2/4] Add reporting --- Jenkinsfile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 61c34c4..43737f2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,4 +36,14 @@ pipeline { } } } + post { + success { + // Report success to Gitea + giteaSetCommitStatus(context: 'success', description: 'Build Passed', targetUrl: env.BUILD_URL) + } + failure { + // Report failure to Gitea + giteaSetCommitStatus(context: 'failure', description: 'Build Failed', targetUrl: env.BUILD_URL) + } + } } -- 2.39.5 From bdef05f4e9d9cbf6debebbdb77a1a7b416830be1 Mon Sep 17 00:00:00 2001 From: Vulpovile Date: Sat, 11 Jan 2025 11:38:26 -0800 Subject: [PATCH 3/4] Remove broken stage --- Jenkinsfile | 10 ---------- .../net/packet/test/Packet127KeepAliveTest.java | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 43737f2..61c34c4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,14 +36,4 @@ pipeline { } } } - post { - success { - // Report success to Gitea - giteaSetCommitStatus(context: 'success', description: 'Build Passed', targetUrl: env.BUILD_URL) - } - failure { - // Report failure to Gitea - giteaSetCommitStatus(context: 'failure', description: 'Build Failed', targetUrl: env.BUILD_URL) - } - } } diff --git a/test/com/flaremicro/crossjeeves/net/packet/test/Packet127KeepAliveTest.java b/test/com/flaremicro/crossjeeves/net/packet/test/Packet127KeepAliveTest.java index 86537ba..b332984 100644 --- a/test/com/flaremicro/crossjeeves/net/packet/test/Packet127KeepAliveTest.java +++ b/test/com/flaremicro/crossjeeves/net/packet/test/Packet127KeepAliveTest.java @@ -27,7 +27,7 @@ public class Packet127KeepAliveTest extends PacketTestBase { packet.sendPacket(output()); - assertEquals(127, input().readByte()); + assertEquals(117, input().readByte()); } @Test -- 2.39.5 From 5469e6424934cedba1bf90a3dfc2a888064dabf9 Mon Sep 17 00:00:00 2001 From: Vulpovile Date: Sat, 11 Jan 2025 11:45:09 -0800 Subject: [PATCH 4/4] Fix broken pipeline --- .../crossjeeves/net/packet/test/Packet127KeepAliveTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/com/flaremicro/crossjeeves/net/packet/test/Packet127KeepAliveTest.java b/test/com/flaremicro/crossjeeves/net/packet/test/Packet127KeepAliveTest.java index b332984..86537ba 100644 --- a/test/com/flaremicro/crossjeeves/net/packet/test/Packet127KeepAliveTest.java +++ b/test/com/flaremicro/crossjeeves/net/packet/test/Packet127KeepAliveTest.java @@ -27,7 +27,7 @@ public class Packet127KeepAliveTest extends PacketTestBase { packet.sendPacket(output()); - assertEquals(117, input().readByte()); + assertEquals(127, input().readByte()); } @Test -- 2.39.5