Commit 78e45c74 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

Merge branch 'dev' into 'main' 

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

See merge request !5
parents 409de420 4664a0ab

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

+15 −0
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
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.bnd/.classpath

0 → 100644
+59 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<classpath>

  <classpathentry kind="src" path="." including="plugin.xml" excluding="**/*.java"/>

  <classpathentry kind="output" path="target/classes"/>

  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-data-codec-gson/13.0.1/yang-data-codec-gson-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-data-codec-gson/13.0.1/yang-data-codec-gson-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/com/google/code/gson/gson/2.10.1/gson-2.10.1.jar" sourcepath="M2_REPO/com/google/code/gson/gson/2.10.1/gson-2.10.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/com/google/guava/guava/32.1.3-jre/guava-32.1.3-jre.jar" sourcepath="M2_REPO/com/google/guava/guava/32.1.3-jre/guava-32.1.3-jre-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar" sourcepath="M2_REPO/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/checkerframework/checker-qual/3.37.0/checker-qual-3.37.0.jar" sourcepath="M2_REPO/org/checkerframework/checker-qual/3.37.0/checker-qual-3.37.0-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/com/google/errorprone/error_prone_annotations/2.21.1/error_prone_annotations-2.21.1.jar" sourcepath="M2_REPO/com/google/errorprone/error_prone_annotations/2.21.1/error_prone_annotations-2.21.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/com/google/j2objc/j2objc-annotations/2.8/j2objc-annotations-2.8.jar" sourcepath="M2_REPO/com/google/j2objc/j2objc-annotations/2.8/j2objc-annotations-2.8-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/org.eclipse.jdt.annotation/2.2.800/org.eclipse.jdt.annotation-2.2.800.jar" sourcepath="M2_REPO/org/eclipse/jdt/org.eclipse.jdt.annotation/2.2.800/org.eclipse.jdt.annotation-2.2.800-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/util/13.0.1/util-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/util/13.0.1/util-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/concepts/13.0.1/concepts-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/concepts/13.0.1/concepts-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/tech/pantheon/triemap/triemap/1.3.1/triemap-1.3.1.jar" sourcepath="M2_REPO/tech/pantheon/triemap/triemap/1.3.1/triemap-1.3.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-common/13.0.1/yang-common-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-common/13.0.1/yang-common-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-data-api/13.0.1/yang-data-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-data-api/13.0.1/yang-data-api-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/immutables/value/2.10.0/value-2.10.0-annotations.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-model-api/13.0.1/yang-model-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-model-api/13.0.1/yang-model-api-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-xpath-api/13.0.1/yang-xpath-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-xpath-api/13.0.1/yang-xpath-api-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-data-impl/13.0.1/yang-data-impl-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-data-impl/13.0.1/yang-data-impl-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-data-spi/13.0.1/yang-data-spi-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-data-spi/13.0.1/yang-data-spi-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-data-util/13.0.1/yang-data-util-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-data-util/13.0.1/yang-data-util-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-model-util/13.0.1/yang-model-util-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-model-util/13.0.1/yang-model-util-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-model-spi/13.0.1/yang-model-spi-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-model-spi/13.0.1/yang-model-spi-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-ir/13.0.1/yang-ir-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-ir/13.0.1/yang-ir-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc7952-model-api/13.0.1/rfc7952-model-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc7952-model-api/13.0.1/rfc7952-model-api-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc8040-model-api/13.0.1/rfc8040-model-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc8040-model-api/13.0.1/rfc8040-model-api-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc8528-model-api/13.0.1/rfc8528-model-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc8528-model-api/13.0.1/rfc8528-model-api-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc8819-parser-support/13.0.1/rfc8819-parser-support-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc8819-parser-support/13.0.1/rfc8819-parser-support-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-parser-api/13.0.1/yang-parser-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-parser-api/13.0.1/yang-parser-api-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-parser-spi/13.0.1/yang-parser-spi-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-parser-spi/13.0.1/yang-parser-spi-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc8819-model-api/13.0.1/rfc8819-model-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc8819-model-api/13.0.1/rfc8819-model-api-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-parser-rfc7950/13.0.1/yang-parser-rfc7950-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-parser-rfc7950/13.0.1/yang-parser-rfc7950-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr4-runtime/4.13.1/antlr4-runtime-4.13.1.jar" sourcepath="M2_REPO/org/antlr/antlr4-runtime/4.13.1/antlr4-runtime-4.13.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-model-ri/13.0.1/yang-model-ri-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-model-ri/13.0.1/yang-model-ri-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-parser-reactor/13.0.1/yang-parser-reactor-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-parser-reactor/13.0.1/yang-parser-reactor-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-repo-api/13.0.1/yang-repo-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-repo-api/13.0.1/yang-repo-api-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-repo-spi/13.0.1/yang-repo-spi-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-repo-spi/13.0.1/yang-repo-spi-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/odlext-parser-support/13.0.1/odlext-parser-support-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/odlext-parser-support/13.0.1/odlext-parser-support-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/odlext-model-api/13.0.1/odlext-model-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/odlext-model-api/13.0.1/odlext-model-api-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-parser-impl/13.0.1/yang-parser-impl-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-parser-impl/13.0.1/yang-parser-impl-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/openconfig-parser-support/13.0.1/openconfig-parser-support-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/openconfig-parser-support/13.0.1/openconfig-parser-support-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/openconfig-model-api/13.0.1/openconfig-model-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/openconfig-model-api/13.0.1/openconfig-model-api-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc6241-parser-support/13.0.1/rfc6241-parser-support-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc6241-parser-support/13.0.1/rfc6241-parser-support-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc6241-model-api/13.0.1/rfc6241-model-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc6241-model-api/13.0.1/rfc6241-model-api-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc6536-parser-support/13.0.1/rfc6536-parser-support-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc6536-parser-support/13.0.1/rfc6536-parser-support-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc6536-model-api/13.0.1/rfc6536-model-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc6536-model-api/13.0.1/rfc6536-model-api-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc6643-parser-support/13.0.1/rfc6643-parser-support-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc6643-parser-support/13.0.1/rfc6643-parser-support-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc6643-model-api/13.0.1/rfc6643-model-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc6643-model-api/13.0.1/rfc6643-model-api-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc7952-parser-support/13.0.1/rfc7952-parser-support-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc7952-parser-support/13.0.1/rfc7952-parser-support-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc8040-parser-support/13.0.1/rfc8040-parser-support-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc8040-parser-support/13.0.1/rfc8040-parser-support-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc8528-parser-support/13.0.1/rfc8528-parser-support-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc8528-parser-support/13.0.1/rfc8528-parser-support-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc8639-parser-support/13.0.1/rfc8639-parser-support-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc8639-parser-support/13.0.1/rfc8639-parser-support-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/rfc8639-model-api/13.0.1/rfc8639-model-api-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/rfc8639-model-api/13.0.1/rfc8639-model-api-13.0.1-sources.jar"/>

  <classpathentry kind="var" path="M2_REPO/org/opendaylight/yangtools/yang-xpath-impl/13.0.1/yang-xpath-impl-13.0.1.jar" sourcepath="M2_REPO/org/opendaylight/yangtools/yang-xpath-impl/13.0.1/yang-xpath-impl-13.0.1-sources.jar"/>

</classpath>
 
 No newline at end of file

plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/.project

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<projectDescription>

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

  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>

  <projects/>

  <buildSpec>

    <buildCommand>

      <name>org.eclipse.jdt.core.javabuilder</name>

    </buildCommand>

    <buildCommand>

      <name>org.eclipse.pde.ManifestBuilder</name>

    </buildCommand>

    <buildCommand>

      <name>org.eclipse.pde.SchemaBuilder</name>

    </buildCommand>

    <buildCommand>

      <name>org.eclipse.m2e.core.maven2Builder</name>

    </buildCommand>

  </buildSpec>

  <natures>

    <nature>org.eclipse.m2e.core.maven2Nature</nature>

    <nature>org.eclipse.pde.PluginNature</nature>

    <nature>org.eclipse.jdt.core.javanature</nature>

  </natures>

</projectDescription>
 
 No newline at end of file

plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.bnd/.settings/org.eclipse.core.resources.prefs

0 → 100644
+2 −0
Original line number Diff line number Diff line 
eclipse.preferences.version=1

encoding/<project>=UTF-8