Fixed conflict when merging most recent changes from origin.

dlsc-software-consulting-gmbh · Aug 8, 2022 · 75265e6 · 75265e6
2 parents cbdb10e + 9f0d4f6
commit 75265e6
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.dlsc.preferencesfx</groupId>
     <artifactId>parent</artifactId>
-    <version>11.9.0</version>
+    <version>11.9.1</version>
     <packaging>pom</packaging>
 
     <parent>
@@ -115,19 +115,19 @@
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-core</artifactId>
-                <version>2.17.0</version>
+                <version>2.17.1</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-api</artifactId>
-                <version>2.17.0</version>
+                <version>2.17.1</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-slf4j-impl</artifactId>
-                <version>2.17.0</version>
+                <version>2.17.1</version>
             </dependency>
 
         </dependencies>

diff --git a/preferencesfx-demo/pom.xml b/preferencesfx-demo/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.dlsc.preferencesfx</groupId>
         <artifactId>parent</artifactId>
-        <version>11.9.0</version>
+        <version>11.9.1</version>
     </parent>
 
     <artifactId>preferencesfx-demo</artifactId>
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>com.dlsc.preferencesfx</groupId>
             <artifactId>preferencesfx-core</artifactId>
-            <version>11.9.0</version>
+            <version>11.9.1</version>
         </dependency>
 
         <!-- Logging -->

diff --git a/preferencesfx-demo/src/main/java/module-info.java b/preferencesfx-demo/src/main/java/module-info.java
@@ -8,6 +8,5 @@
     exports com.dlsc.preferencesfx.demo;
 
     opens com.dlsc.preferencesfx.demo;
-    exports com.dlsc.preferencesfx.demo.visibility;
-    opens com.dlsc.preferencesfx.demo.visibility;
-}
+    opens com.dlsc.preferencesfx.demo.extended;
+}
diff --git a/preferencesfx/pom.xml b/preferencesfx/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.dlsc.preferencesfx</groupId>
         <artifactId>parent</artifactId>
-        <version>11.9.0</version>
+        <version>11.9.1</version>
     </parent>
 
     <name>PreferencesFX</name>

diff --git a/preferencesfx/src/main/java/com/dlsc/preferencesfx/model/Setting.java b/preferencesfx/src/main/java/com/dlsc/preferencesfx/model/Setting.java
@@ -60,7 +60,7 @@ public class Setting<E extends Element, P extends Property> {
   private final StringProperty breadcrumb = new SimpleStringProperty("");
   private String key = "";
 
-  private Setting(String description, E element, P value) {
+  protected Setting(String description, E element, P value) {
     this.description = description;
     this.element = element;
     this.value = value;