The generation process, as a side-effect, is also including
some META-INF folders to the project final files. When
skipping the generation process, this inclusion must
be done separately
Change-Id: I1e2d2f48a2fc5b33c06ba83258a477b5a046ee08
Signed-off-by: David <david.lopez.munoz@ericsson.com>
private static final String TARGET_GENERATED_SOURCES = "target" + File.separator + "generated-sources";
private static final String CODE_GEN_DEFAULT_RESOURCE_DIR = TARGET_GENERATED_SOURCES + File.separator + "spi";
public static final String YANG_GENERATED_DIR = TARGET_GENERATED_SOURCES + File.separator + "yang";
private static final String TARGET_GENERATED_SOURCES = "target" + File.separator + "generated-sources";
private static final String CODE_GEN_DEFAULT_RESOURCE_DIR = TARGET_GENERATED_SOURCES + File.separator + "spi";
public static final String YANG_GENERATED_DIR = TARGET_GENERATED_SOURCES + File.separator + "yang";
+ public static final String YANG_SERVICES_GENERATED_DIR = TARGET_GENERATED_SOURCES + File.separator + "spi";
private String codeGeneratorClass;
private String codeGeneratorClass;
static final String LOG_PREFIX = "yang-to-sources:";
static final String META_INF_YANG_STRING = "META-INF" + File.separator + "yang";
static final String META_INF_YANG_STRING_JAR = "META-INF" + "/" + "yang";
static final String LOG_PREFIX = "yang-to-sources:";
static final String META_INF_YANG_STRING = "META-INF" + File.separator + "yang";
static final String META_INF_YANG_STRING_JAR = "META-INF" + "/" + "yang";
+ static final String META_INF_YANG_SERVICES_STRING_JAR = "META-INF" + "/" + "services";
private final File yangFilesRootDir;
private final File[] excludedFiles;
private final File yangFilesRootDir;
private final File[] excludedFiles;
void conditionalExecute(boolean skip) throws MojoExecutionException, MojoFailureException {
if (skip) {
LOG.info("Skipping YANG code generation because property yang.skip is true");
void conditionalExecute(boolean skip) throws MojoExecutionException, MojoFailureException {
if (skip) {
LOG.info("Skipping YANG code generation because property yang.skip is true");
+
+ // But manually add resources
+ // add META_INF/yang
+ yangProvider.addYangsToMetaInf(project, yangFilesRootDir, excludedFiles);
+
+ // add META_INF/services
+ File generatedServicesDir = new File(project.getBasedir(), CodeGeneratorArg.YANG_SERVICES_GENERATED_DIR);
+ yangProvider.setResource(generatedServicesDir, project);
+ LOG.debug("{} Yang services files from: {} marked as resources: {}", LOG_PREFIX, generatedServicesDir,
+ META_INF_YANG_SERVICES_STRING_JAR);
+
+