From 5bc6689708061e4e0acf222228f5c408ebd8db9d Mon Sep 17 00:00:00 2001 From: Ivan Hrasko Date: Fri, 5 Jan 2024 14:39:05 +0100 Subject: [PATCH] Remove no more used RFC 8040 configuration file Delete not used restconf8040.cfg file which was supposed to hold configuration which can be in fact set in karaf's etc/org.opendaylight.restconf.nb.rfc8040 file. When present the file is used to overwrite default values specified in OSGiNorthbound class. JIRA: NETCONF-1219 Change-Id: I6dbc1c5696b59d6b2592dbbf01873243ebacd73f Signed-off-by: Ivan Hrasko Signed-off-by: Samuel Schneider --- features/odl-restconf-nb/pom.xml | 6 ----- .../src/main/feature/feature.xml | 3 --- restconf/restconf-nb/pom.xml | 22 ------------------- .../src/main/resources/restconf8040.cfg | 9 -------- 4 files changed, 40 deletions(-) delete mode 100644 restconf/restconf-nb/src/main/resources/restconf8040.cfg diff --git a/features/odl-restconf-nb/pom.xml b/features/odl-restconf-nb/pom.xml index b372bdab5e..38a6c7d9e3 100644 --- a/features/odl-restconf-nb/pom.xml +++ b/features/odl-restconf-nb/pom.xml @@ -49,11 +49,5 @@ org.opendaylight.netconf restconf-nb - - org.opendaylight.netconf - restconf-nb - cfg - config - diff --git a/features/odl-restconf-nb/src/main/feature/feature.xml b/features/odl-restconf-nb/src/main/feature/feature.xml index b99ff8a868..622ce6a682 100644 --- a/features/odl-restconf-nb/src/main/feature/feature.xml +++ b/features/odl-restconf-nb/src/main/feature/feature.xml @@ -9,8 +9,5 @@ odl-mdsal-model-rfc8072 - - mvn:org.opendaylight.netconf/restconf-nb/${project.version}/cfg/config - diff --git a/restconf/restconf-nb/pom.xml b/restconf/restconf-nb/pom.xml index 2939356f69..62360293b0 100644 --- a/restconf/restconf-nb/pom.xml +++ b/restconf/restconf-nb/pom.xml @@ -331,28 +331,6 @@ - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/restconf8040.cfg - cfg - config - - - - - - diff --git a/restconf/restconf-nb/src/main/resources/restconf8040.cfg b/restconf/restconf-nb/src/main/resources/restconf8040.cfg deleted file mode 100644 index 58eac641c8..0000000000 --- a/restconf/restconf-nb/src/main/resources/restconf8040.cfg +++ /dev/null @@ -1,9 +0,0 @@ -#example of restconf8040 configuration -#Default values: -#maximum-fragment-length=0 -#heartbeat-interval=10000 -#idle-timeout=30000 -#ping-executor-name-prefix=ping-executor -#max-thread-count=1 -# Note: this option is deprecated and scheduled for removal -#use-sse=true -- 2.36.6