Revert "Convert model.ietf.rfc8040 to JPMS"

This reverts commit f22f321bc45e37db18af4d3b1056d6fb24f29943. We are not
ready for this just now.

Change-Id: If9f58fb27747aef2c02bd9e291322d15b7be1ac7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/model/ietf/rfc8040/pom.xml b/model/ietf/rfc8040/pom.xml
index d757f314a3fe245b092ba830d46df61e9f528798..8a71d14616e1a1113b1afc28a42b7f9dfa58decd 100644 (file)
--- a/model/ietf/rfc8040/pom.xml
+++ b/model/ietf/rfc8040/pom.xml
@@ -38,4 +38,18 @@
             <artifactId>yang-common</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.restconf.rfc8040</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

diff --git a/model/ietf/rfc8040/src/main/java/module-info.java b/model/ietf/rfc8040/src/main/java/module-info.java
deleted file mode 100644 (file)
index feff915..0000000
--- a/model/ietf/rfc8040/src/main/java/module-info.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2023 PANTHEON.tech, s.r.o. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-import org.opendaylight.yangtools.yang.binding.YangModelBindingProvider;
-
-/**
- * The binding for {@code ietf-restconf}, as specified by RFC8040.
- *
- * @provides YangModelBindingProvider
- */
-open module org.opendaylight.yang.gen.ietf.restconf.rfc8040 {
-    exports org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.restconf.rev170126;
-    exports org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.restconf.rev170126.errors;
-    exports org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.restconf.rev170126.errors.errors;
-    exports org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.restconf.rev170126.errors.errors.error;
-    exports org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.restconf.rev170126.restconf;
-    exports org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.restconf.rev170126.restconf.restconf;
-
-    requires transitive org.opendaylight.yangtools.yang.binding;
-    requires transitive org.opendaylight.yangtools.yang.common;
-    requires com.google.common;
-
-    provides YangModelBindingProvider with
-        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.restconf.rev170126.$YangModelBindingProvider;
-
-    // Annotations
-    requires static transitive java.compiler;
-    requires static transitive org.eclipse.jdt.annotation;
-}