From 0eb3df40c6b6a06f21247eea666723aba7eeb2c2 Mon Sep 17 00:00:00 2001 From: Timotej Ecimovic Date: Sat, 5 Jul 2025 10:27:03 -0400 Subject: [PATCH 1/6] Cleanup and add sonar props. --- .gitignore | 1 - pcap/.classpath | 2 +- pcap/.settings/org.eclipse.jdt.core.prefs | 14 +++++++++++--- sonar-project.properties | 7 +++++++ 4 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 sonar-project.properties diff --git a/.gitignore b/.gitignore index 819a24e..d143089 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,5 @@ build_pcap.stamp # SonarQube scans .scannerwork/ -sonar-project.properties release/ diff --git a/pcap/.classpath b/pcap/.classpath index bfdccfd..6c1e625 100644 --- a/pcap/.classpath +++ b/pcap/.classpath @@ -19,7 +19,7 @@ - + diff --git a/pcap/.settings/org.eclipse.jdt.core.prefs b/pcap/.settings/org.eclipse.jdt.core.prefs index 8c6d3aa..2197060 100644 --- a/pcap/.settings/org.eclipse.jdt.core.prefs +++ b/pcap/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,15 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=21 +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.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 0000000..4bf1ffa --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,7 @@ +sonar.projectKey=java-pcap +sonar.projectName=Java PCAP - open source +sonar.language=java + +sonar.sources=./pcap/src/main +sonar.tests=./pcap/src/test +sonar.java.binaries=./pcap/build/libs From 55bcea9fde1b4a810a335a3e9f1db673d2e2a833 Mon Sep 17 00:00:00 2001 From: Timotej Ecimovic Date: Sat, 5 Jul 2025 10:38:16 -0400 Subject: [PATCH 2/6] Force java 11. --- pcap/build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pcap/build.gradle b/pcap/build.gradle index b80a2f8..53c4dd0 100644 --- a/pcap/build.gradle +++ b/pcap/build.gradle @@ -2,6 +2,12 @@ plugins { id 'java-library' } +java { + toolchain { + languageVersion = JavaLanguageVersion.of(11) + } +} + project.ext.set('archiveName', 'java-pcap') project.ext.set('pcapVersion', file('VERSION').text.trim()) project.ext.set('buildDate', new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").format(new Date())) From a953c30a97533602c28f14f06ee646c37a956f9e Mon Sep 17 00:00:00 2001 From: Timotej Ecimovic Date: Sat, 5 Jul 2025 10:40:40 -0400 Subject: [PATCH 3/6] Update sonar props. --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 4bf1ffa..9d50a68 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -4,4 +4,4 @@ sonar.language=java sonar.sources=./pcap/src/main sonar.tests=./pcap/src/test -sonar.java.binaries=./pcap/build/libs +sonar.java.binaries=./pcap/build/libs/*.jar From f64dd0777acf78f1f4ef63d5574607f1b96691c4 Mon Sep 17 00:00:00 2001 From: Timotej Ecimovic Date: Sat, 5 Jul 2025 11:00:09 -0400 Subject: [PATCH 4/6] Fix the sonar props. --- sonar-project.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sonar-project.properties b/sonar-project.properties index 9d50a68..358f434 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,6 +2,6 @@ sonar.projectKey=java-pcap sonar.projectName=Java PCAP - open source sonar.language=java -sonar.sources=./pcap/src/main -sonar.tests=./pcap/src/test -sonar.java.binaries=./pcap/build/libs/*.jar +sonar.sources=./java-pcap/pcap/src/main +sonar.tests=./java-pcap/pcap/src/test +sonar.java.binaries=./java-pcap/pcap/build/libs/*.jar From 432b216764163ce39cf3b54d099180244ebff981 Mon Sep 17 00:00:00 2001 From: Timotej Ecimovic Date: Sat, 5 Jul 2025 11:31:01 -0400 Subject: [PATCH 5/6] Remove a directory layer. --- sonar-project.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sonar-project.properties b/sonar-project.properties index 358f434..9d50a68 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,6 +2,6 @@ sonar.projectKey=java-pcap sonar.projectName=Java PCAP - open source sonar.language=java -sonar.sources=./java-pcap/pcap/src/main -sonar.tests=./java-pcap/pcap/src/test -sonar.java.binaries=./java-pcap/pcap/build/libs/*.jar +sonar.sources=./pcap/src/main +sonar.tests=./pcap/src/test +sonar.java.binaries=./pcap/build/libs/*.jar From 8772fc4aea798def350bb1ac8a3190a7185c2b7c Mon Sep 17 00:00:00 2001 From: Timotej Ecimovic Date: Sat, 5 Jul 2025 11:44:08 -0400 Subject: [PATCH 6/6] Use different sonar pattern. --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 9d50a68..6673367 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -4,4 +4,4 @@ sonar.language=java sonar.sources=./pcap/src/main sonar.tests=./pcap/src/test -sonar.java.binaries=./pcap/build/libs/*.jar +sonar.java.binaries=**/build/**