Merge changes I6885e623,Ie5e68f28

* changes:
  BUG-110 : integration test : pcep message -> topology provider -> md sal
  Fixed a few FIXMEs and deleted commented code.

diff --git a/framework/src/test/java/org/opendaylight/protocol/framework/ServerTest.java b/framework/src/test/java/org/opendaylight/protocol/framework/ServerTest.java
index e86b40ee6be5f8f1b403cfff062a91d01ef791f5..1570b969c0217866141ebbc3645054a3cfe3c858 100644 (file)
--- a/framework/src/test/java/org/opendaylight/protocol/framework/ServerTest.java
+++ b/framework/src/test/java/org/opendaylight/protocol/framework/ServerTest.java
@@ -43,7 +43,7 @@ public class ServerTest {
        @Before
        public void setUp() {
                final int port = 10000 + (int)(10000 * Math.random());
-               serverAddress = new InetSocketAddress("127.0.0.5", port);
+               serverAddress = new InetSocketAddress("127.0.0.1", port);
                eventLoopGroup = new NioEventLoopGroup();
        }
 

diff --git a/pom.xml b/pom.xml
index 91ef0b81135e13bb4a84716a8daf874a43b666b7..74121b8decc92daa9c6d967e96426365d4d10141 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -248,6 +248,24 @@
                     </reportSet>
                 </reportSets>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <reportSets>
+                    <reportSet>
+                        <id>non-aggregate</id>
+                        <reports>
+                            <report>javadoc</report>
+                        </reports>
+                    </reportSet>
+                    <reportSet>
+                        <id>aggregate</id>
+                        <reports>
+                            <report>aggregate</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
             <!--plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
@@ -289,6 +307,9 @@
                     <target>${java.version.target}</target>
                     <testSource>${java.version.source}</testSource>
                     <testTarget>${java.version.target}</testTarget>
+                    <showDeprecation>true</showDeprecation>
+                    <showWarnings>true</showWarnings>
+                    <optimize>true</optimize>
                 </configuration>
             </plugin>
             <plugin>
@@ -358,6 +379,13 @@
                             <goal>jar</goal>
                         </goals>
                     </execution>
+                    <execution>
+                        <id>aggregate</id>
+                        <goals>
+                            <goal>aggregate</goal>
+                        </goals>
+                        <phase>site</phase>
+                    </execution>
                 </executions>
             </plugin>