홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Brian O'Connor
Committed by Gerrit Code Review
96f689b3 1 parent ffef500b

Renaming onlab-thirdparty to atomix 

Change-Id: I258b80c9bd6481664585812bca738651fd348363
Inline Side-by-side
Showing 8 changed files with 57 additions and 25 deletions
...@@ -63,15 +63,16 @@ ...@@ -63,15 +63,16 @@
63 <scope>test</scope> 63 <scope>test</scope>
64 </dependency> 64 </dependency>
65 65
66 - <!-- for shaded atomix/copycat -->
67 - <dependency>
68 - <groupId>org.onosproject</groupId>
69 - <artifactId>onlab-thirdparty</artifactId>
70 - </dependency>
71 <dependency> 66 <dependency>
72 <groupId>commons-io</groupId> 67 <groupId>commons-io</groupId>
73 <artifactId>commons-io</artifactId> 68 <artifactId>commons-io</artifactId>
74 <version>${commons.io.version}</version> 69 <version>${commons.io.version}</version>
75 </dependency> 70 </dependency>
71 +
72 + <dependency>
73 + <groupId>org.onosproject</groupId>
74 + <artifactId>atomix</artifactId>
75 + <version>1.0.onos-SNAPSHOT</version>
76 + </dependency>
76 </dependencies> 77 </dependencies>
77 </project> 78 </project>
......
...@@ -6,7 +6,7 @@ org.onlab.jdvue* ...@@ -6,7 +6,7 @@ org.onlab.jdvue*
6 org.onlab.stc* 6 org.onlab.stc*
7 org.onlab.catalyst* 7 org.onlab.catalyst*
8 8
9 -org.onlab.thirdparty 9 +org.onlab.atomix
10 org.onosproject.provider* 10 org.onosproject.provider*
11 org.onosproject.rest 11 org.onosproject.rest
12 org.onosproject.cli* 12 org.onosproject.cli*
......
1 org.onlab.jdvue* 1 org.onlab.jdvue*
2 org.onlab.stc* 2 org.onlab.stc*
3 org.onlab.catalyst* 3 org.onlab.catalyst*
4 -org.onlab.thirdparty 4 +org.onlab.atomix
5 org.onosproject.oecfg 5 org.onosproject.oecfg
6 org.onosproject.maven 6 org.onosproject.maven
7 org.onosproject.grpc* 7 org.onosproject.grpc*
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
56 <bundle>mvn:com.typesafe/config/1.2.1</bundle> 56 <bundle>mvn:com.typesafe/config/1.2.1</bundle>
57 <bundle>wrap:mvn:com.googlecode.concurrent-trees/concurrent-trees/2.4.0$Bundle-SymbolicName=concurrent-trees&amp;Bundle-Version=2.4.0</bundle> 57 <bundle>wrap:mvn:com.googlecode.concurrent-trees/concurrent-trees/2.4.0$Bundle-SymbolicName=concurrent-trees&amp;Bundle-Version=2.4.0</bundle>
58 <bundle>mvn:commons-io/commons-io/2.4</bundle> 58 <bundle>mvn:commons-io/commons-io/2.4</bundle>
59 - <bundle>mvn:org.onosproject/onlab-thirdparty/@ONOS-VERSION</bundle> 59 + <bundle>mvn:org.onosproject/atomix/1.0.onos-SNAPSHOT</bundle>
60 60
61 <bundle>mvn:org.glassfish.jersey.core/jersey-client/2.22.2</bundle> 61 <bundle>mvn:org.glassfish.jersey.core/jersey-client/2.22.2</bundle>
62 62
......
...@@ -77,10 +77,6 @@ ...@@ -77,10 +77,6 @@
77 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 77 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
78 <onos-build-conf.version>1.3-SNAPSHOT</onos-build-conf.version> 78 <onos-build-conf.version>1.3-SNAPSHOT</onos-build-conf.version>
79 <netty4.version>4.0.33.Final</netty4.version> 79 <netty4.version>4.0.33.Final</netty4.version>
80 - <!-- TODO: replace with final release version when it is out -->
81 - <catalyst.version>1.0.6</catalyst.version>
82 - <atomix.version>1.0.0-rc3</atomix.version>
83 - <copycat.version>1.0.0-rc6</copycat.version>
84 <openflowj.version>0.9.3.onos-SNAPSHOT</openflowj.version> 80 <openflowj.version>0.9.3.onos-SNAPSHOT</openflowj.version>
85 <onos-maven-plugin.version>1.9</onos-maven-plugin.version> 81 <onos-maven-plugin.version>1.9</onos-maven-plugin.version>
86 <osgi.version>4.3.1</osgi.version> 82 <osgi.version>4.3.1</osgi.version>
......
...@@ -21,15 +21,39 @@ ...@@ -21,15 +21,39 @@
21 21
22 <parent> 22 <parent>
23 <groupId>org.onosproject</groupId> 23 <groupId>org.onosproject</groupId>
24 - <artifactId>onlab-utils</artifactId> 24 + <artifactId>onos-base</artifactId>
25 - <version>1.6.0-SNAPSHOT</version> 25 + <version>1</version>
26 - <relativePath>../pom.xml</relativePath> 26 + <relativePath/>
27 </parent> 27 </parent>
28 28
29 - <artifactId>onlab-thirdparty</artifactId> 29 + <groupId>org.onosproject</groupId>
30 + <artifactId>atomix</artifactId>
30 <packaging>bundle</packaging> 31 <packaging>bundle</packaging>
32 + <version>1.0.onos-SNAPSHOT</version>
31 33
32 - <description>ONLab third-party dependencies</description> 34 + <description>Atomix shaded OSGi JAR</description>
35 + <url>http://onosproject.org/</url>
36 +
37 + <scm>
38 + <connection>scm:git:https://gerrit.onosproject.org/onos</connection>
39 + <developerConnection>scm:git:https://gerrit.onosproject.org/onos
40 + </developerConnection>
41 + <url>http://gerrit.onosproject.org/</url>
42 + </scm>
43 +
44 + <licenses>
45 + <license>
46 + <name>Apache License, Version 2.0</name>
47 + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
48 + </license>
49 + </licenses>
50 +
51 + <properties>
52 + <!-- TODO: replace with final release version when it is out -->
53 + <catalyst.version>1.0.6</catalyst.version>
54 + <atomix.version>1.0.0-rc3</atomix.version>
55 + <copycat.version>1.0.0-rc6</copycat.version>
56 + </properties>
33 57
34 <dependencies> 58 <dependencies>
35 <dependency> 59 <dependency>
...@@ -68,10 +92,22 @@ ...@@ -68,10 +92,22 @@
68 <plugins> 92 <plugins>
69 <plugin> 93 <plugin>
70 <groupId>org.apache.maven.plugins</groupId> 94 <groupId>org.apache.maven.plugins</groupId>
95 + <artifactId>maven-compiler-plugin</artifactId>
96 + <!-- TODO: update once following issue is fixed. -->
97 + <!-- https://jira.codehaus.org/browse/MCOMPILER-205 -->
98 + <version>2.5.1</version>
99 + <configuration>
100 + <source>1.8</source>
101 + <target>1.8</target>
102 + </configuration>
103 + </plugin>
104 +
105 + <plugin>
106 + <groupId>org.apache.maven.plugins</groupId>
71 <artifactId>maven-shade-plugin</artifactId> 107 <artifactId>maven-shade-plugin</artifactId>
108 + <version>2.4.2</version>
72 <configuration> 109 <configuration>
73 <createSourcesJar>true</createSourcesJar> 110 <createSourcesJar>true</createSourcesJar>
74 -
75 <artifactSet> 111 <artifactSet>
76 <excludes> 112 <excludes>
77 <!-- exclude OSGi-ready transitive dependencies --> 113 <!-- exclude OSGi-ready transitive dependencies -->
...@@ -83,7 +119,6 @@ ...@@ -83,7 +119,6 @@
83 <exclude>commons-io:commons-io</exclude> 119 <exclude>commons-io:commons-io</exclude>
84 </excludes> 120 </excludes>
85 </artifactSet> 121 </artifactSet>
86 -
87 <filters> 122 <filters>
88 <filter> 123 <filter>
89 <artifact>io.atomix:atomix-all</artifact> 124 <artifact>io.atomix:atomix-all</artifact>
...@@ -91,7 +126,6 @@ ...@@ -91,7 +126,6 @@
91 <include>**</include> 126 <include>**</include>
92 </includes> 127 </includes>
93 </filter> 128 </filter>
94 -
95 </filters> 129 </filters>
96 </configuration> 130 </configuration>
97 <executions> 131 <executions>
...@@ -106,6 +140,8 @@ ...@@ -106,6 +140,8 @@
106 <plugin> 140 <plugin>
107 <groupId>org.apache.felix</groupId> 141 <groupId>org.apache.felix</groupId>
108 <artifactId>maven-bundle-plugin</artifactId> 142 <artifactId>maven-bundle-plugin</artifactId>
143 + <version>3.0.1</version>
144 + <extensions>true</extensions>
109 <configuration> 145 <configuration>
110 <instructions> 146 <instructions>
111 <Export-Package> 147 <Export-Package>
......
...@@ -13,14 +13,13 @@ ...@@ -13,14 +13,13 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onlab.thirdparty; 16 +package org.onlab.atomix;
17 -
18 17
19 /** 18 /**
20 - * Empty class required to get the onlab-thirdparty module to build properly. 19 + * Empty class required to get the atomix module to build properly.
21 * 20 *
22 * NOTE Required for shade plugin to operate. 21 * NOTE Required for shade plugin to operate.
23 */ 22 */
24 -public class OnlabThirdparty { 23 +public class AtomixShaded {
25 24
26 } 25 }
......
...@@ -32,12 +32,12 @@ ...@@ -32,12 +32,12 @@
32 <description>Domain agnostic ON.Lab utilities</description> 32 <description>Domain agnostic ON.Lab utilities</description>
33 33
34 <modules> 34 <modules>
35 + <module>atomix</module>
35 <module>junit</module> 36 <module>junit</module>
36 <module>misc</module> 37 <module>misc</module>
37 <module>yangutils</module> 38 <module>yangutils</module>
38 <module>osgi</module> 39 <module>osgi</module>
39 <module>rest</module> 40 <module>rest</module>
40 - <module>thirdparty</module>
41 <module>stc</module> 41 <module>stc</module>
42 <module>jdvue</module> 42 <module>jdvue</module>
43 <module>osgiwrap</module> 43 <module>osgiwrap</module>
......