diff options
| author |   Patrick Brady <pb071s@att.com> | 2018-05-07 15:28:37 -0700 |
|---|---|---|
| committer | Patrick Brady <pb071s@att.com> | 2018-05-07 23:14:44 -0700 |
| commit | 6a6861d5a4c58c194b5cd81e9e1da164c83a393e (patch) | |
| tree | 2b904ae170074a748c5940193107e5ce0660aaa9 | |
| parent | f2f020d8ff896e4b9f45637f4bfacb80dabe909e (diff) | |
Download DGs from main appc project
Instead of using the extra copy of DGs that exist in the
deployment project, we are now pulling them from the main
appc project as part of the build.
Change-Id: I5f7ddab8e9000dd626b5d26628d44dc6878ce524
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-887
| -rw-r--r-- | installation/appc/src/main/scripts/installZips.sh | 6 | ||||
| -rw-r--r-- | platform-logic/appc/pom.xml | 35 |
2 files changed, 5 insertions, 36 deletions
diff --git a/installation/appc/src/main/scripts/installZips.sh b/installation/appc/src/main/scripts/installZips.sh index 8a93d8a..9296c3b 100644 --- a/installation/appc/src/main/scripts/installZips.sh +++ b/installation/appc/src/main/scripts/installZips.sh @@ -18,7 +18,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END========================================================= -# ECOMP is a trademark and service mark of AT&T Intellectual Property. ### if [ -z "$SETTINGS_FILE" -a -z "$GLOBAL_SETTINGS_FILE" -a -s "$HOME"/.m2/settings.xml ] @@ -118,6 +117,11 @@ rm -f /tmp/platform-logic-installer*.zip mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.appc.deployment:platform-logic-installer:${APPC_OAM_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true unzip -d ${targetDir} /tmp/platform-logic-installer*.zip +echo "Downloading dg-loader DGs from nexus" +mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.appc:appc-dg-provider:${APPC_VERSION} -DoutputDirectory=/tmp +unzip -d ${targetDir}/svclogic/graphs/appc/json /tmp/appc-dg-provider*.jar json/** +mv ${targetDir}/svclogic/graphs/appc/json/json ${targetDir}/svclogic/graphs/appc/json/dg-loader-dgs + echo "Downloading dg-loader-provider jar from nexus" mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.appc.plugins:dg-loader-provider:${APPC_VERSION}:jar:jar-with-dependencies -DoutputDirectory=${targetDir}/data mv ${targetDir}/data/dg-loader-provider-*-jar-with-dependencies.jar ${targetDir}/data/dg-loader-provider-jar-with-dependencies.jar diff --git a/platform-logic/appc/pom.xml b/platform-logic/appc/pom.xml index 258c121..4dce7db 100644 --- a/platform-logic/appc/pom.xml +++ b/platform-logic/appc/pom.xml @@ -18,8 +18,6 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - -ECOMP is a trademark and service mark of AT&T Intellectual Property. ============LICENSE_END============================================ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -75,39 +73,6 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. </execution> </executions> </plugin> - <!-- Copying the JSON DG Graph scripts from platform-logic/appc/src/main/json/dg-loader-dgs to container's <SVCLOGIC_DIR>/graphs/appc/json/dg-loader-dgs path --> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-dgloader-dgs</id> - <goals> - <goal>copy-resources</goal> - </goals> - <phase>validate</phase> - <configuration> - <outputDirectory>../target/graphs/appc/json/dg-loader-dgs</outputDirectory> - <resources> - <resource> - <directory>src/main/json/dg-loader-dgs</directory> - <includes> - <include>**/*.json</include> - </includes> - <filtering>true</filtering> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>dg_activate.txt</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> <!-- Copying the default platform-logic scripts from platform-logic/appc/src/main/json to container's <SVCLOGIC_DIR>/graphs/appc/json path --> <plugin> <artifactId>maven-resources-plugin</artifactId> |