preparing pom.xml's for release
Change-Id: I14cecba9816493e2cf1b3fb6daf3a653ddb1fd2e
diff --git a/openflow/api/pom.xml b/openflow/api/pom.xml
index 3ed1e3f..c7fc087 100644
--- a/openflow/api/pom.xml
+++ b/openflow/api/pom.xml
@@ -33,10 +33,10 @@
<dependencies>
<dependency>
- <groupId>org.projectfloodlight</groupId>
- <artifactId>openflowj</artifactId>
<!-- FIXME once experimenter gets merged to upstream -->
- <version>0.3.8-optical_experimenter5</version>
+ <groupId>org.onosproject</groupId>
+ <artifactId>openflowj</artifactId>
+ <version>${openflowj.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
diff --git a/pom.xml b/pom.xml
index 6730d4f..cebea5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,15 +23,22 @@
<maven>3.0.0</maven>
</prerequisites>
+ <parent>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-base</artifactId>
+ <version>1</version>
+ <relativePath>tools/build/pom.xml</relativePath>
+ </parent>
+
<groupId>org.onosproject</groupId>
<artifactId>onos</artifactId>
<packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version>
+ <name>${project.artifactId}</name>
<description>Open Network Operating System root project</description>
<modules>
- <module>tools/build/conf</module>
<module>utils</module>
<module>core</module>
<module>web</module>
@@ -41,11 +48,16 @@
<module>apps</module>
<module>features</module>
<module>tools/package/branding</module>
- <module>tools/package/archetypes</module>
</modules>
<url>http://onosproject.org/</url>
+ <scm>
+ <connection>scm:git:https://gerrit.onosproject.org/onos</connection>
+ <developerConnection>scm:git:https://gerrit.onosproject.org/onos</developerConnection>
+ <url>http://gerrit.onosproject.org/</url>
+ </scm>
+
<licenses>
<license>
<name>Apache License, Version 2.0</name>
@@ -56,23 +68,16 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<netty4.version>4.0.23.Final</netty4.version>
- <copycat.version>0.4.0-SNAPSHOT</copycat.version>
+ <copycat.version>0.3.0.onos</copycat.version>
+ <openflowj.version>0.3.7.oe</openflowj.version>
</properties>
- <repositories>
- <!-- FIXME: Repository for copycat, Loxigen + optical experimenter.
- Decide how to deal with these before release. -->
- <repository>
- <id>onlab-temp</id>
- <name>ON.lab temporary repository</name>
- <url>http://mavenrepo.onlab.us:8081/nexus/content/groups/public
- </url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
+ <distributionManagement>
+ <snapshotRepository>
+ <id>ossrh</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
<dependencyManagement>
<dependencies>
diff --git a/tools/build/conf/pom.xml b/tools/build/conf/pom.xml
index bab81ca..9bf1ecb 100644
--- a/tools/build/conf/pom.xml
+++ b/tools/build/conf/pom.xml
@@ -2,14 +2,21 @@
<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>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-build-conf</artifactId>
- <version>1.0</version>
+ <modelVersion>4.0.0</modelVersion>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+ <parent>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-base</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-build-conf</artifactId>
+ <version>1.0</version>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
</project>
diff --git a/tools/build/pom.xml b/tools/build/pom.xml
new file mode 100644
index 0000000..ea473ed
--- /dev/null
+++ b/tools/build/pom.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2014 Open Networking Laboratory
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <prerequisites>
+ <maven>3.0.0</maven>
+ </prerequisites>
+
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-base</artifactId>
+ <packaging>pom</packaging>
+ <version>1</version>
+
+ <name>${project.artifactId}</name>
+ <description>Open Network Operating System Base Pom</description>
+
+ <url>http://onosproject.org/</url>
+
+ <scm>
+ <connection>scm:git:https://gerrit.onosproject.org/onos</connection>
+ <developerConnection>scm:git:https://gerrit.onosproject.org/onos</developerConnection>
+ <url>http://gerrit.onosproject.org/</url>
+ </scm>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+
+ <developers>
+ <developer>
+ <organization>Open Networking Lab</organization>
+ <url>http://onlab.us</url>
+ </developer>
+ </developers>
+
+ <distributionManagement>
+ <snapshotRepository>
+ <id>ossrh</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.2.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9.1</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.5</version>
+ <extensions>true</extensions>
+ <configuration>
+ <serverId>ossrh</serverId>
+ <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+ <autoReleaseAfterClose>false</autoReleaseAfterClose>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
diff --git a/utils/thirdparty/pom.xml b/utils/thirdparty/pom.xml
index 188c6ef..28c6b5b 100644
--- a/utils/thirdparty/pom.xml
+++ b/utils/thirdparty/pom.xml
@@ -45,13 +45,15 @@
</dependency>
<dependency>
- <groupId>net.kuujo.copycat</groupId>
+ <!-- FIXME once fixes get merged to upstream -->
+ <groupId>org.onosproject</groupId>
<artifactId>copycat</artifactId>
<version>${copycat.version}</version>
</dependency>
<dependency>
- <groupId>net.kuujo.copycat</groupId>
+ <!-- FIXME once fixes get merged to upstream -->
+ <groupId>org.onosproject</groupId>
<artifactId>copycat-tcp</artifactId>
<version>${copycat.version}</version>
</dependency>