Versions bump. Removed some debug statements.

mattjlewis · Jan 12, 2024 · 1b0a772 · 1b0a772
1 parent 4911d81
commit 1b0a772
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/diozero-bom/pom.xml b/diozero-bom/pom.xml
@@ -62,35 +62,35 @@
 		<maven.compiler.release>11</maven.compiler.release>
 
 		<!-- Maven plugins -->
-		<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+		<maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
 		<maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version>
-		<maven-javadoc-plugin.version>3.6.0</maven-javadoc-plugin.version>
+		<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
 		<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
 		<maven-shade-plugin.version>3.5.1</maven-shade-plugin.version>
 		<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
 		<maven-install-plugin.version>3.1.1</maven-install-plugin.version>
 		<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
 		<maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
 		<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
-		<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
+		<maven-surefire-plugin.version>3.2.3</maven-surefire-plugin.version>
 
 		<!-- Other plugins -->
 		<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
-		<license-maven-plugin.version>2.2.0</license-maven-plugin.version>
-		<versions-maven-plugin.version>2.16.1</versions-maven-plugin.version>
-		<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
+		<license-maven-plugin.version>2.3.0</license-maven-plugin.version>
+		<versions-maven-plugin.version>2.16.2</versions-maven-plugin.version>
+		<exec-maven-plugin.version>3.1.1</exec-maven-plugin.version>
 		<eclipse.m2e.lifecycle-mapping.version>1.0.0</eclipse.m2e.lifecycle-mapping.version>
 
 		<!-- Libraries -->
 		<tinylog.version>2.6.2</tinylog.version>
 		<hipparchus.version>3.0</hipparchus.version>
 		<eclipse-paho-client-mqttv3.version>1.2.5</eclipse-paho-client-mqttv3.version>
 		<google-gson.version>2.10.1</google-gson.version>
-		<google-protobuf-java.version>3.25.0</google-protobuf-java.version>
-		<netty.version>4.1.100.Final</netty.version>
-		<grpc.version>1.59.0</grpc.version>
-		<junit.version>5.10.0</junit.version>
-		<mockito.version>5.6.0</mockito.version>
+		<google-protobuf-java.version>3.25.1</google-protobuf-java.version>
+		<netty.version>4.1.104.Final</netty.version>
+		<grpc.version>1.60.1</grpc.version>
+		<junit.version>5.10.1</junit.version>
+		<mockito.version>5.8.0</mockito.version>
 	</properties>
 
 	<!-- Prepare common library versions -->

diff --git a/diozero-core/src/main/java/com/diozero/internal/board/GenericLinuxArmBoardInfo.java b/diozero-core/src/main/java/com/diozero/internal/board/GenericLinuxArmBoardInfo.java
@@ -269,7 +269,7 @@ private void addChipMapping(int chipId, String label) {
 
 	@Override
 	public MmapGpioInterface createMmapGpio() {
-		String clz_name = mmapGpioClasses.getProperty(soc);
+		final String clz_name = mmapGpioClasses.getProperty(soc);
 		if (clz_name == null) {
 			return null;
 		}
@@ -283,7 +283,7 @@ public MmapGpioInterface createMmapGpio() {
 
 	@Override
 	public boolean isBiasControlSupported() {
-		Version kernel_version = LocalSystemInfo.getInstance().getKernelVersion();
+		final Version kernel_version = LocalSystemInfo.getInstance().getKernelVersion();
 		return kernel_version != null && (kernel_version.getMajor() >= 6
 				|| (kernel_version.getMajor() == 5 && kernel_version.getMinor() >= 5));
 	}

diff --git a/diozero-core/src/main/java/com/diozero/util/Version.java b/diozero-core/src/main/java/com/diozero/util/Version.java
@@ -12,8 +12,7 @@ public Version(int major, int minor, int point) {
 	}
 
 	public Version(String s) {
-		System.out.println(s);
-		String[] parts = s.split("\\.");
+		final String[] parts = s.split("\\.");
 		major = Integer.parseInt(parts[0]);
 		minor = Integer.parseInt(parts[1]);
 		point = Integer.parseInt(parts[2].split("-")[0]);

diff --git a/diozero-core/src/test/java/com/diozero/sbc/SystemInfoTest.java b/diozero-core/src/test/java/com/diozero/sbc/SystemInfoTest.java
@@ -267,6 +267,8 @@ public void testPi() {
 				Collections.emptyList(), RaspberryPiBoardInfoProvider.SONY, "1.1");
 		validatePiBoard(RaspberryPiBoardInfoProvider.BCM2711, "b03115", RaspberryPiBoardInfoProvider.MODEL_4B, 2 * _1GB,
 				Collections.emptyList(), RaspberryPiBoardInfoProvider.SONY, "1.5");
+		validatePiBoard(RaspberryPiBoardInfoProvider.BCM2711, "c03115", RaspberryPiBoardInfoProvider.MODEL_4B, 4 * _1GB,
+				Collections.emptyList(), RaspberryPiBoardInfoProvider.SONY, "1.5");
 
 		// Pi5B
 		validatePiBoard(RaspberryPiBoardInfoProvider.BCM2712, "d04170", RaspberryPiBoardInfoProvider.MODEL_5B, 8 * _1GB,