projects
/
osm
/
IM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update openjdk version to 19 and yang2swagger version to 2.1.0
[osm/IM.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
90cd86a
..
683a624
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-16,8
+16,8
@@
# NOTE: pyang and pyangbind are required for build
# NOTE: pyang and pyangbind are required for build
-.PHONY: all clean package trees
deps
yang-ietf openapi_schemas yang2swagger
-JAVA := /usr/lib/jvm/java-
8-openjdk-amd64/jre
/bin/java
+.PHONY: all clean package trees yang-ietf openapi_schemas yang2swagger
+JAVA := /usr/lib/jvm/java-
19-openjdk-amd64
/bin/java
PYANG := pyang
ifeq ($(OS),Windows_NT) # is Windows_NT on XP, 2000, 7, Vista, 10...
PYTHON_INTERPRETER := python
PYANG := pyang
ifeq ($(OS),Windows_NT) # is Windows_NT on XP, 2000, 7, Vista, 10...
PYTHON_INTERPRETER := python
@@
-94,7
+94,7
@@
$(TREES_DIR):
osm.yaml: yang-ietf yang2swagger
$(Q)echo generating $@
osm.yaml: yang-ietf yang2swagger
$(Q)echo generating $@
- $(Q)$(JAVA) -jar ${HOME}/.m2/repository/com/mrv/yangtools/swagger-generator-cli/
1.1.14/swagger-generator-cli-1.1.14
-executable.jar -yang-dir $(MODEL_DIR) -output $(OUT_DIR)/$@
+ $(Q)$(JAVA) -jar ${HOME}/.m2/repository/com/mrv/yangtools/swagger-generator-cli/
2.1.0/swagger-generator-cli-2.1.0
-executable.jar -yang-dir $(MODEL_DIR) -output $(OUT_DIR)/$@
yang-ietf:
$(Q)wget -q https://raw.githubusercontent.com/YangModels/yang/master/standard/ietf/RFC/ietf-yang-types%402013-07-15.yang -O $(MODEL_DIR)/ietf-yang-types.yang
yang-ietf:
$(Q)wget -q https://raw.githubusercontent.com/YangModels/yang/master/standard/ietf/RFC/ietf-yang-types%402013-07-15.yang -O $(MODEL_DIR)/ietf-yang-types.yang
@@
-105,17
+105,13
@@
yang-ietf:
yang2swagger:
$(Q)mkdir -p ${HOME}/.m2
$(Q)wget -q -O ${HOME}/.m2/settings.xml https://raw.githubusercontent.com/opendaylight/odlparent/master/settings.xml
yang2swagger:
$(Q)mkdir -p ${HOME}/.m2
$(Q)wget -q -O ${HOME}/.m2/settings.xml https://raw.githubusercontent.com/opendaylight/odlparent/master/settings.xml
- git clone https://github.com/bartoszm/yang2swagger.git
- git -C yang2swagger checkout tags/1.1.14
- mvn -f yang2swagger/pom.xml clean install
+
$(Q)
git clone https://github.com/bartoszm/yang2swagger.git
+ $(Q)git -C yang2swagger checkout tags/2.1.0
+
$(Q)
mvn -f yang2swagger/pom.xml clean install
package:
./build-docs.sh
package:
./build-docs.sh
-deps:
- $(Q)mkdir -p ${HOME}/.m2
- $(Q)cp -n ${HOME}/.m2/settings.xml ${HOME}/.m2/settings.xml.orig ; wget -q -O - https://raw.githubusercontent.com/opendaylight/odlparent/master/settings.xml > ${HOME}/.m2/settings.xml
-
sol006_deps:
$(Q)git clone --single-branch --branch v2.6.1 https://forge.etsi.org/rep/nfv/SOL006.git sol006_model
$(Q)patch -p2 < patch/deref_warnings.patch
sol006_deps:
$(Q)git clone --single-branch --branch v2.6.1 https://forge.etsi.org/rep/nfv/SOL006.git sol006_model
$(Q)patch -p2 < patch/deref_warnings.patch