Brian O'Connor
Committed by Gerrit Code Review

Removing deprecated catalyst from onos tree

Change-Id: I6a0192db3ece8cee6db1b2b1fd330112e7b0f72f
1 -<?xml version="1.0" encoding="UTF-8"?>
2 -<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
5 - <parent>
6 - <artifactId>onlab-utils</artifactId>
7 - <groupId>org.onosproject</groupId>
8 - <version>1.6.0-SNAPSHOT</version>
9 - </parent>
10 - <modelVersion>4.0.0</modelVersion>
11 -
12 - <artifactId>utils.catalyst</artifactId>
13 - <packaging>bundle</packaging>
14 -
15 - <description>ONLab catalyst dependency</description>
16 -
17 - <dependencies>
18 - <dependency>
19 - <groupId>io.atomix.catalyst</groupId>
20 - <artifactId>catalyst-netty</artifactId>
21 - <version>1.0.0-rc5</version>
22 - </dependency>
23 -
24 - </dependencies>
25 -
26 - <build>
27 - <plugins>
28 - <plugin>
29 - <groupId>org.apache.maven.plugins</groupId>
30 - <artifactId>maven-shade-plugin</artifactId>
31 - <configuration>
32 - <artifactSet>
33 - <includes>
34 - <include>io/atomix/catalyst/**</include>
35 - </includes>
36 - </artifactSet>
37 - </configuration>
38 - <executions>
39 - <execution>
40 - <phase>package</phase>
41 - <goals>
42 - <goal>shade</goal>
43 - </goals>
44 - </execution>
45 - </executions>
46 - </plugin>
47 -
48 - <plugin>
49 - <groupId>org.apache.felix</groupId>
50 - <artifactId>maven-bundle-plugin</artifactId>
51 - <configuration>
52 - <instructions>
53 - <Export-Package>
54 - io.atomix.catalyst.*
55 - </Export-Package>
56 - </instructions>
57 - </configuration>
58 - </plugin>
59 -
60 - </plugins>
61 - </build>
62 -</project>
...\ No newline at end of file ...\ No newline at end of file
1 -package org.onlab.catalyst;
2 -
3 -/**
4 - * Created by admin on 11/24/15.
5 - */
6 -public class OnlabCatalyst {
7 -}
1 -/**
2 - * Created by admin on 11/24/15.
3 - */
4 -package org.onlab.catalyst;
...\ No newline at end of file ...\ No newline at end of file
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
41 <module>stc</module> 41 <module>stc</module>
42 <module>jdvue</module> 42 <module>jdvue</module>
43 <module>jnc</module> 43 <module>jnc</module>
44 - <module>catalyst</module> <!-- FIXME publish and remove before release -->
45 </modules> 44 </modules>
46 45
47 <dependencies> 46 <dependencies>
......