diff options
| author |   da490c <dave.adams@amdocs.com> | 2018-06-20 15:29:48 -0400 |
|---|---|---|
| committer | da490c <dave.adams@amdocs.com> | 2018-06-20 17:08:31 -0400 |
| commit | 8eed25b1f4f0ab8306b10c5b77e34143e75d07e8 (patch) | |
| tree | a5069c46a0a965546015f44d09d6775f92422bbb /sparkybe-onap-application | |
| parent | 3c54febdf3d6e49bd50c7aeca5b4476becfdd027 (diff) | |
Add multi-oxm support to sparky-be
Issue-ID: AAI-1232
Change-Id: Ib26fe496f022baf680884ebcee6a02e8eb18c985
Signed-off-by: da490c <dave.adams@amdocs.com>
Diffstat (limited to 'sparkybe-onap-application')
| -rw-r--r-- | sparkybe-onap-application/pom.xml | 41 | ||||
| -rw-r--r-- | sparkybe-onap-application/src/main/docker/Dockerfile | 2 |
2 files changed, 38 insertions, 5 deletions
diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml index cc5e004..287debe 100644 --- a/sparkybe-onap-application/pom.xml +++ b/sparkybe-onap-application/pom.xml @@ -26,7 +26,8 @@ <config-home>${basedir}/</config-home> <docker.location>${basedir}/target</docker.location> <docker.image.name>sparky-be</docker.image.name> - <sitePath>/content/sites/site/org/onap/aai/sparky-be/${project.artifactId}/${project.version}</sitePath> + <version.aai-schema>1.2.4</version.aai-schema> + <sitePath>/content/sites/site/org/onap/aai/sparky-be/${project.artifactId}/${project.version}</sitePath> <nexusproxy>https://nexus.onap.org</nexusproxy> </properties> @@ -42,12 +43,14 @@ <scope>import</scope> </dependency> - <dependency> + <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> <version>1.2.1</version> </dependency> + + </dependencies> </dependencyManagement> @@ -84,6 +87,10 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + </exclusion> </exclusions> </dependency> @@ -552,7 +559,6 @@ <forceTags>true</forceTags> </configuration> </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> @@ -582,7 +588,33 @@ <include>src/main/java/**</include> </includes> </configuration> <executions> <execution> <goals> <goal>format</goal> </goals> <phase>process-sources</phase> </execution> </executions> </plugin> --> - + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack</id> + <phase>prepare-package</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.onap.aai.aai-common</groupId> + <artifactId>aai-schema</artifactId> + <version>${version.aai-schema}</version> + <type>jar</type> + <includes>oxm/</includes> + <outputDirectory>${project.build.directory}/</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> @@ -621,5 +653,4 @@ <url>${nexusproxy}/content/repositories/snapshots/</url> </repository> </repositories> - </project> diff --git a/sparkybe-onap-application/src/main/docker/Dockerfile b/sparkybe-onap-application/src/main/docker/Dockerfile index 06e9d86..52e3e84 100644 --- a/sparkybe-onap-application/src/main/docker/Dockerfile +++ b/sparkybe-onap-application/src/main/docker/Dockerfile @@ -23,6 +23,8 @@ ADD *.jar $MICRO_HOME/lib/ ADD scripts/* $MICRO_HOME/bin/ COPY static/ $MICRO_HOME/static/ +COPY oxm $MICRO_HOME/oxm/ + RUN chmod 755 $MICRO_HOME/bin/* RUN chmod 755 $MICRO_HOME/lib/* RUN chmod 755 $MICRO_HOME/static/* |