[VOL-5056] - Build and release voltha-protos
VERSION
Makefile
test/pom.xml
------------
o Update maven artifact dependencies
go/openolt/openolt.pb.go
go/voltha/device.pb.go
go/voltha/events.pb.go
------------------------
o Run gofmt -s -w to cleanup sources.
Change-Id: Ib077ce75937e2da3f65e7617f70a68b7f15f3a12
diff --git a/Makefile b/Makefile
index b8dae50..23f858c 100755
--- a/Makefile
+++ b/Makefile
@@ -154,10 +154,8 @@
## -----------------------------------------------------------------------
python-test: tox.ini setup.py python-protos
$(call banner-enter,target $@)
-
$(activate) && python --version
tox
-
$(call banner-leave,target $@)
## -----------------------------------------------------------------------
@@ -204,20 +202,14 @@
## -----------------------------------------------------------------------
go-protos: voltha.pb
- @echo
- @echo "** -----------------------------------------------------------------------"
- @echo "** $(MAKE): processing target [$@]"
- @echo "** Creating *.go.pb files"
- @echo "** -----------------------------------------------------------------------"
-
- $(docker-sh) $(quote-double) /bin/ls -ld /go/src $(quote-double)
-
- ${PROTOC_SH} $(quote-double) \
- find /go/src -print0 | xargs -0 /bin/ls -ld \
- $(quote-double)
-
$(call banner-enter,target $@)
+# $(docker-sh) $(quote-double) /bin/ls -ld /go/src $(quote-double)
+# ${PROTOC_SH} $(quote-double) \
+# find /go/src -print0 | xargs -0 /bin/ls -ld \
+# $(quote-double)
+
+ @echo "** Creating *.go.pb files"
${PROTOC_SH} $(quote-double)\
set -e -o pipefail; \
for x in ${PROTO_FILES}; do \
@@ -289,7 +281,7 @@
# TODO: Remove the extra step, use makefile deps and
# generate in-place as needed.
@mkdir -p java
- cp -r java_temp/src/main/java/* java
+ rsync -r --checksum java_temp/src/main/java/. java/.
$(call banner-leave,target $@)
@@ -313,6 +305,15 @@
lint :
## -----------------------------------------------------------------------
+## Intent: Make sterile is unrecoverable due to handling of java_temp
+## -----------------------------------------------------------------------
+protos-clean:
+ $(MAKE) sterile
+ $(MAKE) build
+ $(MAKE) protos
+ $(MAKE) test
+
+## -----------------------------------------------------------------------
## Intent: Display/debug targets
## -----------------------------------------------------------------------
.PHONY: show-proto-files
diff --git a/VERSION b/VERSION
index 3191ed8..f13d194 100755
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.4.6.1-dev
+5.4.7
diff --git a/test/pom.xml b/test/pom.xml
index 1a13f06..c671620 100755
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>3.10.0</version>
+ <version>3.23.3</version>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>