[java-opensaml] branch main updated: OSJ-434: Open SAML library is not compatible with Java Modules

[Codeberg]

This is an automated email from the git hooks/post-receive script.

codeberg pushed a commit to branch main
in repository java-opensaml.

View the commit online:
https://codeberg.org/Shibboleth/java-opensaml/commit/05d7f38afa1c6fd1dd2ea168bf5a13f6e665020f

The following commit(s) were added to refs/heads/main by this push:
     new 05d7f38af OSJ-434: Open SAML library is not compatible with Java Modules
05d7f38af is described below

commit 05d7f38afa1c6fd1dd2ea168bf5a13f6e665020f
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Thu Nov 20 20:58:46 2025 -0500

    OSJ-434: Open SAML library is not compatible with Java Modules
    
    Fix a couple of obvious mistakes in what we intended by moving
    Initializer classes and declarations around to more sensible locations.
---
 .../core/xml/config/XMLObjectProviderInitializer.java |  9 +++++++++
 .../services/org.opensaml.core.config.Initializer     |  1 +
 .../config/impl}/XMLObjectProviderInitializer.java    |  4 +++-
 .../opensaml/core/xml/config/impl/package-info.java   | 19 +++++++++++++++++++
 .../services/org.opensaml.core.config.Initializer     |  3 +--
 5 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/opensaml-core-api/src/main/java/org/opensaml/core/xml/config/XMLObjectProviderInitializer.java b/opensaml-core-api/src/main/java/org/opensaml/core/xml/config/XMLObjectProviderInitializer.java
index 6553bbdf5..1e5eac037 100644
--- a/opensaml-core-api/src/main/java/org/opensaml/core/xml/config/XMLObjectProviderInitializer.java
+++ b/opensaml-core-api/src/main/java/org/opensaml/core/xml/config/XMLObjectProviderInitializer.java
@@ -20,9 +20,15 @@ import javax.xml.namespace.QName;
 import org.opensaml.core.config.ConfigurationService;
 import org.opensaml.core.config.InitializationException;
 
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
+
 /**
  * XMLObject provider initializer for module "core".
+ * 
+ * @deprecated use instead org.opensaml.core.metrics.impl.XMLObjectProviderInitializer
  */
+ at Deprecated 
 public class XMLObjectProviderInitializer extends AbstractXMLObjectProviderInitializer {
     
     /** Config resources. */
@@ -42,6 +48,9 @@ public class XMLObjectProviderInitializer extends AbstractXMLObjectProviderIniti
     public void init() throws InitializationException {
         super.init();
         
+        DeprecationSupport.warn(ObjectType.CLASS, "org.opensaml.core.xml.config.XMLObjectProviderInitializer",
+                null, "org.opensaml.core.xml.config.impl.XMLObjectProviderInitializer");
+        
         final XMLObjectProviderRegistry registry = ConfigurationService.get(XMLObjectProviderRegistry.class);
         if (registry == null) {
             throw new InitializationException("XMLObjectProviderRegistry was not available");
diff --git a/opensaml-core-api/src/main/resources/META-INF/services/org.opensaml.core.config.Initializer b/opensaml-core-api/src/main/resources/META-INF/services/org.opensaml.core.config.Initializer
new file mode 100644
index 000000000..0f0fa44b4
--- /dev/null
+++ b/opensaml-core-api/src/main/resources/META-INF/services/org.opensaml.core.config.Initializer
@@ -0,0 +1 @@
+org.opensaml.core.xml.config.GlobalParserPoolInitializer
\ No newline at end of file
diff --git a/opensaml-core-api/src/main/java/org/opensaml/core/xml/config/XMLObjectProviderInitializer.java b/opensaml-core-impl/src/main/java/org/opensaml/core/xml/config/impl/XMLObjectProviderInitializer.java
similarity index 90%
copy from opensaml-core-api/src/main/java/org/opensaml/core/xml/config/XMLObjectProviderInitializer.java
copy to opensaml-core-impl/src/main/java/org/opensaml/core/xml/config/impl/XMLObjectProviderInitializer.java
index 6553bbdf5..7ae4a14da 100644
--- a/opensaml-core-api/src/main/java/org/opensaml/core/xml/config/XMLObjectProviderInitializer.java
+++ b/opensaml-core-impl/src/main/java/org/opensaml/core/xml/config/impl/XMLObjectProviderInitializer.java
@@ -12,13 +12,15 @@
  * limitations under the License.
  */
 
-package org.opensaml.core.xml.config;
+package org.opensaml.core.xml.config.impl;
 
 import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
 import org.opensaml.core.config.ConfigurationService;
 import org.opensaml.core.config.InitializationException;
+import org.opensaml.core.xml.config.AbstractXMLObjectProviderInitializer;
+import org.opensaml.core.xml.config.XMLObjectProviderRegistry;
 
 /**
  * XMLObject provider initializer for module "core".
diff --git a/opensaml-core-impl/src/main/java/org/opensaml/core/xml/config/impl/package-info.java b/opensaml-core-impl/src/main/java/org/opensaml/core/xml/config/impl/package-info.java
new file mode 100644
index 000000000..5e27be771
--- /dev/null
+++ b/opensaml-core-impl/src/main/java/org/opensaml/core/xml/config/impl/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** Configuration implementation of XML object providers and related functionality. */
+ at NonnullElements
+package org.opensaml.core.xml.config.impl;
+
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
diff --git a/opensaml-core-impl/src/main/resources/META-INF/services/org.opensaml.core.config.Initializer b/opensaml-core-impl/src/main/resources/META-INF/services/org.opensaml.core.config.Initializer
index de385dc8f..0f451a533 100644
--- a/opensaml-core-impl/src/main/resources/META-INF/services/org.opensaml.core.config.Initializer
+++ b/opensaml-core-impl/src/main/resources/META-INF/services/org.opensaml.core.config.Initializer
@@ -1,3 +1,2 @@
-org.opensaml.core.xml.config.XMLObjectProviderInitializer
-org.opensaml.core.xml.config.GlobalParserPoolInitializer
+org.opensaml.core.xml.config.impl.XMLObjectProviderInitializer
 org.opensaml.core.metrics.impl.MetricRegistryInitializer
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.