Update openjdk version to 19 and yang2swagger version to 2.1.0
Change-Id: I16dc02009cc61f8452f3a0787b288d9c140c4ea8
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
diff --git a/Dockerfile b/Dockerfile
index 9623f7f..01475b0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,10 +41,8 @@
python3-pip \
tox
-ENV LC_ALL C.UTF-8
-ENV LANG C.UTF-8
-
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get -y install wget build-essential dh-make \
- openjdk-8-jdk maven
-RUN update-java-alternatives --set /usr/lib/jvm/java-1.8.0-openjdk-amd64
+ openjdk-19-jdk maven
+RUN update-java-alternatives --jre-headless --set /usr/lib/jvm/java-1.19.0-openjdk-amd64
+
diff --git a/Makefile b/Makefile
index 90cd86a..683a624 100644
--- a/Makefile
+++ b/Makefile
@@ -16,8 +16,8 @@
# 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
@@ -94,7 +94,7 @@
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
@@ -105,17 +105,13 @@
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
-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
diff --git a/requirements-dist.in b/requirements-dist.in
index 4f8784f..28d0ce1 100644
--- a/requirements-dist.in
+++ b/requirements-dist.in
@@ -15,4 +15,5 @@
stdeb
setuptools-version-command
-setuptools<60
\ No newline at end of file
+setuptools<60
+pyang
diff --git a/requirements-dist.txt b/requirements-dist.txt
index 8192b48..05bfb57 100644
--- a/requirements-dist.txt
+++ b/requirements-dist.txt
@@ -14,6 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#######################################################################################
+lxml==4.9.3
+ # via pyang
+pyang==2.5.3
+ # via -r requirements-dist.in
setuptools-version-command==99.9
# via -r requirements-dist.in
stdeb==0.10.0