Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
<executions>
<execution>
<id>copy-dockerfile-and-license</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ public boolean initModules() {

this.lightyRestconf = initRestconf(this.appModuleConfig.getRestconfConfig(),
this.lightyController.getServices());
lightyController.getServices().withJaxRsEndpoint(lightyRestconf.getJaxRsEndpoint());
startAndWaitLightyModule(this.lightyRestconf);

final AAAEncryptionService encryptionService = createEncryptionServiceWithErrorHandling();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
{ "usedBy": "RESTCONF", "name": "sal-remote-augment", "revision": "2023-11-03", "nameSpace": "urn:sal:restconf:event:subscription"},
{ "usedBy": "RESTCONF/NETCONF", "name": "ietf-yang-library", "revision": "2019-01-04", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-yang-library"},
{ "usedBy": "NETCONF", "name": "netconf-keystore", "revision": "2024-07-08", "nameSpace": "urn:opendaylight:netconf:keystore"},
{ "usedBy": "NETCONF", "name": "netconf-node-topology", "revision": "2024-09-11", "nameSpace": "urn:opendaylight:netconf-node-topology"},
{ "usedBy": "NETCONF", "name": "netconf-node-topology", "revision": "2025-12-05", "nameSpace": "urn:opendaylight:netconf-node-topology"},
{ "usedBy": "NETCONF", "name":"ietf-netconf", "revision":"2011-06-01", "nameSpace":"urn:ietf:params:xml:ns:netconf:base:1.0"},
{ "usedBy": "AAA", "name": "aaa-cert-mdsal", "revision":"2016-03-21", "nameSpace":"urn:opendaylight:yang:aaa:cert:mdsal"},
{ "usedBy": "AAA", "name": "aaa", "revision": "2016-12-14", "nameSpace": "urn:opendaylight:params:xml:ns:yang:aaa"},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
<executions>
<execution>
<id>copy-dockerfile-and-license</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ data:
{ "usedBy": "RESTCONF", "name": "ietf-restconf", "revision": "2017-01-26", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-restconf"},
{ "usedBy": "RESTCONF/NETCONF", "name": "ietf-yang-library", "revision": "2019-01-04", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-yang-library"},
{ "usedBy": "NETCONF", "name": "netconf-keystore", "revision": "2024-07-08", "nameSpace": "urn:opendaylight:netconf:keystore"},
{ "usedBy": "NETCONF", "name": "netconf-node-topology", "revision": "2024-09-11", "nameSpace": "urn:opendaylight:netconf-node-topology"},
{ "usedBy": "NETCONF", "name": "netconf-node-topology", "revision": "2025-12-05", "nameSpace": "urn:opendaylight:netconf-node-topology"},
{ "usedBy": "NETCONF", "name":"ietf-netconf", "revision":"2011-06-01", "nameSpace":"urn:ietf:params:xml:ns:netconf:base:1.0"},
{ "usedBy": "AAA", "name": "aaa-cert-mdsal", "revision":"2016-03-21", "nameSpace":"urn:opendaylight:yang:aaa:cert:mdsal"},
{ "usedBy": "AAA", "name": "aaa", "revision": "2016-12-14", "nameSpace": "urn:opendaylight:params:xml:ns:yang:aaa"},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ public boolean initModules() {
}

if (rncModuleConfig.getServerConfig().isEnableOpenApi()) {
lightyController.getServices().withJaxRsEndpoint(lightyRestconf.getJaxRsEndpoint());
this.openApi = initOpenApiLighty(this.rncModuleConfig.getRestconfConfig(),
this.jettyServerBuilder,
this.lightyController.getServices());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
{ "usedBy": "RESTCONF", "name": "ietf-restconf-monitoring", "revision": "2017-01-26", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-restconf-monitoring"},
{ "usedBy": "RESTCONF/NETCONF", "name": "ietf-yang-library", "revision": "2019-01-04", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-yang-library"},
{ "usedBy": "NETCONF", "name": "netconf-keystore", "revision": "2024-07-08", "nameSpace": "urn:opendaylight:netconf:keystore"},
{ "usedBy": "NETCONF", "name": "netconf-node-topology", "revision": "2024-09-11", "nameSpace": "urn:opendaylight:netconf-node-topology"},
{ "usedBy": "NETCONF", "name": "netconf-node-topology", "revision": "2025-12-05", "nameSpace": "urn:opendaylight:netconf-node-topology"},
{ "usedBy": "NETCONF", "name":"ietf-netconf", "revision":"2011-06-01", "nameSpace":"urn:ietf:params:xml:ns:netconf:base:1.0"},
{ "usedBy": "AAA", "name": "aaa", "revision": "2016-12-14", "nameSpace": "urn:opendaylight:params:xml:ns:yang:aaa"},
{ "usedBy": "AAA", "name": "aaa-cert-mdsal", "revision":"2016-03-21", "nameSpace":"urn:opendaylight:yang:aaa:cert:mdsal"},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
{ "usedBy": "RESTCONF", "name": "sal-remote-augment", "revision": "2023-11-03", "nameSpace": "urn:sal:restconf:event:subscription"},
{ "usedBy": "RESTCONF/NETCONF", "name": "ietf-yang-library", "revision": "2019-01-04", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-yang-library"},
{ "usedBy": "NETCONF", "name": "netconf-keystore", "revision": "2024-07-08", "nameSpace": "urn:opendaylight:netconf:keystore"},
{ "usedBy": "NETCONF", "name": "netconf-node-topology", "revision": "2024-09-11", "nameSpace": "urn:opendaylight:netconf-node-topology"},
{ "usedBy": "NETCONF", "name": "netconf-node-topology", "revision": "2025-12-05", "nameSpace": "urn:opendaylight:netconf-node-topology"},
{ "usedBy": "NETCONF", "name":"ietf-netconf", "revision":"2011-06-01", "nameSpace":"urn:ietf:params:xml:ns:netconf:base:1.0"},
{ "usedBy": "AAA", "name": "aaa-cert-mdsal", "revision":"2016-03-21", "nameSpace":"urn:opendaylight:yang:aaa:cert:mdsal"},
{ "usedBy": "AAA", "name": "aaa", "revision": "2016-12-14", "nameSpace": "urn:opendaylight:params:xml:ns:yang:aaa"},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
{ "usedBy": "RESTCONF", "name": "sal-remote-augment", "revision": "2023-11-03", "nameSpace": "urn:sal:restconf:event:subscription"},
{ "usedBy": "RESTCONF/NETCONF", "name": "ietf-yang-library", "revision": "2019-01-04", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-yang-library"},
{ "usedBy": "NETCONF", "name": "netconf-keystore", "revision": "2024-07-08", "nameSpace": "urn:opendaylight:netconf:keystore"},
{ "usedBy": "NETCONF", "name": "netconf-node-topology", "revision": "2024-09-11", "nameSpace": "urn:opendaylight:netconf-node-topology"},
{ "usedBy": "NETCONF", "name": "netconf-node-topology", "revision": "2025-12-05", "nameSpace": "urn:opendaylight:netconf-node-topology"},
{ "usedBy": "NETCONF", "name":"ietf-netconf", "revision":"2011-06-01", "nameSpace":"urn:ietf:params:xml:ns:netconf:base:1.0"},
{ "usedBy": "AAA", "name": "aaa-cert-mdsal", "revision":"2016-03-21", "nameSpace":"urn:opendaylight:yang:aaa:cert:mdsal"},
{ "usedBy": "AAA", "name": "aaa", "revision": "2016-12-14", "nameSpace": "urn:opendaylight:params:xml:ns:yang:aaa"},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
{ "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:inmemory-datastore-provider", "name": "opendaylight-inmemory-datastore-provider", "revision": "2014-06-17" },
{ "nameSpace": "urn:ietf:params:xml:ns:yang:iana-afn-safi", "name": "iana-afn-safi", "revision": "2013-07-04" },
{ "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl", "name": "opendaylight-sal-binding-broker-impl", "revision": "2013-10-28" },
{ "nameSpace": "urn:opendaylight:netconf-node-topology", "name": "netconf-node-topology", "revision": "2024-09-11" },
{ "nameSpace": "urn:opendaylight:netconf-node-topology", "name": "netconf-node-topology", "revision": "2025-12-05" },
{ "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-restconf", "name": "ietf-restconf", "revision": "2017-01-26" },
{ "nameSpace": "urn:ietf:params:xml:ns:netmod:notification", "name": "nc-notifications", "revision": "2008-07-14" },
{ "nameSpace": "urn:opendaylight:l2:types", "name": "opendaylight-l2-types", "revision": "2013-08-27" },
Expand Down
50 changes: 8 additions & 42 deletions lighty-core/dependency-versions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,10 @@

<dependencyManagement>
<dependencies>
<!-- FIXME remove this when ODL bumps to newer jetty -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>9.4.58.v20250814</version>
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent</artifactId>
<version>14.1.7</version>
<version>14.3.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -40,49 +34,49 @@
<dependency>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-artifacts</artifactId>
<version>0.21.3</version>
<version>0.21.4</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>controller-artifacts</artifactId>
<version>11.0.3</version>
<version>11.0.4</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.infrautils</groupId>
<artifactId>infrautils-artifacts</artifactId>
<version>7.1.10</version>
<version>7.1.12</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
<version>14.0.20</version>
<version>14.0.21</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-artifacts</artifactId>
<version>9.0.1</version>
<version>9.0.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yangtools-artifacts</artifactId>
<version>14.0.21</version>
<version>14.0.23</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.bgpcep</groupId>
<artifactId>bgpcep-artifacts</artifactId>
<version>0.23.1</version>
<version>0.23.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -121,34 +115,6 @@
<version>1.5.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.fusesource.leveldbjni</groupId>
<artifactId>leveldbjni-all</artifactId>
<version>1.8</version>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<version>4.8.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.14.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.20.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.21.0</version>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions lighty-core/lighty-binding-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
<version>14.0.17</version>
<version>14.0.23</version>
<dependencies>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>binding-codegen</artifactId>
<version>14.0.17</version>
<version>14.0.23</version>
</dependency>
</dependencies>
<executions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService;
import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService;
import org.opendaylight.mdsal.singleton.api.ClusterSingletonServiceProvider;
import org.opendaylight.restconf.server.jaxrs.JaxRsEndpoint;
import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer;
import org.opendaylight.yangtools.binding.data.codec.impl.di.DefaultDynamicBindingDataCodec;
import org.opendaylight.yangtools.yang.parser.api.YangParserFactory;
Expand Down Expand Up @@ -114,8 +113,4 @@ public interface LightyServices extends LightyModuleRegistryService {

RpcService getRpcConsumerRegistry();

JaxRsEndpoint getJaxRsEndpoint();

void withJaxRsEndpoint(JaxRsEndpoint endpoint);

}
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@
import org.opendaylight.mdsal.singleton.api.ClusterSingletonServiceProvider;
import org.opendaylight.mdsal.singleton.impl.EOSClusterSingletonServiceProvider;
import org.opendaylight.netconf.yanglib.writer.YangLibraryWriterSingleton;
import org.opendaylight.restconf.server.jaxrs.JaxRsEndpoint;
import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer;
import org.opendaylight.yangtools.binding.data.codec.impl.BindingCodecContext;
import org.opendaylight.yangtools.binding.data.codec.impl.di.DefaultDynamicBindingDataCodec;
Expand Down Expand Up @@ -180,7 +179,6 @@ public class LightyControllerImpl extends AbstractLightyModule implements Lighty
private Optional<InitialConfigData> initialConfigData;
private RpcService rpcConsumerRegistry;
private YangLibraryWriterSingleton yangLibraryWriter;
private JaxRsEndpoint jaxRsEndpoint;


public LightyControllerImpl(final ExecutorService executorService, final Config actorSystemConfig,
Expand Down Expand Up @@ -609,16 +607,6 @@ public RpcService getRpcConsumerRegistry() {
return rpcConsumerRegistry;
}

@Override
public JaxRsEndpoint getJaxRsEndpoint() {
return this.jaxRsEndpoint;
}

@Override
public void withJaxRsEndpoint(JaxRsEndpoint endpoint) {
this.jaxRsEndpoint = endpoint;
}

@Override
public ActionService getActionService() {
return actionService;
Expand Down
12 changes: 6 additions & 6 deletions lighty-core/lighty-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -110,17 +110,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.7.1</version>
<version>3.8.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.5.4</version>
<version>3.5.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.4</version>
<version>3.5.5</version>
<configuration>
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
Expand Down Expand Up @@ -152,7 +152,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
<executions>
<execution>
<id>attach-sources</id>
Expand Down Expand Up @@ -192,7 +192,7 @@
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<!-- This should match the dependency management on com.puppycrawl.tools:checkstyle above -->
<version>12.1.2</version>
<version>13.2.0</version>
</dependency>
<dependency>
<groupId>com.github.sevntu-checkstyle</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
{ "usedBy":"RESTCONF","name":"sal-remote","revision":"2014-01-14","nameSpace":"urn:opendaylight:params:xml:ns:yang:controller:md:sal:remote"},
{ "usedBy":"RESTCONF","name":"sal-remote-augment","revision":"2023-11-03","nameSpace":"urn:sal:restconf:event:subscription"},
{ "usedBy":"NETCONF","name":"netconf-keystore","revision":"2024-07-08","nameSpace":"urn:opendaylight:netconf:keystore"},
{ "usedBy":"NETCONF","name":"netconf-node-topology","revision":"2024-09-11","nameSpace":"urn:opendaylight:netconf-node-topology"},
{ "usedBy":"NETCONF","name":"netconf-node-topology","revision":"2025-12-05","nameSpace":"urn:opendaylight:netconf-node-topology"},
{ "usedBy":"NETCONF","name":"netconf-node-optional","revision":"2022-12-25","nameSpace":"urn:opendaylight:netconf-node-optional"},
{ "usedBy":"NETCONF","name":"ietf-netconf","revision":"2011-06-01","nameSpace":"urn:ietf:params:xml:ns:netconf:base:1.0"},
{ "usedBy":"NETCONF_ACTION","name":"example-data-center","revision":"2018-08-07","nameSpace":"urn:example:data-center"}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ private void startLighty(final ControllerConfiguration controllerConfiguration,
if (!restconfStartOk) {
throw new ModuleStartupException("Community Restconf startup failed!");
}
lightyController.getServices().withJaxRsEndpoint(restconf.getJaxRsEndpoint());

//3. start openApi and RestConf server
this.openApi =
Expand Down
Loading
Loading