Merge pull request #38 from ical4j/develop

Refactored concepts

.github/workflows/create-release.yml

@@ -0,0 +1,21 @@
+name: Create Release
+
+on:
+  push:
+    tags:
+      - "ical4j-extensions-*"
+      - "!ical4j-extensions-*-pre"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      #      - name: Generate changelog
+      #        run: make changelog
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        with:
+          generate_release_notes: true
+#          body_path: CHANGELOG.md

build.gradle

@@ -36,8 +36,7 @@ sourcesJar.dependsOn ':compileModuleInfoJava'
 
 dependencies {
     api "org.mnode.ical4j:ical4j:$ical4jVersion",
-            "org.mnode.ical4j:ical4j-vcard:$ical4jVCardVersion",
-            'com.sun.mail:jakarta.mail:2.0.1'
+            "org.mnode.ical4j:ical4j-vcard:$ical4jVCardVersion"
 
     // optional groovy DSL for calendar builder..
     groovyDslImplementation "org.codehaus.groovy:groovy:$groovyVersion"
@@ -51,8 +50,8 @@ dependencies {
     // spock
     testImplementation platform("org.spockframework:spock-bom:$spockVersion"),
             "org.spockframework:spock-core",
-            "org.slf4j:slf4j-log4j12:$slf4jVersion",
-            "org.apache.logging.log4j:log4j:$log4jVersion"
+            "org.apache.logging.log4j:log4j-core:$log4jVersion",
+            "org.apache.logging.log4j:log4j-slf4j2-impl:$log4jVersion"
 }
 
 compileTestJava {

gradle.properties

@@ -1,8 +1,8 @@
-ical4jVersion=4.0.0-rc4
-ical4jVCardVersion=2.0.0-beta3
-groovyVersion=3.0.20
-slf4jVersion=2.0.9
-log4jVersion=2.22.1
+ical4jVersion=4.0.3
+ical4jVCardVersion=2.0.0-rc1
+
+groovyVersion=3.0.21
+log4jVersion=2.23.1
 bndVersion=6.2.0
 jacoco_htmlReport=true
 revApiOldVersion=1.0.4

src/main/groovy/net/fortuna/ical4j/extensions/ContentBuilder.groovy

@@ -31,7 +31,7 @@
  */
 package net.fortuna.ical4j.extensions
 
-import net.fortuna.ical4j.extensions.property.*
+import net.fortuna.ical4j.extensions.model.property.*
 import net.fortuna.ical4j.model.PropertyFactoryWrapper
 
 /**

src/main/java/module-info.java

@@ -6,18 +6,18 @@
     requires org.threeten.extra;
     requires static org.codehaus.groovy;
 
-    exports net.fortuna.ical4j.extensions.alarm;
+    exports net.fortuna.ical4j.extensions.model.alarm;
     exports net.fortuna.ical4j.extensions.caldav.parameter;
     exports net.fortuna.ical4j.extensions.caldav.property;
-    exports net.fortuna.ical4j.extensions.concept;
+    exports net.fortuna.ical4j.extensions.model.concept;
     exports net.fortuna.ical4j.extensions.data;
     exports net.fortuna.ical4j.extensions.groupwise;
-    exports net.fortuna.ical4j.extensions.link;
-    exports net.fortuna.ical4j.extensions.location;
+    exports net.fortuna.ical4j.extensions.model.link;
+    exports net.fortuna.ical4j.extensions.model.location;
     exports net.fortuna.ical4j.extensions.lotus;
     exports net.fortuna.ical4j.extensions.outlook;
-    exports net.fortuna.ical4j.extensions.parameter;
-    exports net.fortuna.ical4j.extensions.participant;
-    exports net.fortuna.ical4j.extensions.property;
+    exports net.fortuna.ical4j.extensions.model.parameter;
+    exports net.fortuna.ical4j.extensions.model.participant;
+    exports net.fortuna.ical4j.extensions.model.property;
     exports net.fortuna.ical4j.extensions.validate;
 }

src/main/java/net/fortuna/ical4j/extensions/data/ExtendedContentHandler.java

@@ -2,7 +2,7 @@
 
 import net.fortuna.ical4j.data.ContentHandlerContext;
 import net.fortuna.ical4j.data.DefaultContentHandler;
-import net.fortuna.ical4j.extensions.property.WrTimezone;
+import net.fortuna.ical4j.extensions.model.property.WrTimezone;
 import net.fortuna.ical4j.model.Calendar;
 import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.TimeZoneRegistry;

src/main/java/net/fortuna/ical4j/extensions/data/ExtendedParameterFactorySupplier.java

@@ -1,7 +1,7 @@
 package net.fortuna.ical4j.extensions.data;
 
 import net.fortuna.ical4j.data.DefaultParameterFactorySupplier;
-import net.fortuna.ical4j.extensions.parameter.Filename;
+import net.fortuna.ical4j.extensions.model.parameter.Filename;
 import net.fortuna.ical4j.model.Parameter;
 import net.fortuna.ical4j.model.ParameterFactory;
 import net.fortuna.ical4j.model.parameter.Display;

src/main/java/net/fortuna/ical4j/extensions/data/ExtendedPropertyFactorySupplier.java

@@ -1,7 +1,7 @@
 package net.fortuna.ical4j.extensions.data;
 
 import net.fortuna.ical4j.data.DefaultPropertyFactorySupplier;
-import net.fortuna.ical4j.extensions.property.*;
+import net.fortuna.ical4j.extensions.model.property.*;
 import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.PropertyFactory;
 

src/main/java/net/fortuna/ical4j/extensions/alarm/DisplayNotification.java → src/main/java/net/fortuna/ical4j/extensions/model/alarm/DisplayNotification.java

@@ -1,6 +1,6 @@
-package net.fortuna.ical4j.extensions.alarm;
+package net.fortuna.ical4j.extensions.model.alarm;
 
-import net.fortuna.ical4j.extensions.property.Notify;
+import net.fortuna.ical4j.extensions.model.property.Notify;
 import net.fortuna.ical4j.model.component.VAlarm;
 import net.fortuna.ical4j.model.property.Description;
 import net.fortuna.ical4j.model.property.immutable.ImmutableAction;

src/main/java/net/fortuna/ical4j/extensions/alarm/EmailNotification.java → src/main/java/net/fortuna/ical4j/extensions/model/alarm/EmailNotification.java

@@ -1,6 +1,6 @@
-package net.fortuna.ical4j.extensions.alarm;
+package net.fortuna.ical4j.extensions.model.alarm;
 
-import net.fortuna.ical4j.extensions.property.Notify;
+import net.fortuna.ical4j.extensions.model.property.Notify;
 import net.fortuna.ical4j.model.component.VAlarm;
 import net.fortuna.ical4j.model.property.Description;
 import net.fortuna.ical4j.model.property.immutable.ImmutableAction;

src/main/java/net/fortuna/ical4j/extensions/alarm/ProximityNotification.java → src/main/java/net/fortuna/ical4j/extensions/model/alarm/ProximityNotification.java

@@ -1,4 +1,4 @@
-package net.fortuna.ical4j.extensions.alarm;
+package net.fortuna.ical4j.extensions.model.alarm;
 
 import net.fortuna.ical4j.model.component.VAlarm;
 import net.fortuna.ical4j.model.component.VLocation;

src/main/java/net/fortuna/ical4j/extensions/concept/ActionType.java → src/main/java/net/fortuna/ical4j/extensions/model/concept/ActionType.java

@@ -1,4 +1,4 @@
-package net.fortuna.ical4j.extensions.concept;
+package net.fortuna.ical4j.extensions.model.concept;
 
 import java.net.URI;
 
@@ -10,23 +10,23 @@
 public class ActionType extends ImmutableConcept {
 
     public enum Id {
-        Action("ical4j:concept:action"),
+        Action("semcal:concept:action"),
 
-        Agenda("ical4j:concept:action:agenda"),
+        Agenda("semcal:concept:action:agenda"),
 
-        Approval("ical4j:concept:action:approval"),
+        Approval("semcal:concept:action:approval"),
 
-        ServiceQualification("ical4j:concept:action:service_qualification"),
+        ServiceQualification("semcal:concept:action:service_qualification"),
 
-        Payment("ical4j:concept:action:payment"),
+        Payment("semcal:concept:action:payment"),
 
-        Fulfilment("ical4j:concept:action:fulfilment"),
+        Fulfilment("semcal:concept:action:fulfilment"),
 
-        Clarification("ical4j:concept:action:clarification"),
+        Clarification("semcal:concept:action:clarification"),
 
-        Review("ical4j:concept:action:review"),
+        Review("semcal:concept:action:review"),
 
-        LinkRegistration("ical4j:concept:action:link_registration");
+        LinkRegistration("semcal:concept:action:link_registration");
 
         private final URI uri;
 

src/main/java/net/fortuna/ical4j/extensions/concept/AssetType.java → src/main/java/net/fortuna/ical4j/extensions/model/concept/AssetType.java

@@ -1,4 +1,4 @@
-package net.fortuna.ical4j.extensions.concept;
+package net.fortuna.ical4j.extensions.model.concept;
 
 import java.net.URI;
 
@@ -9,13 +9,13 @@ public class AssetType extends ImmutableConcept {
 
 
     public enum Id {
-        Asset("ical4j:concept:asset"),
+        Asset("semcal:concept:asset"),
 
-        Vehicle("ical4j:concept:asset:vehicle"),
+        Vehicle("semcal:concept:asset:vehicle"),
 
-        Property("ical4j:concept:asset:property"),
+        Property("semcal:concept:asset:property"),
 
-        ConfigurationItem("ical4j:concept:asset:configuration_item");
+        ConfigurationItem("semcal:concept:asset:configuration_item");
 
         private final URI uri;
 

src/main/java/net/fortuna/ical4j/extensions/concept/AvailabilityType.java → src/main/java/net/fortuna/ical4j/extensions/model/concept/AvailabilityType.java

@@ -1,19 +1,19 @@
-package net.fortuna.ical4j.extensions.concept;
+package net.fortuna.ical4j.extensions.model.concept;
 
 import java.net.URI;
 
 public class AvailabilityType extends ImmutableConcept {
 
     public enum Id {
-        Availability("ical4j:concept:availability"),
+        Availability("semcal:concept:availability"),
 
-        Roster("ical4j:concept:availability:roster"),
+        Roster("semcal:concept:availability:roster"),
 
-        Reservable("ical4j:concept:availability:reservable"),
+        Reservable("semcal:concept:availability:reservable"),
 
-        Invitation("ical4j:concept:availability:invitation"),
+        Invitation("semcal:concept:availability:invitation"),
 
-        Offer("ical4j:concept:availability:offer");
+        Offer("semcal:concept:availability:offer");
 
         private final URI uri;
 

src/main/java/net/fortuna/ical4j/extensions/concept/EventType.java → src/main/java/net/fortuna/ical4j/extensions/model/concept/EventType.java

@@ -1,4 +1,4 @@
-package net.fortuna.ical4j.extensions.concept;
+package net.fortuna.ical4j.extensions.model.concept;
 
 import java.net.URI;
 
@@ -9,17 +9,17 @@
 public class EventType extends ImmutableConcept {
 
     public enum Id {
-        Event("ical4j:concept:event"),
+        Event("semcal:concept:event"),
 
-        Meeting("ical4j:concept:event:meeting"),
+        Meeting("semcal:concept:event:meeting"),
 
-        Appointment("ical4j:concept:event:appointment"),
+        Appointment("semcal:concept:event:appointment"),
 
-        Seminar("ical4j:concept:event:seminar"),
+        Seminar("semcal:concept:event:seminar"),
 
-        Conference("ical4j:concept:event:conference"),
+        Conference("semcal:concept:event:conference"),
 
-        Performance("ical4j:concept:event:performance");
+        Performance("semcal:concept:event:performance");
 
         private final URI uri;
 

src/main/java/net/fortuna/ical4j/extensions/concept/ImmutableConcept.java → src/main/java/net/fortuna/ical4j/extensions/model/concept/ImmutableConcept.java

@@ -1,4 +1,4 @@
-package net.fortuna.ical4j.extensions.concept;
+package net.fortuna.ical4j.extensions.model.concept;
 
 import net.fortuna.ical4j.model.Parameter;
 import net.fortuna.ical4j.model.Property;

src/main/java/net/fortuna/ical4j/extensions/concept/IssueType.java → src/main/java/net/fortuna/ical4j/extensions/model/concept/IssueType.java

@@ -1,4 +1,4 @@
-package net.fortuna.ical4j.extensions.concept;
+package net.fortuna.ical4j.extensions.model.concept;
 
 import java.net.URI;
 
@@ -10,26 +10,26 @@
 public class IssueType extends ImmutableConcept {
 
     public enum Id {
-        Issue("ical4j:concept:issue"),
+        Issue("semcal:concept:issue"),
 
-        Story("ical4j:concept:issue:story"),
+        Story("semcal:concept:issue:story"),
 
-        Epic("ical4j:concept:issue:epic"),
+        Epic("semcal:concept:issue:epic"),
 
-        Task("ical4j:concept:issue:task"),
+        Task("semcal:concept:issue:task"),
 
-        Subtask("ical4j:concept:issue:subtask"),
+        Subtask("semcal:concept:issue:subtask"),
 
-        Risk("ical4j:concept:issue:risk"),
+        Risk("semcal:concept:issue:risk"),
 
-        Improvement("ical4j:concept:issue:improvement"),
+        Improvement("semcal:concept:issue:improvement"),
 
-        Change("ical4j:concept:issue:change"),
+        Change("semcal:concept:issue:change"),
 
-        Incident("ical4j:concept:issue:incident"),
+        Incident("semcal:concept:issue:incident"),
 
 
-        Problem("ical4j:concept:issue:problem");
+        Problem("semcal:concept:issue:problem");
 
         private final URI uri;
 

src/main/java/net/fortuna/ical4j/extensions/concept/MetricType.java → src/main/java/net/fortuna/ical4j/extensions/model/concept/MetricType.java

@@ -1,4 +1,4 @@
-package net.fortuna.ical4j.extensions.concept;
+package net.fortuna.ical4j.extensions.model.concept;
 
 import java.net.URI;
 
@@ -10,17 +10,17 @@
 public class MetricType extends ImmutableConcept {
 
     public enum Id {
-        Metric("ical4j:concept:metric"),
+        Metric("semcal:concept:metric"),
 
-        Attendance("ical4j:concept:metric:attendance"),
+        Attendance("semcal:concept:metric:attendance"),
 
-        TimeToRespond("ical4j:concept:metric:time_to_respond"),
+        TimeToRespond("semcal:concept:metric:time_to_respond"),
 
-        TimeToResolve("ical4j:concept:metric:time_to_resolve"),
+        TimeToResolve("semcal:concept:metric:time_to_resolve"),
 
-        Diagnostic("ical4j:concept:metric:diagnostic"),
+        Diagnostic("semcal:concept:metric:diagnostic"),
 
-        Presence("ical4j:concept:metric:presence");
+        Presence("semcal:concept:metric:presence");
 
         private final URI uri;