X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=blobdiff_plain;f=lighty%2Fpom.xml;h=78e56e86a149a4daa438a5bfab3a6cdf9939a5d4;hp=891b72caf049dcbb0e4195bd60f2f4c4f9a2f43a;hb=HEAD;hpb=c305715705f2fc92e418c49cbb7c43e501c3d4c6

diff --git a/lighty/pom.xml b/lighty/pom.xml
index 891b72caf..5bba36530 100644
--- a/lighty/pom.xml
+++ b/lighty/pom.xml
@@ -6,155 +6,208 @@
 <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>
+  <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>io.lighty.core</groupId>
-        <artifactId>lighty-app-parent</artifactId>
-        <version>13.0.0</version>
-        <!--
-        lighty-core is usually released a few days before the official Opendaylight release.
-        13.0.0 = Aluminium release of 2020/09/18
-        -->
-        <relativePath />
-    </parent>
+  <parent>
+    <groupId>io.lighty.core</groupId>
+    <artifactId>lighty-app-parent</artifactId>
+    <version>20.0.0-SNAPSHOT</version>
+    <relativePath/>
+  </parent>
 
-    <groupId>io.lighty.controllers</groupId>
-    <artifactId>tpce</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
+  <groupId>io.lighty.controllers</groupId>
+  <artifactId>tpce</artifactId>
+  <version>10.0.0-SNAPSHOT</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>3.0.0-SNAPSHOT</transportpce.version>
-    </properties>
+  <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>10.0.0-SNAPSHOT</transportpce.version>
+    <transportpce.models.version>20.0.0-SNAPSHOT</transportpce.models.version>
+  </properties>
 
+  <dependencyManagement>
     <dependencies>
-        <!-- for parsing command line arguments -->
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-            <version>1.4</version>
-        </dependency>
-
-        <!-- TPCE Models - BEGIN -->
-        <dependency>
-            <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>transportpce-api</artifactId>
-            <version>${transportpce.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>transportpce-networkmodel</artifactId>
-            <version>${transportpce.version}</version>
-        </dependency>
-        <!-- TPCE Models - END -->
-
-        <!-- TPCE bundles - BEGIN -->
-        <dependency>
-            <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>transportpce-pce</artifactId>
-            <version>${transportpce.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>transportpce-olm</artifactId>
-            <version>${transportpce.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>transportpce-servicehandler</artifactId>
-            <version>${transportpce.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>transportpce-tapi</artifactId>
-            <version>${transportpce.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>transportpce-nbinotifications</artifactId>
-            <version>${transportpce.version}</version>
-        </dependency>
-        <!-- TPCE bundles - END -->
-
-        <dependency>
-            <groupId>io.lighty.modules</groupId>
-            <artifactId>lighty-netconf-sb</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.lighty.modules</groupId>
-            <artifactId>lighty-restconf-nb-community</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
+      <dependency>
+        <groupId>org.opendaylight.transportpce.models</groupId>
+        <artifactId>transportpce-models-artifacts</artifactId>
+        <version>${transportpce.models.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 
-        <dependency>
-            <groupId>net.jcip</groupId>
-            <artifactId>jcip-annotations</artifactId>
-            <version>1.0</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <version>3.1.3</version>
-            <optional>true</optional>
-        </dependency>
+  <dependencies>
+    <!-- for parsing command line arguments -->
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.4</version>
+    </dependency>
+    <!-- TPCE Models - BEGIN -->
+    <dependency>
+     <groupId>org.opendaylight.transportpce.models</groupId>
+      <artifactId>openroadm-common-1.2.1</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.transportpce.models</groupId>
+      <artifactId>openroadm-common-2.2.1</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.transportpce.models</groupId>
+      <artifactId>openroadm-common-7.1.0</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.transportpce.models</groupId>
+      <artifactId>openroadm-common-13.1.0</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.transportpce.models</groupId>
+      <artifactId>openroadm-device-1.2.1</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.transportpce.models</groupId>
+      <artifactId>openroadm-device-2.2.1</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.transportpce.models</groupId>
+      <artifactId>openroadm-device-7.1.0</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.transportpce.models</groupId>
+      <artifactId>openroadm-network-13.1.0</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.transportpce.models</groupId>
+      <artifactId>openroadm-service-13.1.0</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.transportpce.models</groupId>
+      <artifactId>tapi-2.4.0</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.transportpce</groupId>
+      <artifactId>transportpce-api</artifactId>
+      <version>${transportpce.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.transportpce</groupId>
+      <artifactId>transportpce-networkmodel</artifactId>
+      <version>${transportpce.version}</version>
+    </dependency>
+    <!-- TPCE Models - END -->
+    <!-- TPCE bundles - BEGIN -->
+    <dependency>
+      <groupId>org.opendaylight.transportpce</groupId>
+      <artifactId>transportpce-pce</artifactId>
+      <version>${transportpce.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.transportpce</groupId>
+      <artifactId>transportpce-olm</artifactId>
+      <version>${transportpce.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.transportpce</groupId>
+      <artifactId>transportpce-servicehandler</artifactId>
+      <version>${transportpce.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.transportpce</groupId>
+      <artifactId>transportpce-tapi</artifactId>
+      <version>${transportpce.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.transportpce</groupId>
+      <artifactId>transportpce-nbinotifications</artifactId>
+      <version>${transportpce.version}</version>
+    </dependency>
+    <!-- TPCE bundles - END -->
+    <dependency>
+      <groupId>io.lighty.modules</groupId>
+      <artifactId>lighty-netconf-sb</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.lighty.modules</groupId>
+      <artifactId>lighty-restconf-nb-community</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.lighty.modules</groupId>
+      <artifactId>lighty-openapi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.jcip</groupId>
+      <artifactId>jcip-annotations</artifactId>
+      <version>1.0</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.github.spotbugs</groupId>
+      <artifactId>spotbugs-annotations</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-client</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
-    </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>
+  <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>
+          <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
+        </configuration>
+        <executions>
+          <execution>
+            <id>validate</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>