merge with main
diff --git a/pom.xml b/pom.xml
index 606c4ff..fc719a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,19 +21,18 @@
<name>Public online Restlet repository</name>
<url>http://maven.restlet.org</url>
</repository>
+ <!-- In Project repository -->
<repository>
- <id>tinkerpop-repository</id>
- <name>TinkerPop Maven2 Repository</name>
- <url>http://tinkerpop.com/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
+ <id>in-project</id>
+ <name>In Project Repo</name>
+ <url>file://${project.basedir}/repo</url>
</repository>
</repositories>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <powermock.version>1.5</powermock.version>
+ <powermock.version>1.5.1</powermock.version>
<restlet.version>2.1-RC1</restlet.version>
+ <github.global.server>github</github.global.server>
</properties>
<build>
<plugins>
@@ -80,6 +79,7 @@
<exclude>**/*TestCase.java</exclude>
-->
</excludes>
+ <argLine>-XX:MaxPermSize=256m</argLine>
</configuration>
</plugin>
<!-- exec:java -->
@@ -145,6 +145,33 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.github.github</groupId>
+ <artifactId>site-maven-plugin</artifactId>
+ <version>0.8</version>
+ <configuration>
+ <message>Creating site for ${project.version}</message>
+ <dryRun>true</dryRun>
+ <repositoryName>ONOS</repositoryName>
+ <repositoryOwner>OPENNETWORKINGLAB</repositoryOwner>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ <phase>site</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </plugin>
</plugins>
</build>
<!-- for getting visualization reporting -->
@@ -152,11 +179,13 @@
<excludeDefaults>true</excludeDefaults>
<outputDirectory>${project.build.directory}/site</outputDirectory>
<plugins>
+ <!--
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>guice-maven-plugin</artifactId>
<version>2.11.0</version>
</plugin>
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
@@ -169,7 +198,7 @@
<reportSet>
<reports>
<report>dependencies</report>
- <report>maven-emma-plugin</report>
+ <!--report>maven-emma-plugin</report-->
<report>scm</report>
</reports>
</reportSet>
@@ -187,6 +216,18 @@
</plugins>
</reporting>
<dependencies>
+ <!--
+ <dependency>
+ <groupId>com.esotericsoftware.kryo</groupId>
+ <artifactId>kryo</artifactId>
+ <version>2.22</version>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>net.onrc.onos</groupId>
+ <artifactId>kryo2</artifactId>
+ <version>2.22</version>
+ </dependency>
<!-- ONOS's direct dependencies -->
<dependency>
<groupId>org.apache.cassandra</groupId>
@@ -218,6 +259,11 @@
</dependency>
-->
<dependency>
+ <groupId>com.hazelcast</groupId>
+ <artifactId>hazelcast</artifactId>
+ <version>3.0.2</version>
+ </dependency>
+ <dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<version>2.4</version>
@@ -233,7 +279,7 @@
<artifactId>org.restlet.ext.slf4j</artifactId>
<version>${restlet.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.2.2</version>