Skip to content

Commit 32f7ccf

Browse files
committed
#33 ignore generated, jdk 25, set version for 0.8.0, update parent package id, adjust names
1 parent 3809d13 commit 32f7ccf

11 files changed

Lines changed: 43 additions & 46 deletions

File tree

.gitignore

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,15 @@ jdiskmark.spec
2121
temp_resources
2222

2323
#Maven
24-
target
24+
target/
25+
dependency-reduced-pom.xml
26+
pom.xml.versionsBackup
27+
pom.xml.releaseBackup
28+
release.properties
29+
30+
# VS Code - ignore personal files, keep shared project configs
31+
.vscode/*
32+
!.vscode/settings.json
33+
!.vscode/launch.json
34+
!.vscode/tasks.json
35+
!.vscode/extensions.json

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"java.configuration.updateBuildConfiguration": "automatic"
3+
}

README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,14 +198,18 @@ Source is available on our [github repo](https://github.com/JDiskMark/jdm-java/)
198198
## Release Notes
199199

200200
### v1.0.0 proposed
201+
- simple drive selection
202+
- s.m.a.r.t. diagnostics
203+
204+
### v0.8.0
201205
- TODO: #16 pkg installer (MacOS) - tyler
202206
- TODO: #70 app icon - ian
203207
- TODO: #33 maven build - lane
204208
- TODO: #78 throttle graphics render - val
205209
- TODO: #95 disk cache purging - val
206-
- #67 portal uploads
207-
- TODO: #117 user portal upload acknowledgement
208-
- TODO: #118 test interlock or OAuth upload
210+
- TODO: #67 test portal uploads (no auth)
211+
- TODO: #117 user portal upload acknowledgement
212+
- TODO: #118 test interlock or OAuth upload
209213

210214
### v0.7.0
211215
- #134 zgc optimization

jdm-core/dependency-reduced-pom.xml

Lines changed: 0 additions & 20 deletions
This file was deleted.

jdm-core/pom.xml

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

77
<parent>
88
<groupId>jdiskmark</groupId>
9-
<artifactId>jdiskmark-parent</artifactId>
10-
<version>0.6.0-SNAPSHOT</version>
9+
<artifactId>jdm-java</artifactId>
10+
<version>0.8.0-SNAPSHOT</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313

jdm-core/src/main/java/jdiskmark/Benchmark.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import jakarta.persistence.NamedQuery;
2020
import jakarta.persistence.OneToMany;
2121
import jakarta.persistence.Table;
22+
import org.hibernate.annotations.JdbcTypeCode;
23+
import org.hibernate.type.SqlTypes;
2224
import java.io.IOException;
2325
import java.io.Serializable;
2426
import java.text.DecimalFormat;
@@ -109,14 +111,16 @@ public void serialize(UUID value, JsonGenerator gen, SerializerProvider serializ
109111
*/
110112
@Id
111113
@GeneratedValue(strategy = GenerationType.UUID)
114+
@JdbcTypeCode(SqlTypes.VARCHAR) // Hibernate 6 changed UUID default to VARBINARY; keep VARCHAR to match existing Derby schema
112115
// --- JSON Serialization for MERN App ---
113116

114117
/**
115118
* @JsonProperty("_id"): Ensures that when this object is serialized to JSON,
116119
* the key name for this field is "_id", matching the standard MongoDB primary key convention.
117120
*
118121
* @JsonSerialize(using = UuidToMongoIdSerializer.class): Tells Jackson to use
119-
* our custom inner class serializer to handle the conversion logic of UUID -> JSON string.
122+
* our custom inner class serializer to handle the conversion logic of UUID ->
123+
* JSON string.
120124
*/
121125
@JsonProperty("_id")
122126
@JsonSerialize(using = UuidToMongoIdSerializer.class)
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
<parent>
88
<groupId>jdiskmark</groupId>
9-
<artifactId>packages</artifactId>
10-
<version>0.6.0-SNAPSHOT</version>
9+
<artifactId>jdm-dist</artifactId>
10+
<version>0.8.0-SNAPSHOT</version>
1111
</parent>
1212

13-
<artifactId>jdm-windows</artifactId>
13+
<artifactId>jdm-msi</artifactId>
1414
<packaging>pom</packaging>
1515

1616
<build>
File renamed without changes.

jdm-dist/jdm-zip/pom.xml

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

77
<parent>
88
<groupId>jdiskmark</groupId>
9-
<artifactId>packages</artifactId>
10-
<version>0.6.0-SNAPSHOT</version>
9+
<artifactId>jdm-dist</artifactId>
10+
<version>0.8.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>jdm-zip</artifactId>

jdm-dist/pom.xml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,17 @@
66

77
<parent>
88
<groupId>jdiskmark</groupId>
9-
<artifactId>jdiskmark-parent</artifactId>
10-
<version>0.6.0-SNAPSHOT</version>
11-
<relativePath>../pom.xml</relativePath>
9+
<artifactId>jdm-java</artifactId>
10+
<version>0.8.0-SNAPSHOT</version>
1211
</parent>
1312

14-
<artifactId>packages</artifactId>
13+
<artifactId>jdm-dist</artifactId>
1514
<packaging>pom</packaging>
1615

17-
<name>jDiskMark Packaging Project</name>
18-
1916
<modules>
2017
<module>jdm-zip</module>
21-
22-
<module>jdm-windows</module>
23-
24-
</modules>
18+
<module>jdm-msi</module>
19+
</modules>
2520

2621
<dependencies>
2722
<dependency>

0 commit comments

Comments
 (0)