No longer require setup-local-maven.sh to be executed on the 1st run.
* Pre-populate local repo (<ONOS_HOME>/repo/) with modified curator/kryo2
* rebuild-local-repo.sh: Script to use when updating modified curator/kryo2 version
* prep-for-offline.sh: Script to populate ~/.m2 with required plugin etc.
diff --git a/pom.xml b/pom.xml
index f7bf388..39e9f30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,6 +11,12 @@
<name>ONOS</name>
<url>http://onlab.us/</url>
<repositories>
+ <!-- In Project repository -->
+ <repository>
+ <id>in-project</id>
+ <name>In Project Repo</name>
+ <url>file://${project.basedir}/repo</url>
+ </repository>
<repository>
<id>central</id>
<name>Maven Central repository</name>
@@ -21,12 +27,6 @@
<name>Public online Restlet repository</name>
<url>http://maven.restlet.org</url>
</repository>
- <!-- In Project repository -->
- <repository>
- <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>
@@ -265,6 +265,10 @@
</plugins>
</reporting>
<dependencies>
+ <!-- Commenting out original kryo 2.X
+ and using shaded version (net.onrc.onos.kryo2)
+ to workaround conflict with kryo 1.X in titan's dependency.(#443)
+ -->
<!--
<dependency>
<groupId>com.esotericsoftware.kryo</groupId>