summaryrefslogtreecommitdiffstats
path: root/dgbuilder
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2017-04-24 14:48:08 -0400
committerDan Timoney <dtimoney@att.com>2017-04-24 14:48:08 -0400
commit9e9f964cf18c0dfb9c21b5b655b0612221932070 (patch)
tree16ab84cb1144ffa70d0d2a17e2942affb4a649cb /dgbuilder
parentd3615740001815f534ba264ebf248c762748582b (diff)
[SDNC-5] Rebase SDN-C oam
Apply fixes to directed graphs and docker containers discovered during local testing Change-Id: Ie675ecea7aa5119fb0b3ee180997b3a420be3e1b Signed-off-by: Dan Timoney <dtimoney@att.com> Former-commit-id: 596540a90b7cd031151943062b8c259314acce93
Diffstat (limited to 'dgbuilder')
-rw-r--r--dgbuilder/pom.xml11
-rw-r--r--dgbuilder/src/assembly/assemble_zip.xml2
2 files changed, 5 insertions, 8 deletions
diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml
index 6c4f7587..6c185bbf 100644
--- a/dgbuilder/pom.xml
+++ b/dgbuilder/pom.xml
@@ -81,7 +81,6 @@
<descriptors>
<descriptor>src/assembly/assemble_zip.xml</descriptor>
</descriptors>
- <appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
</executions>
@@ -117,11 +116,11 @@
<execution>
<phase>generate-sources</phase>
<configuration>
- <workingDirectory>"${project.basedir}"</workingDirectory>
- <executable>build_pom_for_yang_compile</executable>
- <arguments>
- <argument>"${project.parent.version}"</argument>
- </arguments>
+ <tasks>
+ <exec executable="${project.basedir}/build_pom_for_yang_compile">
+ <arg value="${project.parent.version}"/>
+ </exec>
+ </tasks>
</configuration>
<goals>
<goal>run</goal>
diff --git a/dgbuilder/src/assembly/assemble_zip.xml b/dgbuilder/src/assembly/assemble_zip.xml
index 1c51346b..7bf22d22 100644
--- a/dgbuilder/src/assembly/assemble_zip.xml
+++ b/dgbuilder/src/assembly/assemble_zip.xml
@@ -25,8 +25,6 @@
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>bin</id>
-
<formats>
<format>zip</format>
</formats>