X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=lighty%2Fpom.xml;h=180fcb554f1a2d70e3f05ebc064cc87444e17c32;hb=481888bfbff48f379c270eabdcf22c05148c7a5d;hp=e82bc6fe881f4a14ddbfcef605adc13a672caf52;hpb=1b290f8e8a33836fcf5960ebbd19ae5afe4b17ce;p=transportpce.git

diff --git a/lighty/pom.xml b/lighty/pom.xml
index e82bc6fe8..180fcb554 100644
--- a/lighty/pom.xml
+++ b/lighty/pom.xml
@@ -1,31 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2018 Pantheon Technologies s.r.o. All Rights Reserved.
-
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License v1.0 which accompanies this distribution,
-  and is available at https://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!-- Copyright (c) 2018 Pantheon Technologies s.r.o. All Rights Reserved.
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v1.0 which accompanies this distribution,
+    and is available at https://www.eclipse.org/legal/epl-v10.html -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>io.lighty.core</groupId>
         <artifactId>lighty-app-parent</artifactId>
-        <version>12.0.0-SNAPSHOT</version>
-        <relativePath/>
+        <version>13.1.0</version>
+        <!--
+        lighty-core is usually released a few days before the official Opendaylight release.
+        13.0.0 = Aluminium release of 2020/09/18 published on maven central
+        13.1.0 available on ODL nexus since 2021/01/11
+        -->
+        <relativePath />
     </parent>
 
-    <groupId>io.lighty.examples.controllers</groupId>
-    <artifactId>lighty-transportpce</artifactId>
-    <version>12.0.0-SNAPSHOT</version>
+    <groupId>io.lighty.controllers</groupId>
+    <artifactId>tpce</artifactId>
+    <version>2.2.0</version>
     <packaging>jar</packaging>
 
     <properties>
         <application.main.class>io.lighty.controllers.tpce.Main</application.main.class>
         <application.attach.zip>true</application.attach.zip>
         <maven.deploy.skip>true</maven.deploy.skip>
-        <transportpce.version>0.5.0-SNAPSHOT</transportpce.version>
+        <transportpce.version>2.2.0</transportpce.version>
     </properties>
 
     <dependencies>
@@ -37,26 +41,11 @@
             <version>${transportpce.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.transportpce.ordmodels</groupId>
-            <artifactId>transportpce-ordmodels-common</artifactId>
-            <version>${transportpce.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.transportpce.ordmodels</groupId>
-            <artifactId>transportpce-ordmodels-device</artifactId>
-            <version>${transportpce.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.transportpce.ordmodels</groupId>
-            <artifactId>transportpce-ordmodels-network</artifactId>
-            <version>${transportpce.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.transportpce.ordmodels</groupId>
-            <artifactId>transportpce-ordmodels-service</artifactId>
+            <groupId>org.opendaylight.transportpce</groupId>
+            <artifactId>transportpce-networkmodel</artifactId>
             <version>${transportpce.version}</version>
         </dependency>
-        <!-- TPCE Models -   END -->
+        <!-- TPCE Models - END -->
 
         <!-- TPCE bundles - BEGIN -->
         <dependency>
@@ -74,7 +63,12 @@
             <artifactId>transportpce-servicehandler</artifactId>
             <version>${transportpce.version}</version>
         </dependency>
-        <!-- TPCE bundles -   END -->
+        <dependency>
+            <groupId>org.opendaylight.transportpce</groupId>
+            <artifactId>transportpce-tapi</artifactId>
+            <version>${transportpce.version}</version>
+        </dependency>
+        <!-- TPCE bundles - END -->
 
         <dependency>
             <groupId>io.lighty.modules</groupId>
@@ -83,61 +77,74 @@
         <dependency>
             <groupId>io.lighty.modules</groupId>
             <artifactId>lighty-restconf-nb-community</artifactId>
-            <exclusions>
-                <!-- FIXME: why is this exclusion needed? can we move it somewhere else? -->
-                <exclusion>
-                    <groupId>javax.ws.rs</groupId>
-                    <artifactId>javax.ws.rs-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>io.lighty.resources</groupId>
-            <artifactId>singlenode-configuration</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.lighty.resources</groupId>
-            <artifactId>log4j-properties</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-webapp</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlets</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
-            <artifactId>jersey-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.containers</groupId>
-            <artifactId>jersey-container-jetty-http</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.inject</groupId>
-            <artifactId>jersey-hk2</artifactId>
+            <groupId>net.jcip</groupId>
+            <artifactId>jcip-annotations</artifactId>
+            <version>1.0</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <version>3.1.3</version>
+            <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-client</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
+    <build>
+        <finalName>tpce</finalName>
+        <plugins>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>True</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <configLocation>odl_checks.xml</configLocation>
+                    <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+                    <!-- <sourceDirectories> are needed so that checkstyle
+                        ignores the generated sources directory -->
+                    <sourceDirectories>
+                        <directory>${project.build.sourceDirectory}</directory>
+                    </sourceDirectories>
+                    <includeResources>true</includeResources>
+                    <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                    <includeTestResources>true</includeTestResources>
+                    <includes>**\/*.java</includes>
+                    <excludes>
+                        **/protobuff/messages/**,
+                        **/thrift/gen/*.java,
+                        **/module-info.java
+                    </excludes>
+                    <consoleOutput>true</consoleOutput>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>validate</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>