diff options
Diffstat (limited to 'cdf')
| -rw-r--r-- | cdf/src/cdf-prop-value/cdf-prop-value/src/main/java/cdf-prop-value.jar | bin | 1592 -> 1593 bytes | |||
| -rw-r--r-- | cdf/src/cdf-prop-value/cdf-util/src/main/java/cdf-util.jar | bin | 31069 -> 31099 bytes | |||
| -rw-r--r-- | cdf/src/makefile | 14 | ||||
| -rw-r--r-- | cdf/src/repackage.json | 38 | ||||
| -rwxr-xr-x | cdf/src/stage/opt/app/cdf/bin/getpropvalue | 2 | ||||
| -rwxr-xr-x | cdf/src/stage/opt/app/cdf/bin/setencryptedvalues | 2 |
6 files changed, 27 insertions, 29 deletions
diff --git a/cdf/src/cdf-prop-value/cdf-prop-value/src/main/java/cdf-prop-value.jar b/cdf/src/cdf-prop-value/cdf-prop-value/src/main/java/cdf-prop-value.jar Binary files differindex ba5a4a7..041ad93 100644 --- a/cdf/src/cdf-prop-value/cdf-prop-value/src/main/java/cdf-prop-value.jar +++ b/cdf/src/cdf-prop-value/cdf-prop-value/src/main/java/cdf-prop-value.jar diff --git a/cdf/src/cdf-prop-value/cdf-util/src/main/java/cdf-util.jar b/cdf/src/cdf-prop-value/cdf-util/src/main/java/cdf-util.jar Binary files differindex 8c43f9a..57e01c7 100644 --- a/cdf/src/cdf-prop-value/cdf-util/src/main/java/cdf-util.jar +++ b/cdf/src/cdf-prop-value/cdf-util/src/main/java/cdf-util.jar diff --git a/cdf/src/makefile b/cdf/src/makefile index 4687dcd..369671a 100644 --- a/cdf/src/makefile +++ b/cdf/src/makefile @@ -31,25 +31,23 @@ javadocs: stage: build clean-stage clean-common mkdir -p $(INS) find stage common ! -name makefile ! -name '*~' | cpio -pudmv $(INS) - cp cdf-prop-value/cdf-prop-value/src/main/java/cdf-prop-value.jar $(INS)/stage/opt/app/cdf/lib/cdf-prop-value-1.0.0.jar - cp cdf-prop-value/cdf-util/src/main/java/cdf-util.jar $(INS)/stage/opt/app/cdf/lib/jars/cdf-util-1.0.0.jar + cp -p cdf-prop-value/cdf-prop-value/src/main/java/cdf-prop-value.jar $(INS)/stage/opt/app/cdf/lib/cdf-prop-value-1.1.0.jar + cp -p cdf-prop-value/cdf-prop-value/src/main/java/cdf-prop-value.jar $(INS)/stage/opt/app/cdf/lib/cdf-prop-value.jar + cp -p cdf-prop-value/cdf-util/src/main/java/cdf-util.jar $(INS)/stage/opt/app/cdf/lib/jars/cdf-util-1.1.0.jar + cp -p cdf-prop-value/cdf-util/src/main/java/cdf-util.jar $(INS)/stage/opt/app/cdf/lib/jars/cdf-util.jar chmod a+x $(INSCOM)/* cp -p repackage.* $(INS) -debian-verify: stage - repackage -b debian $(REPACKAGEDEBIANOPTS) -d $(INS) - @echo debian verify built - debian: stage repackage -b debian $(REPACKAGEDEBIANOPTS) -d $(INS) -u - # repackage -b debian $(REPACKAGEDEBIANOPTS) -d $(INS) -u -B LATEST + repackage -b debian $(REPACKAGEDEBIANOPTS) -d $(INS) -u -B LATEST @echo debian built upload-javadocs: javadocs cd cdf-prop-value && find cdf-*/src/main/java/javadoc -type f | while read f; do \ - curl -k --user "$${OPENECOMP_NEXUS_USER}:$${OPENECOMP_NEXUS_PASSWORD}" --upload-file "$$f" "$${OPENECOMP_NEXUS_JAVADOC}/org.openecomp.dcae.storage.cdf/1.0.0/$$f"; \ + curl -k --user "$${OPENECOMP_NEXUS_USER}:$${OPENECOMP_NEXUS_PASSWORD}" --upload-file "$$f" "$${OPENECOMP_NEXUS_JAVADOC}/org.openecomp.dcae.storage.cdf/1.1.0/$$f"; \ done # OPENECOMP_NEXUS_JAVADOC https://ecomp-nexus:8443/repository/dcae-javadoc/ # https://162.242.254.138:8443/#browse/browse/components:dcae-javadoc diff --git a/cdf/src/repackage.json b/cdf/src/repackage.json index 546fb0a..ebc287f 100644 --- a/cdf/src/repackage.json +++ b/cdf/src/repackage.json @@ -1,29 +1,29 @@ { - "executionUser": "postgres", - "maintainer": "OpenECOMP <dcae@lists.openecomp.org>", - "executionGroup": "postgres", - "directoryTreeTops": { - "/opt": "/opt/app/cdf" - }, - "description": " PostgreSQL as a Service main scripts ", - "docker": { - "tag": "latest", - "externalDependencies": [] - }, - "version": "1.1.0", "applicationName": "cdf", - "internalDependencies": [], - "fileGroup": "postgres", - "fileUser": "postgres", - "groupId": "org.openecomp.dcae.storage.pgaas", "debian": { + "conflicts": [], "externalDependencies": [ { "libgetopt-java": ">= 1.0.14" } ], "groupId": "org.openecomp.dcae.storage.pgaas", - "conflicts": [], "replaces": [] - } -} + }, + "description": " PostgreSQL as a Service main scripts ", + "directoryTreeTops": { + "/opt": "/opt/app/cdf" + }, + "docker": { + "externalDependencies": [], + "tag": "latest" + }, + "executionGroup": "postgres", + "executionUser": "postgres", + "fileGroup": "postgres", + "fileUser": "postgres", + "groupId": "org.openecomp.dcae.storage.pgaas", + "internalDependencies": [], + "maintainer": "OpenECOMP <dcae@lists.openecomp.org>", + "version": "1.1.0" +}
\ No newline at end of file diff --git a/cdf/src/stage/opt/app/cdf/bin/getpropvalue b/cdf/src/stage/opt/app/cdf/bin/getpropvalue index cd81814..f7525c6 100755 --- a/cdf/src/stage/opt/app/cdf/bin/getpropvalue +++ b/cdf/src/stage/opt/app/cdf/bin/getpropvalue @@ -17,7 +17,7 @@ P=/opt/cdf CDF=/opt/app/cdf export PATH=/opt/java/jdk/jdk170/bin:$PATH -export CLASSPATH=$CDF/lib/cdf-prop-value-1.0.0.jar:$CDF/lib/jars/cdf-util-1.0.0.jar +export CLASSPATH=$CDF/lib/cdf-prop-value.jar:$CDF/lib/jars/cdf-util.jar if [ -f $CDF/lib/jars/gnu_getopt.jar ] then CLASSPATH=$CLASSPATH:$CDF/lib/jars/gnu_getopt.jar ] elif [ -f /usr/share/java/gnu-getopt.jar ] diff --git a/cdf/src/stage/opt/app/cdf/bin/setencryptedvalues b/cdf/src/stage/opt/app/cdf/bin/setencryptedvalues index dc5b6d0..8aaeff6 100755 --- a/cdf/src/stage/opt/app/cdf/bin/setencryptedvalues +++ b/cdf/src/stage/opt/app/cdf/bin/setencryptedvalues @@ -17,7 +17,7 @@ P=/opt/cdf CDF=/opt/app/cdf export PATH=/opt/java/jdk/jdk170/bin:$PATH -export CLASSPATH=$CDF/lib/cdf-prop-value-1.0.0.jar:$CDF/lib/jars/cdf-util-1.0.0.jar +export CLASSPATH=$CDF/lib/cdf-prop-value.jar:$CDF/lib/jars/cdf-util.jar if [ -f $CDF/lib/jars/gnu_getopt.jar ] then CLASSPATH=$CLASSPATH:$CDF/lib/jars/gnu_getopt.jar ] elif [ -f /usr/share/java/gnu-getopt.jar ] |