+ added maven-managed alternative for the yang tools wrapper, updated upstream version numbers

Philip Makedonskirequested to merge
dev into main

copy dependencies -> generate class path -> update manifest

Merge request reports

features/org.etsi.mts.tdl.extras.feature/feature.xml

+15 −0
Changes for features/org.etsi.mts.tdl.extras.feature/feature.xml: 15 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -314,6 +314,7 @@ any resulting litigation. 
         install-size="0"

         version="0.0.0"

         unpack="false"/>



   <plugin

         id="org.etsi.mts.tdl.extras.yang.tools.wrapper"

         download-size="0"
@@ -321,4 +322,18 @@ any resulting litigation. 
         version="0.0.0"

         unpack="false"/>



   <plugin

         id="org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn"

         download-size="0"

         install-size="0"

         version="0.0.0"

         unpack="false"/>

<!--

   <plugin

         id="org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd"

         download-size="0"

         install-size="0"

         version="0.0.0"

         unpack="false"/>

-->

</feature>

org.etsi.mts.tdl.extras.parent/pom.xml

+5 −0
Changes for org.etsi.mts.tdl.extras.parent/pom.xml: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -11,7 +11,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 
	<modules>

		<!-- Converters -->

		<module>../plugins/org.etsi.mts.tdl.extras.openapi.generator.wrapper</module>

		<module>../plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies</module>

		<module>../plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn</module>

		<module>../plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper</module>

		<module>../plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd</module>

		<!-- 

		-->

		<!-- Features -->

		<module>../features/org.etsi.mts.tdl.extras.feature</module> 

		<!-- Update Site -->

plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/META-INF/MANIFEST.MF

+63 −34
Changes for plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/META-INF/MANIFEST.MF: 63 added lines, 34 removed lines.
Original line number Diff line number Diff line
@@ -3,8 +3,13 @@ Bundle-ManifestVersion: 2 
Bundle-Name: YANG Generator Wrapper

Bundle-SymbolicName: org.etsi.mts.tdl.extras.yang.tools.wrapper

Bundle-Version: 1.0.0.qualifier

Export-Package: org.opendaylight.yangtools.odlext.parser,

Export-Package: org.opendaylight.yangtools.concepts,

 org.opendaylight.yangtools.odlext.parser,

 org.opendaylight.yangtools.yang.common,

 org.opendaylight.yangtools.yang.data.api.schema,

 org.opendaylight.yangtools.yang.data.api.schema.stream,

 org.opendaylight.yangtools.yang.data.codec.gson,

 org.opendaylight.yangtools.yang.data.spi.node,

 org.opendaylight.yangtools.yang.model.api,

 org.opendaylight.yangtools.yang.model.api.meta,

 org.opendaylight.yangtools.yang.model.api.stmt,
@@ -14,6 +19,9 @@ Export-Package: org.opendaylight.yangtools.odlext.parser, 
 org.opendaylight.yangtools.yang.model.ri.type,

 org.opendaylight.yangtools.yang.model.spi,

 org.opendaylight.yangtools.yang.model.spi.meta,

 org.opendaylight.yangtools.yang.model.spi.source,

 org.opendaylight.yangtools.yang.model.util,

 org.opendaylight.yangtools.yang.xpath.api,

 org.opendaylight.yangtools.yang.parser.api,

 org.opendaylight.yangtools.yang.parser.rfc7950.reactor,

 org.opendaylight.yangtools.yang.parser.rfc7950.repo,
@@ -21,36 +29,57 @@ Export-Package: org.opendaylight.yangtools.odlext.parser, 
 org.opendaylight.yangtools.yang.parser.spi.source,

 org.opendaylight.yangtools.yang.parser.stmt.reactor

Bundle-Vendor: ETSI

Bundle-ClassPath: lib/antlr4-runtime-4.11.1.jar,

 lib/checker-qual-3.12.0.jar,

 lib/concepts-10.0.4.jar,

 lib/error_prone_annotations-2.11.0.jar,

 lib/failureaccess-1.0.1.jar,

 lib/gson-2.9.1.jar,

 lib/guava-31.1-jre.jar,

 lib/hamcrest-core-1.3.jar,

 lib/j2objc-annotations-1.3.jar,

 lib/jsr305-3.0.2.jar,

 lib/junit-4.11.jar,

 lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar,

 lib/odlext-model-api-10.0.4.jar,

 lib/odlext-parser-support-10.0.4.jar,

 lib/rfc7952-model-api-10.0.4.jar,

 lib/slf4j-api-2.0.6.jar,

 lib/slf4j-simple-2.0.6.jar,

 lib/triemap-1.2.0.jar,

 lib/util-10.0.4.jar,

 lib/yang-common-10.0.4.jar,

 lib/yang-ir-10.0.4.jar,

 lib/yang-model-api-10.0.4.jar,

 lib/yang-model-ri-10.0.4.jar,

 lib/yang-model-spi-10.0.4.jar,

 lib/yang-parser-api-10.0.4.jar,

 lib/yang-parser-reactor-10.0.4.jar,

 lib/yang-parser-rfc7950-10.0.4.jar,

 lib/yang-parser-spi-10.0.4.jar,

 lib/yang-repo-api-10.0.4.jar,

 lib/yang-repo-spi-10.0.4.jar,

 lib/yang-xpath-api-10.0.4.jar,

 lib/yang-xpath-impl-10.0.4.jar

Automatic-Module-Name: org.etsi.mts.tdl.yang2tdl
 
Automatic-Module-Name: org.etsi.mts.tdl.extras.yang.tools.wrapper

Bundle-ClassPath: libs/antlr4-runtime-4.13.1.jar,

 libs/checker-qual-3.37.0.jar,

 libs/concepts-13.0.1.jar,

 libs/error_prone_annotations-2.21.1.jar,

 libs/failureaccess-1.0.1.jar,

 libs/gson-2.10.1.jar,

 libs/guava-32.1.3-jre.jar,

 libs/j2objc-annotations-2.8.jar,

 libs/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar,

 libs/odlext-model-api-13.0.1.jar,

 libs/odlext-parser-support-13.0.1.jar,

 libs/openconfig-model-api-13.0.1.jar,

 libs/openconfig-parser-support-13.0.1.jar,

 libs/org.eclipse.jdt.annotation-2.2.800.jar,

 libs/rfc6241-model-api-13.0.1.jar,

 libs/rfc6241-parser-support-13.0.1.jar,

 libs/rfc6536-model-api-13.0.1.jar,

 libs/rfc6536-parser-support-13.0.1.jar,

 libs/rfc6643-model-api-13.0.1.jar,

 libs/rfc6643-parser-support-13.0.1.jar,

 libs/rfc7952-model-api-13.0.1.jar,

 libs/rfc7952-parser-support-13.0.1.jar,

 libs/rfc8040-model-api-13.0.1.jar,

 libs/rfc8040-parser-support-13.0.1.jar,

 libs/rfc8528-model-api-13.0.1.jar,

 libs/rfc8528-parser-support-13.0.1.jar,

 libs/rfc8639-model-api-13.0.1.jar,

 libs/rfc8639-parser-support-13.0.1.jar,

 libs/rfc8819-model-api-13.0.1.jar,

 libs/rfc8819-parser-support-13.0.1.jar,

 libs/triemap-1.3.1.jar,

 libs/util-13.0.1.jar,

 libs/value-2.10.0-annotations.jar,

 libs/yang-common-13.0.1.jar,

 libs/yang-data-api-13.0.1.jar,

 libs/yang-data-codec-gson-13.0.1.jar,

 libs/yang-data-impl-13.0.1.jar,

 libs/yang-data-spi-13.0.1.jar,

 libs/yang-data-util-13.0.1.jar,

 libs/yang-ir-13.0.1.jar,

 libs/yang-model-api-13.0.1.jar,

 libs/yang-model-ri-13.0.1.jar,

 libs/yang-model-spi-13.0.1.jar,

 libs/yang-model-util-13.0.1.jar,

 libs/yang-parser-api-13.0.1.jar,

 libs/yang-parser-impl-13.0.1.jar,

 libs/yang-parser-reactor-13.0.1.jar,

 libs/yang-parser-rfc7950-13.0.1.jar,

 libs/yang-parser-spi-13.0.1.jar,

 libs/yang-repo-api-13.0.1.jar,

 libs/yang-repo-spi-13.0.1.jar,

 libs/yang-xpath-api-13.0.1.jar,

 libs/yang-xpath-impl-13.0.1.jar

plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/libs/checker-qual-3.37.0.jar

0 → 100644
+219 KiB

File added.

No diff preview for this file type.

View file