updates to deployment

changes for deployment stage
resynchronize seed code
add missing getopt dependency

Change-Id: I2ec2655edcb93bdf5693565fe2ed59af7eedf16f
Signed-off-by: Tony Hansen <tony@att.com>
Issue: CCSDK-18
Signed-off-by: Tony Hansen <tony@att.com>

7 files changed, 38 insertions, 32 deletions

diff --git a/cdf/src/cdf-prop-value/cdf-prop-value/src/main/java/.gitignore b/cdf/src/cdf-prop-value/cdf-prop-value/src/main/java/.gitignore
index 863d673..9709069 100644
--- a/cdf/src/cdf-prop-value/cdf-prop-value/src/main/java/.gitignore
+++ b/cdf/src/cdf-prop-value/cdf-prop-value/src/main/java/.gitignore
@@ -1 +1,3 @@
 javadoc
+javadocs.built
+*.jar
diff --git a/cdf/src/cdf-prop-value/cdf-prop-value/src/main/java/javadocs.built b/cdf/src/cdf-prop-value/cdf-prop-value/src/main/java/javadocs.built
deleted file mode 100644
index e69de29..0000000
--- a/cdf/src/cdf-prop-value/cdf-prop-value/src/main/java/javadocs.built
+++ /dev/null
diff --git a/cdf/src/cdf-prop-value/cdf-prop-value/src/main/java/makefile b/cdf/src/cdf-prop-value/cdf-prop-value/src/main/java/makefile
index f3deade..194ca4c 100644
--- a/cdf/src/cdf-prop-value/cdf-prop-value/src/main/java/makefile
+++ b/cdf/src/cdf-prop-value/cdf-prop-value/src/main/java/makefile
@@ -1,4 +1,4 @@
-go=../../../../buildjars/gnu_getopt.jar
+go=$$(find ~/.m2 -name '*getopt*.jar' | tail -1)
 cu=../../../../cdf-util/src/main/java/cdf-util.jar
 
 .SUFFIXES= .class
@@ -6,25 +6,27 @@ cu=../../../../cdf-util/src/main/java/cdf-util.jar
 JAVA=org/onap/dcae/cdf/CdfPropValue.java
 CLASSES=$(JAVA:.java=.class)
 
+JAR=cdf-prop-value.jar
+
 all:
 
-build: cdf-prop-value.jar
+build: $(JAR)
 
 classes: $(CLASSES)
 
 clean:
 	find . -name '*.class' -exec rm -f {} +
-	rm -rf javadoc javadoc.built
+	rm -rf javadoc javadocs.built $(JAR)
 
-cdf-prop-value.jar: $(CLASSES)
-	rm -f cdf-prop-value.jar
-	jar cvf cdf-prop-value.jar $(CLASSES)
+$(JAR): $(CLASSES)
+	rm -f $(JAR)
+	jar cvf $(JAR) $(CLASSES)
 
 $(CLASSES): $(JAVA)
 	javac -cp $(go):$(cu) $(JAVA)
 
 javadocs: javadocs.built
-javadocs.built: cdf-prop-value.jar
+javadocs.built: $(JAR)
 	rm -rf javadoc
 	mkdir -p javadoc
 	javadoc -d javadoc -classpath $(go):$(cu) $(JAVA)
diff --git a/cdf/src/cdf-prop-value/cdf-util/src/main/java/.gitignore b/cdf/src/cdf-prop-value/cdf-util/src/main/java/.gitignore
index 863d673..87070e9 100644
--- a/cdf/src/cdf-prop-value/cdf-util/src/main/java/.gitignore
+++ b/cdf/src/cdf-prop-value/cdf-util/src/main/java/.gitignore
@@ -1 +1,2 @@
 javadoc
+*.jar
diff --git a/cdf/src/cdf-prop-value/cdf-util/src/main/java/makefile b/cdf/src/cdf-prop-value/cdf-util/src/main/java/makefile
index 268770c..71e77b3 100644
--- a/cdf/src/cdf-prop-value/cdf-util/src/main/java/makefile
+++ b/cdf/src/cdf-prop-value/cdf-util/src/main/java/makefile
@@ -1,5 +1,4 @@
-
-go=../../../../buildjars/gnu_getopt.jar
+go=$$(find ~/.m2 -name '*getopt*.jar' | tail -1)
 
 .SUFFIXES= .class
 
@@ -26,13 +25,15 @@ JAVA=	org/onap/dcae/cdf/util/common/Classify.java \
 
 CLASSES=$(JAVA:.java=.class)
 
+JAR=cdf-util.jar
+
 all:
 
-build: cdf-util.jar
+build: $(JAR)
 
-cdf-util.jar: $(CLASSES)
-	rm -f cdf-util.jar
-	jar cvf cdf-util.jar $(CLASSES)
+$(JAR): $(CLASSES)
+	rm -f $(JAR)
+	jar cvf $(JAR) $(CLASSES)
 
 clean: 
 	find . -name '*.class' -exec rm -f {} +
@@ -42,7 +43,7 @@ $(CLASSES): $(JAVA)
 	javac -cp $(go) $(JAVA)
 
 javadocs: javadocs.built
-javadocs.built: cdf-util.jar
+javadocs.built: $(JAR)
 	rm -rf javadoc
 	mkdir -p javadoc
 	javadoc -d javadoc -classpath $(go) $(JAVA)
diff --git a/cdf/src/makefile b/cdf/src/makefile
index fdd7748..faa08b9 100644
--- a/cdf/src/makefile
+++ b/cdf/src/makefile
@@ -42,8 +42,8 @@ stage: build clean-stage clean-common
 
 
 debian: stage
-	sed 's/$${RELLONG}/$(RELLONG)/' < repackage.yaml > $(INS)/repackage.yaml
-	repackage -b debian $(REPACKAGEDEBIANOPTS) -d $(INS) -u -M "{datetime},LATEST" -y $(INS)/repackage.yaml
+	sed 's/$${RELLONG}/'"$$MVN_VERSION_ONLY/" < repackage.json > $(INS)/repackage.json
+	repackage -b debian $(REPACKAGEDEBIANOPTS) -d $(INS) -u -X "{appname}.{suffix},{appname}.{suffix}-{version}$$SNAPSHOT,{appname}.{suffix}-{version}$$SNAPSHOT-{datetime}" -y $(INS)/repackage.json
 	@echo debian built
 
 upload-javadocs: javadocs
diff --git a/cdf/src/repackage.json b/cdf/src/repackage.json
index 4618183..ce7a546 100644
--- a/cdf/src/repackage.json
+++ b/cdf/src/repackage.json
@@ -1,29 +1,29 @@
 {
+    "applicationName": "cdf",
     "debian": {
-        "groupId": "org.onap.dcae.storage.pgaas",
         "conflicts": [],
-        "replaces": [],
         "externalDependencies": [
             {
                 "libgetopt-java": ">= 1.0.14"
             }
-        ]
-    },
-    "fileGroup": "postgres",
-    "internalDependencies": [],
-    "fileUser": "postgres",
-    "executionUser": "postgres",
-    "executionGroup": "postgres",
-    "docker": {
-        "tag": "latest",
-        "externalDependencies": []
+        ],
+        "groupId": "org.onap.dcae.storage.pgaas",
+        "replaces": []
     },
-    "version": "${RELLONG}",
+    "description": " PostgreSQL as a Service main scripts ",
     "directoryTreeTops": {
         "/opt": "/opt/app/cdf"
     },
-    "maintainer": "ONAP <dcae@lists.onap.org>",
+    "docker": {
+        "externalDependencies": [],
+        "tag": "latest"
+    },
+    "executionGroup": "postgres",
+    "executionUser": "postgres",
+    "fileGroup": "postgres",
+    "fileUser": "postgres",
     "groupId": "org.onap.dcae.storage.pgaas",
-    "applicationName": "cdf",
-    "description": " PostgreSQL as a Service main scripts "
+    "internalDependencies": [],
+    "maintainer": "ONAP <dcae@lists.onap.org>",
+    "version": "${RELLONG}"
 }
\ No newline at end of file