From 07a6b09dbfb1e08d4eb677af2b637bb9f170ba99 Mon Sep 17 00:00:00 2001 From: Philip Makedonski Date: Thu, 15 Feb 2024 17:54:36 +0100 Subject: [PATCH] + added maven-managed alternative for the yang tools wrapper copy dependencies -> generate class path -> update manifest --- .../feature.xml | 6 + org.etsi.mts.tdl.extras.parent/pom.xml | 2 + .../.classpath | 16 ++ .../.project | 45 +++++ .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 10 ++ .../.settings/org.eclipse.m2e.core.prefs | 4 + .../META-INF/MANIFEST.MF | 62 +++++++ .../README.md | 3 + .../build.properties | 3 + .../dependencies/classpath.properties | 1 + .../dependencies/pom.xml | 156 ++++++++++++++++++ .../resources/META-INF/Manifest.MF | 25 +++ .../libs/.gitignore | 2 + .../pom.xml | 63 +++++++ 15 files changed, 400 insertions(+) create mode 100644 plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.classpath create mode 100644 plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.project create mode 100644 plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.settings/org.eclipse.core.resources.prefs create mode 100644 plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.settings/org.eclipse.jdt.core.prefs create mode 100644 plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.settings/org.eclipse.m2e.core.prefs create mode 100644 plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/META-INF/MANIFEST.MF create mode 100644 plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/README.md create mode 100644 plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/build.properties create mode 100644 plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/classpath.properties create mode 100644 plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/pom.xml create mode 100644 plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/resources/META-INF/Manifest.MF create mode 100644 plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/libs/.gitignore create mode 100644 plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/pom.xml diff --git a/features/org.etsi.mts.tdl.extras.feature/feature.xml b/features/org.etsi.mts.tdl.extras.feature/feature.xml index a37b59e..6c7369e 100644 --- a/features/org.etsi.mts.tdl.extras.feature/feature.xml +++ b/features/org.etsi.mts.tdl.extras.feature/feature.xml @@ -320,5 +320,11 @@ any resulting litigation. install-size="0" version="0.0.0" unpack="false"/> + diff --git a/org.etsi.mts.tdl.extras.parent/pom.xml b/org.etsi.mts.tdl.extras.parent/pom.xml index 3243ea5..01007af 100644 --- a/org.etsi.mts.tdl.extras.parent/pom.xml +++ b/org.etsi.mts.tdl.extras.parent/pom.xml @@ -11,6 +11,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs ../plugins/org.etsi.mts.tdl.extras.openapi.generator.wrapper + ../plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies + ../plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn ../plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper ../features/org.etsi.mts.tdl.extras.feature diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.classpath b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.classpath new file mode 100644 index 0000000..956fb88 --- /dev/null +++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.classpath @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.project b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.project new file mode 100644 index 0000000..0362a46 --- /dev/null +++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.project @@ -0,0 +1,45 @@ + + + org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + + + 1704887424744 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.settings/org.eclipse.core.resources.prefs b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.settings/org.eclipse.jdt.core.prefs b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..7adc0fb --- /dev/null +++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,10 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.settings/org.eclipse.m2e.core.prefs b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/META-INF/MANIFEST.MF b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/META-INF/MANIFEST.MF new file mode 100644 index 0000000..43c86a3 --- /dev/null +++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/META-INF/MANIFEST.MF @@ -0,0 +1,62 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: YANG Generator Wrapper +Bundle-SymbolicName: org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn +Bundle-Version: 1.0.0.qualifier +Export-Package: org.opendaylight.yangtools.odlext.parser, + org.opendaylight.yangtools.yang.common, + org.opendaylight.yangtools.yang.model.api, + org.opendaylight.yangtools.yang.model.api.meta, + org.opendaylight.yangtools.yang.model.api.stmt, + org.opendaylight.yangtools.yang.model.api.type, + org.opendaylight.yangtools.yang.model.repo.api, + org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff, + org.opendaylight.yangtools.yang.model.ri.type, + org.opendaylight.yangtools.yang.model.spi, + org.opendaylight.yangtools.yang.model.spi.meta, + org.opendaylight.yangtools.yang.parser.api, + org.opendaylight.yangtools.yang.parser.rfc7950.reactor, + org.opendaylight.yangtools.yang.parser.rfc7950.repo, + org.opendaylight.yangtools.yang.parser.spi.meta, + org.opendaylight.yangtools.yang.parser.spi.source, + org.opendaylight.yangtools.yang.parser.stmt.reactor +Bundle-Vendor: ETSI +Bundle-Classpath: libs/yang-data-codec-gson-13.0.1.jar, + libs/gson-2.10.1.jar, + libs/guava-32.1.3-jre.jar, + libs/failureaccess-1.0.1.jar, + libs/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar, + libs/checker-qual-3.37.0.jar, + libs/error_prone_annotations-2.21.1.jar, + libs/j2objc-annotations-2.8.jar, + libs/org.eclipse.jdt.annotation-2.2.800.jar, + libs/util-13.0.1.jar, + libs/triemap-1.3.1.jar, + libs/yang-common-13.0.1.jar, + libs/yang-data-api-13.0.1.jar, + libs/value-2.10.0-annotations.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/rfc8528-model-api-13.0.1.jar, + libs/yang-model-api-13.0.1.jar, + libs/yang-model-util-13.0.1.jar, + libs/rfc8040-model-api-13.0.1.jar, + libs/rfc8819-parser-support-13.0.1.jar, + libs/yang-model-spi-13.0.1.jar, + libs/rfc7952-model-api-13.0.1.jar, + libs/rfc8819-model-api-13.0.1.jar, + libs/yang-parser-rfc7950-13.0.1.jar, + libs/antlr4-runtime-4.13.1.jar, + libs/concepts-13.0.1.jar, + libs/yang-model-ri-13.0.1.jar, + libs/yang-parser-reactor-13.0.1.jar, + libs/yang-repo-api-13.0.1.jar, + libs/yang-ir-13.0.1.jar, + libs/yang-repo-spi-13.0.1.jar, + libs/yang-xpath-api-13.0.1.jar, + libs/yang-parser-spi-13.0.1.jar, + libs/yang-parser-api-13.0.1.jar, + libs/odlext-parser-support-13.0.1.jar, + libs/odlext-model-api-13.0.1.jar +Automatic-Module-Name: org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/README.md b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/README.md new file mode 100644 index 0000000..c635043 --- /dev/null +++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/README.md @@ -0,0 +1,3 @@ +# YANG Tools Wrapper + +This plug-in wraps the [YANG Tools](https://wiki.opendaylight.org/display/ODL/YANG+Tools) licensed under the EPL 1.0 Software Licence for consumption as an Eclipse plug-in. It is currently used as a dependency in the YANG-to-TDL generator. \ No newline at end of file diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/build.properties b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/build.properties new file mode 100644 index 0000000..7866994 --- /dev/null +++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/build.properties @@ -0,0 +1,3 @@ +bin.includes = META-INF/,\ + lib/,\ + libs/ diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/classpath.properties b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/classpath.properties new file mode 100644 index 0000000..ac273f2 --- /dev/null +++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/classpath.properties @@ -0,0 +1 @@ +classpath=libs/yang-data-codec-gson-13.0.1.jar!:!libs/gson-2.10.1.jar!:!libs/guava-32.1.3-jre.jar!:!libs/failureaccess-1.0.1.jar!:!libs/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar!:!libs/checker-qual-3.37.0.jar!:!libs/error_prone_annotations-2.21.1.jar!:!libs/j2objc-annotations-2.8.jar!:!libs/org.eclipse.jdt.annotation-2.2.800.jar!:!libs/util-13.0.1.jar!:!libs/triemap-1.3.1.jar!:!libs/yang-common-13.0.1.jar!:!libs/yang-data-api-13.0.1.jar!:!libs/value-2.10.0-annotations.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/rfc8528-model-api-13.0.1.jar!:!libs/yang-model-api-13.0.1.jar!:!libs/yang-model-util-13.0.1.jar!:!libs/rfc8040-model-api-13.0.1.jar!:!libs/rfc8819-parser-support-13.0.1.jar!:!libs/yang-model-spi-13.0.1.jar!:!libs/rfc7952-model-api-13.0.1.jar!:!libs/rfc8819-model-api-13.0.1.jar!:!libs/yang-parser-rfc7950-13.0.1.jar!:!libs/antlr4-runtime-4.13.1.jar!:!libs/concepts-13.0.1.jar!:!libs/yang-model-ri-13.0.1.jar!:!libs/yang-parser-reactor-13.0.1.jar!:!libs/yang-repo-api-13.0.1.jar!:!libs/yang-ir-13.0.1.jar!:!libs/yang-repo-spi-13.0.1.jar!:!libs/yang-xpath-api-13.0.1.jar!:!libs/yang-parser-spi-13.0.1.jar!:!libs/yang-parser-api-13.0.1.jar!:!libs/odlext-parser-support-13.0.1.jar!:!libs/odlext-model-api-13.0.1.jar \ No newline at end of file diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/pom.xml b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/pom.xml new file mode 100644 index 0000000..abcf651 --- /dev/null +++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/pom.xml @@ -0,0 +1,156 @@ + + 4.0.0 + + org.etsi.mts.tdl.extras + org.etsi.mts.tdl.extras.parent + 1.0.0-SNAPSHOT + ../../../org.etsi.mts.tdl.extras.parent + + org.etsi.mts.tdl.extras.yang.tools.wrapper.dependencies + jar + + + !:! + + + + + org.apache.maven.plugins + maven-clean-plugin + + + + ${basedir}/../libs/ + + **/* + + + .gitignore + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + generate-resources + + build-classpath + + + true + libs + true + ${classpath.placeholder} + ${basedir}/classpath.properties + + + + copy-dependencies + package + + copy-dependencies + + + ${basedir}/../libs + false + false + true + + + + + + maven-jar-plugin + + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + maven-antrun-plugin + + + test + + + + + + + + run + + + + + + + ${basedir}/classpath.properties + + + + ${basedir}/resources + true + + + + + + + org.opendaylight.yangtools + yang-data-codec-gson + 13.0.1 + + + org.opendaylight.yangtools + rfc8819-parser-support + 13.0.1 + + + org.opendaylight.yangtools + yang-parser-rfc7950 + 13.0.1 + + + org.opendaylight.yangtools + yang-parser-spi + 13.0.1 + + + org.opendaylight.yangtools + yang-parser-api + 13.0.1 + + + org.opendaylight.yangtools + odlext-parser-support + 13.0.1 + + + \ No newline at end of file diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/resources/META-INF/Manifest.MF b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/resources/META-INF/Manifest.MF new file mode 100644 index 0000000..0be6905 --- /dev/null +++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/resources/META-INF/Manifest.MF @@ -0,0 +1,25 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: YANG Generator Wrapper +Bundle-SymbolicName: org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn +Bundle-Version: 1.0.0.qualifier +Export-Package: org.opendaylight.yangtools.odlext.parser, + org.opendaylight.yangtools.yang.common, + org.opendaylight.yangtools.yang.model.api, + org.opendaylight.yangtools.yang.model.api.meta, + org.opendaylight.yangtools.yang.model.api.stmt, + org.opendaylight.yangtools.yang.model.api.type, + org.opendaylight.yangtools.yang.model.repo.api, + org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff, + org.opendaylight.yangtools.yang.model.ri.type, + org.opendaylight.yangtools.yang.model.spi, + org.opendaylight.yangtools.yang.model.spi.meta, + org.opendaylight.yangtools.yang.parser.api, + org.opendaylight.yangtools.yang.parser.rfc7950.reactor, + org.opendaylight.yangtools.yang.parser.rfc7950.repo, + org.opendaylight.yangtools.yang.parser.spi.meta, + org.opendaylight.yangtools.yang.parser.spi.source, + org.opendaylight.yangtools.yang.parser.stmt.reactor +Bundle-Vendor: ETSI +Bundle-Classpath: ${classpath} +Automatic-Module-Name: org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/libs/.gitignore b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/libs/.gitignore new file mode 100644 index 0000000..78d9101 --- /dev/null +++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/libs/.gitignore @@ -0,0 +1,2 @@ +/* +!.gitignore diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/pom.xml b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/pom.xml new file mode 100644 index 0000000..548dbf1 --- /dev/null +++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/pom.xml @@ -0,0 +1,63 @@ + + 4.0.0 + + org.etsi.mts.tdl.extras + org.etsi.mts.tdl.extras.parent + 1.0.0-SNAPSHOT + ../../org.etsi.mts.tdl.extras.parent + + org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn + eclipse-plugin + + + + maven-compiler-plugin + + + maven-resources-plugin + 3.3.1 + + + copy-resource-one + generate-sources + + copy-resources + + + META-INF + + + ${basedir}/dependencies/target/classes/META-INF + + MANIFEST.MF + + + + + + + + + + + \ No newline at end of file -- GitLab