홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Brian O'Connor
Committed by Gerrit Code Review
932d9414 1 parent 30f45fbb

preparing pom.xml's for release 

Change-Id: I14cecba9816493e2cf1b3fb6daf3a653ddb1fd2e
Inline Side-by-side
Showing 5 changed files with 167 additions and 30 deletions
...@@ -33,10 +33,10 @@ ...@@ -33,10 +33,10 @@
33 33
34 <dependencies> 34 <dependencies>
35 <dependency> 35 <dependency>
36 - <groupId>org.projectfloodlight</groupId>
37 - <artifactId>openflowj</artifactId>
38 <!-- FIXME once experimenter gets merged to upstream --> 36 <!-- FIXME once experimenter gets merged to upstream -->
39 - <version>0.3.8-optical_experimenter5</version> 37 + <groupId>org.onosproject</groupId>
38 + <artifactId>openflowj</artifactId>
39 + <version>${openflowj.version}</version>
40 </dependency> 40 </dependency>
41 <dependency> 41 <dependency>
42 <groupId>io.netty</groupId> 42 <groupId>io.netty</groupId>
......
...@@ -23,15 +23,22 @@ ...@@ -23,15 +23,22 @@
23 <maven>3.0.0</maven> 23 <maven>3.0.0</maven>
24 </prerequisites> 24 </prerequisites>
25 25
26 + <parent>
27 + <groupId>org.onosproject</groupId>
28 + <artifactId>onos-base</artifactId>
29 + <version>1</version>
30 + <relativePath>tools/build/pom.xml</relativePath>
31 + </parent>
32 +
26 <groupId>org.onosproject</groupId> 33 <groupId>org.onosproject</groupId>
27 <artifactId>onos</artifactId> 34 <artifactId>onos</artifactId>
28 <packaging>pom</packaging> 35 <packaging>pom</packaging>
29 <version>1.0.0-SNAPSHOT</version> 36 <version>1.0.0-SNAPSHOT</version>
30 37
38 + <name>${project.artifactId}</name>
31 <description>Open Network Operating System root project</description> 39 <description>Open Network Operating System root project</description>
32 40
33 <modules> 41 <modules>
34 - <module>tools/build/conf</module>
35 <module>utils</module> 42 <module>utils</module>
36 <module>core</module> 43 <module>core</module>
37 <module>web</module> 44 <module>web</module>
...@@ -41,11 +48,16 @@ ...@@ -41,11 +48,16 @@
41 <module>apps</module> 48 <module>apps</module>
42 <module>features</module> 49 <module>features</module>
43 <module>tools/package/branding</module> 50 <module>tools/package/branding</module>
44 - <module>tools/package/archetypes</module>
45 </modules> 51 </modules>
46 52
47 <url>http://onosproject.org/</url> 53 <url>http://onosproject.org/</url>
48 54
55 + <scm>
56 + <connection>scm:git:https://gerrit.onosproject.org/onos</connection>
57 + <developerConnection>scm:git:https://gerrit.onosproject.org/onos</developerConnection>
58 + <url>http://gerrit.onosproject.org/</url>
59 + </scm>
60 +
49 <licenses> 61 <licenses>
50 <license> 62 <license>
51 <name>Apache License, Version 2.0</name> 63 <name>Apache License, Version 2.0</name>
...@@ -56,23 +68,16 @@ ...@@ -56,23 +68,16 @@
56 <properties> 68 <properties>
57 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 69 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
58 <netty4.version>4.0.23.Final</netty4.version> 70 <netty4.version>4.0.23.Final</netty4.version>
59 - <copycat.version>0.4.0-SNAPSHOT</copycat.version> 71 + <copycat.version>0.3.0.onos</copycat.version>
72 + <openflowj.version>0.3.7.oe</openflowj.version>
60 </properties> 73 </properties>
61 74
62 - <repositories> 75 + <distributionManagement>
63 - <!-- FIXME: Repository for copycat, Loxigen + optical experimenter. 76 + <snapshotRepository>
64 - Decide how to deal with these before release. --> 77 + <id>ossrh</id>
65 - <repository> 78 + <url>https://oss.sonatype.org/content/repositories/snapshots</url>
66 - <id>onlab-temp</id> 79 + </snapshotRepository>
67 - <name>ON.lab temporary repository</name> 80 + </distributionManagement>
68 - <url>http://mavenrepo.onlab.us:8081/nexus/content/groups/public
69 - </url>
70 - <snapshots>
71 - <enabled>true</enabled>
72 - </snapshots>
73 - </repository>
74 - </repositories>
75 -
76 81
77 <dependencyManagement> 82 <dependencyManagement>
78 <dependencies> 83 <dependencies>
......
...@@ -2,14 +2,21 @@ ...@@ -2,14 +2,21 @@
2 <project xmlns="http://maven.apache.org/POM/4.0.0" 2 <project xmlns="http://maven.apache.org/POM/4.0.0"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd"> 4 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
5 - <modelVersion>4.0.0</modelVersion> 5 + <modelVersion>4.0.0</modelVersion>
6 - <groupId>org.onosproject</groupId> 6 +
7 - <artifactId>onos-build-conf</artifactId> 7 + <parent>
8 - <version>1.0</version> 8 + <groupId>org.onosproject</groupId>
9 - 9 + <artifactId>onos-base</artifactId>
10 - <properties> 10 + <version>1</version>
11 - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 11 + </parent>
12 - </properties> 12 +
13 + <groupId>org.onosproject</groupId>
14 + <artifactId>onos-build-conf</artifactId>
15 + <version>1.0</version>
16 +
17 + <properties>
18 + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
19 + </properties>
13 20
14 </project> 21 </project>
15 22
......
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<!--
3 + ~ Copyright 2014 Open Networking Laboratory
4 + ~
5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
8 + ~
9 + ~ http://www.apache.org/licenses/LICENSE-2.0
10 + ~
11 + ~ Unless required by applicable law or agreed to in writing, software
12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
16 + -->
17 +<project xmlns="http://maven.apache.org/POM/4.0.0"
18 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
20 + <modelVersion>4.0.0</modelVersion>
21 +
22 + <prerequisites>
23 + <maven>3.0.0</maven>
24 + </prerequisites>
25 +
26 + <groupId>org.onosproject</groupId>
27 + <artifactId>onos-base</artifactId>
28 + <packaging>pom</packaging>
29 + <version>1</version>
30 +
31 + <name>${project.artifactId}</name>
32 + <description>Open Network Operating System Base Pom</description>
33 +
34 + <url>http://onosproject.org/</url>
35 +
36 + <scm>
37 + <connection>scm:git:https://gerrit.onosproject.org/onos</connection>
38 + <developerConnection>scm:git:https://gerrit.onosproject.org/onos</developerConnection>
39 + <url>http://gerrit.onosproject.org/</url>
40 + </scm>
41 +
42 + <licenses>
43 + <license>
44 + <name>Apache License, Version 2.0</name>
45 + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
46 + </license>
47 + </licenses>
48 +
49 + <developers>
50 + <developer>
51 + <organization>Open Networking Lab</organization>
52 + <url>http://onlab.us</url>
53 + </developer>
54 + </developers>
55 +
56 + <distributionManagement>
57 + <snapshotRepository>
58 + <id>ossrh</id>
59 + <url>https://oss.sonatype.org/content/repositories/snapshots</url>
60 + </snapshotRepository>
61 + </distributionManagement>
62 +
63 + <profiles>
64 + <profile>
65 + <id>release</id>
66 + <build>
67 + <plugins>
68 + <plugin>
69 + <groupId>org.apache.maven.plugins</groupId>
70 + <artifactId>maven-source-plugin</artifactId>
71 + <version>2.2.1</version>
72 + <executions>
73 + <execution>
74 + <id>attach-sources</id>
75 + <goals>
76 + <goal>jar-no-fork</goal>
77 + </goals>
78 + </execution>
79 + </executions>
80 + </plugin>
81 + <plugin>
82 + <groupId>org.apache.maven.plugins</groupId>
83 + <artifactId>maven-javadoc-plugin</artifactId>
84 + <version>2.9.1</version>
85 + <executions>
86 + <execution>
87 + <id>attach-javadocs</id>
88 + <goals>
89 + <goal>jar</goal>
90 + </goals>
91 + </execution>
92 + </executions>
93 + </plugin>
94 + <plugin>
95 + <groupId>org.apache.maven.plugins</groupId>
96 + <artifactId>maven-gpg-plugin</artifactId>
97 + <version>1.5</version>
98 + <executions>
99 + <execution>
100 + <id>sign-artifacts</id>
101 + <phase>verify</phase>
102 + <goals>
103 + <goal>sign</goal>
104 + </goals>
105 + </execution>
106 + </executions>
107 + </plugin>
108 + <plugin>
109 + <groupId>org.sonatype.plugins</groupId>
110 + <artifactId>nexus-staging-maven-plugin</artifactId>
111 + <version>1.6.5</version>
112 + <extensions>true</extensions>
113 + <configuration>
114 + <serverId>ossrh</serverId>
115 + <nexusUrl>https://oss.sonatype.org/</nexusUrl>
116 + <autoReleaseAfterClose>false</autoReleaseAfterClose>
117 + </configuration>
118 + </plugin>
119 + </plugins>
120 + </build>
121 + </profile>
122 + </profiles>
123 +</project>
...@@ -45,13 +45,15 @@ ...@@ -45,13 +45,15 @@
45 </dependency> 45 </dependency>
46 46
47 <dependency> 47 <dependency>
48 - <groupId>net.kuujo.copycat</groupId> 48 + <!-- FIXME once fixes get merged to upstream -->
49 + <groupId>org.onosproject</groupId>
49 <artifactId>copycat</artifactId> 50 <artifactId>copycat</artifactId>
50 <version>${copycat.version}</version> 51 <version>${copycat.version}</version>
51 </dependency> 52 </dependency>
52 53
53 <dependency> 54 <dependency>
54 - <groupId>net.kuujo.copycat</groupId> 55 + <!-- FIXME once fixes get merged to upstream -->
56 + <groupId>org.onosproject</groupId>
55 <artifactId>copycat-tcp</artifactId> 57 <artifactId>copycat-tcp</artifactId>
56 <version>${copycat.version}</version> 58 <version>${copycat.version}</version>
57 </dependency> 59 </dependency>
......