Update multiple java libs and fix VCardTool bday (#306)

Co-authored-by: dippeal <info@dippe-it.de>
openjverein · Aug 27, 2024 · 74574e0 · 74574e0
1 parent c0109a9
commit 74574e0
Show file tree

Hide file tree

Showing 30 changed files with 18 additions and 51 deletions.
diff --git a/.classpath b/.classpath
@@ -10,23 +10,23 @@
 	<classpathentry exported="true" kind="lib" path="lib/activation.jar"/>
 	<classpathentry exported="true" kind="lib" path="/hibiscus/lib/obantoo-bin-2.1.12.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/bsh-core-2.0b4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/csvjdbc.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/csvjdbc-1.0.40.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/itext-hyph-xml.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jollyday-0.4.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/joda-time-2.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/snakeyaml-1.13.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jollyday-0.5.10.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/joda-time-2.12.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/snakeyaml-2.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="/jameica/lib/swt/win64/swt.jar" sourcepath="/jameica/lib.src/swt/linux/swt.src.zip"/>
-	<classpathentry exported="true" kind="lib" path="lib/junit-4.8.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/javase-3.1.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/junit-4.13.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/javase-3.5.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/core-3.1.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="/jameica/lib/de_willuhn_ds/de_willuhn_ds.jar"/>
 	<classpathentry exported="true" kind="lib" path="/hibiscus/lib/super-csv-2.4.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="/hibiscus/lib/itext-pdfa-5.5.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="/hibiscus/lib/itextpdf-5.5.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/freemarker-2.3.23.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.6.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jsoup-1.8.3.jar"/>
-	<classpathentry kind="lib" path="lib/vinnie-2.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/ez-vcard-0.10.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/freemarker-2.3.33.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.17.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jsoup-1.18.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/vinnie-2.0.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/ez-vcard-0.12.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/junit/src/de/jost_net/JVereinJUnit/VCard/VCardTest.java b/junit/src/de/jost_net/JVereinJUnit/VCard/VCardTest.java
@@ -2,6 +2,9 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.ZoneOffset;
 
 import javax.xml.transform.TransformerException;
 
@@ -32,8 +35,8 @@ public void test01() throws IOException, TransformerException
     VCard[] vcard = { createVCard(), createVCard() };
 
     // write vCard
-    File file = new File("john-doe.vcf");
-    System.out.println("Writing " + file.getName() + "...");
+    Path file = Paths.get("john-doe.vcf");
+    System.out.println("Writing " + file.getFileName() + "...");
     Ezvcard.write(vcard).version(VCardVersion.V4_0).go(file);
   }
 
@@ -94,8 +97,7 @@ public static VCard createVCard() throws IOException
 
     vcard.setGeo(37.6, -95.67);
 
-    java.util.TimeZone tz = java.util.TimeZone.getTimeZone("America/New_York");
-    vcard.setTimezone(new Timezone(tz));
+    vcard.setTimezone(new Timezone(ZoneOffset.ofHours(-5), "America/New_York"));
 
     vcard.setUid(Uid.random());
 

diff --git a/lib/csvjdbc-1.0.40.jar b/lib/csvjdbc-1.0.40.jar
diff --git a/lib/csvjdbc.jar b/lib/csvjdbc.jar
diff --git a/lib/csvjdbc_info.xml b/lib/csvjdbc_info.xml
diff --git a/lib/ez-vcard-0.10.3.jar b/lib/ez-vcard-0.10.3.jar
diff --git a/lib/ez-vcard-0.12.1.jar b/lib/ez-vcard-0.12.1.jar
diff --git a/lib/ez-vcard_info.xml b/lib/ez-vcard_info.xml
diff --git a/lib/freemarker-2.3.23.jar b/lib/freemarker-2.3.23.jar
diff --git a/lib/freemarker-2.3.33.jar b/lib/freemarker-2.3.33.jar
diff --git a/lib/jackson-core-2.17.2.jar b/lib/jackson-core-2.17.2.jar
diff --git a/lib/jackson-core-2.6.1.jar b/lib/jackson-core-2.6.1.jar
diff --git a/lib/javase-3.1.0.jar b/lib/javase-3.1.0.jar
diff --git a/lib/javase-3.5.3.jar b/lib/javase-3.5.3.jar
diff --git a/lib/joda-time-2.12.7.jar b/lib/joda-time-2.12.7.jar
diff --git a/lib/joda-time-2.3.jar b/lib/joda-time-2.3.jar
diff --git a/lib/joda-time_info.xml b/lib/joda-time_info.xml
diff --git a/lib/jollyday-0.4.7.jar b/lib/jollyday-0.4.7.jar
diff --git a/lib/jollyday-0.5.10.jar b/lib/jollyday-0.5.10.jar
diff --git a/lib/jollyday_info.xml b/lib/jollyday_info.xml
diff --git a/lib/jsoup-1.18.1.jar b/lib/jsoup-1.18.1.jar
diff --git a/lib/jsoup-1.8.3.jar b/lib/jsoup-1.8.3.jar
diff --git a/lib/junit-4.13.2.jar b/lib/junit-4.13.2.jar
diff --git a/lib/junit-4.8.1.jar b/lib/junit-4.8.1.jar
diff --git a/lib/junit_info.xml b/lib/junit_info.xml
diff --git a/lib/snakeyaml-1.13.jar b/lib/snakeyaml-1.13.jar
diff --git a/lib/snakeyaml-2.2.jar b/lib/snakeyaml-2.2.jar
diff --git a/lib/vinnie-2.0.1.jar b/lib/vinnie-2.0.1.jar
diff --git a/lib/vinnie-2.0.2.jar b/lib/vinnie-2.0.2.jar
diff --git a/src/de/jost_net/JVerein/io/VCardTool.java b/src/de/jost_net/JVerein/io/VCardTool.java
@@ -52,7 +52,7 @@ public static VCard[] getVCards(ArrayList<Mitglied> mitglieder)
       Date geburtsdatum = m.getGeburtsdatum();
       if (!geburtsdatum.equals(Einstellungen.NODATE))
       {
-        Birthday bd = new Birthday(geburtsdatum);
+        Birthday bd = new Birthday(geburtsdatum.toString());
         vcard.setBirthday(bd);
       }