Merge "Defining glassfish dependency version"

diff --combined odlparent/binding-parent/pom.xml
index 4c09903,7cc3694..f2c01eb
--- 1/odlparent/binding-parent/pom.xml
--- 2/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@@ -13,7 -13,7 +13,7 @@@
        <parent>
                <groupId>org.opendaylight.mdsal</groupId>
                <artifactId>binding-parent</artifactId>
 -              <version>0.12.1</version>
 +              <version>0.12.3</version>
                <relativePath />
        </parent>
  
@@@ -30,7 -30,7 +30,7 @@@
  
        <properties>
  
 -              <!--- properties from oparent -->
 +              <!-- properties from oparent -->
                <maven.compiler.source>1.8</maven.compiler.source>
                <maven.compiler.target>1.8</maven.compiler.target>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@@ -50,7 -50,7 +50,7 @@@
                <swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
                <!-- If following file exist, auto-generation of sdk will be done -->
                <swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
 -              <!--- end of properties from oparent -->
 +              <!-- end of properties from oparent -->
  
                <!-- ONAP repositories -->
                <onap.nexus.host>nexus.onap.org</onap.nexus.host>
@@@ -103,8 -103,8 +103,8 @@@
  
  
                <!-- Support libraries used by OpenDaylight -->
 -              <odl.mdsal.version>1.7.1</odl.mdsal.version>
 -              <odl.mdsal.model.version>0.12.1</odl.mdsal.model.version>
 +              <odl.mdsal.version>1.7.3</odl.mdsal.version>
 +              <odl.mdsal.model.version>0.12.3</odl.mdsal.model.version>
                <!-- Used by aaa, vtn -->
                <commons.codec.version>1.10</commons.codec.version>
                <!-- Used by netconf, ovsdb -->
@@@ -181,6 -181,8 +181,8 @@@
                <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
  
                <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
+ 
+               <glassfish.version>2.27</glassfish.version>
        </properties>
  
        <profiles>
@@@ -513,6 -515,12 +515,6 @@@
                                <artifactId>sal-test-model</artifactId>
                                <version>${odl.mdsal.version}</version>
                        </dependency>
 -                      <dependency>
 -                              <groupId>org.opendaylight.netconf</groupId>
 -                              <artifactId>sal-rest-connector</artifactId>
 -                              <version>${odl.mdsal.version}</version>
 -                      </dependency>
 -
                        <dependency>
                                <groupId>org.opendaylight.controller</groupId>
                                <artifactId>sal-binding-broker-impl</artifactId>
@@@ -1189,6 -1197,24 +1191,6 @@@
                                                </execution>
                                        </executions>
                                </plugin>
 -                              <plugin>
 -                                      <artifactId>maven-source-plugin</artifactId>
 -                                      <version>2.1.1</version>
 -                                      <executions>
 -                                              <execution>
 -                                                      <id>bundle-sources</id>
 -                                                      <phase>package</phase>
 -                                                      <goals>
 -                                                              <!-- produce source artifact for main project sources -->
 -                                                              <goal>jar-no-fork</goal>
 -
 -                                                              <!-- produce source artifact for project test sources -->
 -                                                              <goal>test-jar-no-fork</goal>
 -                                                      </goals>
 -                                              </execution>
 -                                      </executions>
 -                              </plugin>
 -
  
                        </plugins>
  

diff --combined odlparent/odlparent-lite/pom.xml
index 73638de,db080eb..65ec036
--- 1/odlparent/odlparent-lite/pom.xml
--- 2/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@@ -13,7 -13,7 +13,7 @@@
        <parent>
                <groupId>org.opendaylight.odlparent</groupId>
                <artifactId>odlparent-lite</artifactId>
 -              <version>3.1.1</version>
 +              <version>3.1.3</version>
                <relativePath />
        </parent>
  
@@@ -30,7 -30,7 +30,7 @@@
  
        <properties>
  
 -              <!--- properties from oparent -->
 +              <!-- properties from oparent -->
                <maven.compiler.source>1.8</maven.compiler.source>
                <maven.compiler.target>1.8</maven.compiler.target>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@@ -50,7 -50,7 +50,7 @@@
                <swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
                <!-- If following file exist, auto-generation of sdk will be done -->
                <swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
 -              <!--- end of properties from oparent -->
 +              <!-- end of properties from oparent -->
  
                <!-- ONAP repositories -->
                <onap.nexus.host>nexus.onap.org</onap.nexus.host>
@@@ -104,8 -104,8 +104,8 @@@
  
  
                <!-- Support libraries used by OpenDaylight -->
 -              <odl.mdsal.version>1.7.1</odl.mdsal.version>
 -              <odl.mdsal.model.version>0.12.1</odl.mdsal.model.version>
 +              <odl.mdsal.version>1.7.3</odl.mdsal.version>
 +              <odl.mdsal.model.version>0.12.3</odl.mdsal.model.version>
                <!-- Used by aaa, vtn -->
                <commons.codec.version>1.10</commons.codec.version>
                <!-- Used by netconf, ovsdb -->
@@@ -185,6 -185,8 +185,8 @@@
  
                <dmaapClient.groupId>org.onap.dmaap.messagerouter.dmaapclient</dmaapClient.groupId>
                <dmaapClient.version>1.1.5</dmaapClient.version>
+ 
+               <glassfish.version>2.27</glassfish.version>
        </properties>
  
  
@@@ -1119,6 -1121,24 +1121,6 @@@
                                                </execution>
                                        </executions>
                                </plugin>
 -                              <plugin>
 -                                      <artifactId>maven-source-plugin</artifactId>
 -                                      <version>2.1.1</version>
 -                                      <executions>
 -                                              <execution>
 -                                                      <id>bundle-sources</id>
 -                                                      <phase>package</phase>
 -                                                      <goals>
 -                                                              <!-- produce source artifact for main project sources -->
 -                                                              <goal>jar-no-fork</goal>
 -
 -                                                              <!-- produce source artifact for project test sources -->
 -                                                              <goal>test-jar-no-fork</goal>
 -                                                      </goals>
 -                                              </execution>
 -                                      </executions>
 -                              </plugin>
 -
  
                        </plugins>