Committed by
Gerrit Code Review
Updating onos-of-api
We not longer shade openflowj in onos-of-api, instead we used an OGSi-compatible version of it. Change-Id: If083c355f441783de3790d3e87ca824f386cccd8
Showing
7 changed files
with
26 additions
and
55 deletions
... | @@ -20,6 +20,7 @@ | ... | @@ -20,6 +20,7 @@ |
20 | <feature>onos-api</feature> | 20 | <feature>onos-api</feature> |
21 | <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle> | 21 | <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle> |
22 | 22 | ||
23 | + <bundle>mvn:org.onosproject/openflowj/0.9.3.onos-SNAPSHOT</bundle> | ||
23 | <bundle>mvn:${project.groupId}/onos-of-api/${project.version}</bundle> | 24 | <bundle>mvn:${project.groupId}/onos-of-api/${project.version}</bundle> |
24 | 25 | ||
25 | </feature> | 26 | </feature> | ... | ... |
... | @@ -42,5 +42,9 @@ | ... | @@ -42,5 +42,9 @@ |
42 | <groupId>org.onosproject</groupId> | 42 | <groupId>org.onosproject</groupId> |
43 | <artifactId>onos-of-api</artifactId> | 43 | <artifactId>onos-of-api</artifactId> |
44 | </dependency> | 44 | </dependency> |
45 | + <dependency> | ||
46 | + <groupId>org.onosproject</groupId> | ||
47 | + <artifactId>openflowj</artifactId> | ||
48 | + </dependency> | ||
45 | </dependencies> | 49 | </dependencies> |
46 | </project> | 50 | </project> |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -82,7 +82,7 @@ | ... | @@ -82,7 +82,7 @@ |
82 | <atomix.version>1.0.0-rc3</atomix.version> | 82 | <atomix.version>1.0.0-rc3</atomix.version> |
83 | <atomix.copycat.version>1.0.0-rc6</atomix.copycat.version> | 83 | <atomix.copycat.version>1.0.0-rc6</atomix.copycat.version> |
84 | <copycat.version>0.5.1.onos</copycat.version> | 84 | <copycat.version>0.5.1.onos</copycat.version> |
85 | - <openflowj.version>0.9.2.onos</openflowj.version> | 85 | + <openflowj.version>0.9.3.onos-SNAPSHOT</openflowj.version> |
86 | <onos-maven-plugin.version>1.9</onos-maven-plugin.version> | 86 | <onos-maven-plugin.version>1.9</onos-maven-plugin.version> |
87 | <osgi.version>4.3.1</osgi.version> | 87 | <osgi.version>4.3.1</osgi.version> |
88 | <karaf.version>3.0.5</karaf.version> | 88 | <karaf.version>3.0.5</karaf.version> |
... | @@ -104,6 +104,10 @@ | ... | @@ -104,6 +104,10 @@ |
104 | </snapshotRepository> | 104 | </snapshotRepository> |
105 | </distributionManagement> | 105 | </distributionManagement> |
106 | 106 | ||
107 | + <!-- FIXME remove before release; needed for the following | ||
108 | + - openflowj | ||
109 | + - snmp | ||
110 | + --> | ||
107 | <repositories> | 111 | <repositories> |
108 | <repository> | 112 | <repository> |
109 | <id>snapshots</id> | 113 | <id>snapshots</id> |
... | @@ -520,6 +524,13 @@ | ... | @@ -520,6 +524,13 @@ |
520 | <artifactId>jsr305</artifactId> | 524 | <artifactId>jsr305</artifactId> |
521 | <version>3.0.1</version> | 525 | <version>3.0.1</version> |
522 | </dependency> | 526 | </dependency> |
527 | + | ||
528 | + <dependency> | ||
529 | + <groupId>org.onosproject</groupId> | ||
530 | + <artifactId>openflowj</artifactId> | ||
531 | + <version>${openflowj.version}</version> | ||
532 | + <scope>provided</scope> | ||
533 | + </dependency> | ||
523 | </dependencies> | 534 | </dependencies> |
524 | </dependencyManagement> | 535 | </dependencyManagement> |
525 | 536 | ... | ... |
... | @@ -36,7 +36,6 @@ | ... | @@ -36,7 +36,6 @@ |
36 | <!-- FIXME once experimenter gets merged to upstream --> | 36 | <!-- FIXME once experimenter gets merged to upstream --> |
37 | <groupId>org.onosproject</groupId> | 37 | <groupId>org.onosproject</groupId> |
38 | <artifactId>openflowj</artifactId> | 38 | <artifactId>openflowj</artifactId> |
39 | - <version>${openflowj.version}</version> | ||
40 | </dependency> | 39 | </dependency> |
41 | <dependency> | 40 | <dependency> |
42 | <groupId>io.netty</groupId> | 41 | <groupId>io.netty</groupId> |
... | @@ -53,65 +52,13 @@ | ... | @@ -53,65 +52,13 @@ |
53 | <classifier>tests</classifier> | 52 | <classifier>tests</classifier> |
54 | <version>${project.version}</version> | 53 | <version>${project.version}</version> |
55 | </dependency> | 54 | </dependency> |
56 | - | ||
57 | </dependencies> | 55 | </dependencies> |
58 | 56 | ||
59 | <build> | 57 | <build> |
60 | <plugins> | 58 | <plugins> |
61 | <plugin> | 59 | <plugin> |
62 | - <groupId>org.apache.maven.plugins</groupId> | ||
63 | - <artifactId>maven-shade-plugin</artifactId> | ||
64 | - <version>2.4.2</version> | ||
65 | - <configuration> | ||
66 | - <artifactSet> | ||
67 | - <excludes> | ||
68 | - <exclude>org.onosproject:onlab-misc</exclude> | ||
69 | - <exclude>org.onosproject:onos-api</exclude> | ||
70 | - <exclude>org.onosproject:onlab-osgi</exclude> | ||
71 | - <exclude>org.onosproject:onlab-rest</exclude> | ||
72 | - <exclude>io.netty:netty</exclude> | ||
73 | - <exclude>joda-time:joda-time</exclude> | ||
74 | - <exclude>javax.ws.rs:javax.ws.rs-api</exclude> | ||
75 | - <exclude>com.google.guava:guava</exclude> | ||
76 | - <exclude>org.slf4j:slfj-api</exclude> | ||
77 | - <exclude>ch.qos.logback:logback-core</exclude> | ||
78 | - <exclude>ch.qos.logback:logback-classic</exclude> | ||
79 | - <exclude>com.google.code.findbugs:annotations</exclude> | ||
80 | - <exclude>commons-configuration:commons-configuration</exclude> | ||
81 | - <exclude>commons-lang:commons-lang</exclude> | ||
82 | - <exclude>commons-logging:commons-logging</exclude> | ||
83 | - <exclude>commons-collections:commons-collections</exclude> | ||
84 | - <exclude>org.apache.commons:commons-lang3</exclude> | ||
85 | - <exclude>io.dropwizard.metrics:metrics-core</exclude> | ||
86 | - <exclude>io.dropwizard.metrics:metrics-json</exclude> | ||
87 | - <exclude>org.ow2.asm:asm</exclude> | ||
88 | - <exclude>com.esotericsoftware:kryo</exclude> | ||
89 | - <exclude>com.esotericsoftware:reflectasm</exclude> | ||
90 | - <exclude>com.eclipsesource.minimal-json:minimal-json</exclude> | ||
91 | - <exclude>org.objenesis:objenesis</exclude> | ||
92 | - <exclude>com.esotericsoftware:minlog</exclude> | ||
93 | - </excludes> | ||
94 | - </artifactSet> | ||
95 | - </configuration> | ||
96 | - <executions> | ||
97 | - <execution> | ||
98 | - <phase>package</phase> | ||
99 | - <goals> | ||
100 | - <goal>shade</goal> | ||
101 | - </goals> | ||
102 | - </execution> | ||
103 | - </executions> | ||
104 | - </plugin> | ||
105 | - <plugin> | ||
106 | <groupId>org.apache.felix</groupId> | 60 | <groupId>org.apache.felix</groupId> |
107 | <artifactId>maven-bundle-plugin</artifactId> | 61 | <artifactId>maven-bundle-plugin</artifactId> |
108 | - <configuration> | ||
109 | - <instructions> | ||
110 | - <Export-Package> | ||
111 | - org.onosproject.openflow.*,org.projectfloodlight.openflow.* | ||
112 | - </Export-Package> | ||
113 | - </instructions> | ||
114 | - </configuration> | ||
115 | </plugin> | 62 | </plugin> |
116 | </plugins> | 63 | </plugins> |
117 | </build> | 64 | </build> | ... | ... |
... | @@ -36,6 +36,10 @@ | ... | @@ -36,6 +36,10 @@ |
36 | <artifactId>onos-of-api</artifactId> | 36 | <artifactId>onos-of-api</artifactId> |
37 | </dependency> | 37 | </dependency> |
38 | <dependency> | 38 | <dependency> |
39 | + <groupId>org.onosproject</groupId> | ||
40 | + <artifactId>openflowj</artifactId> | ||
41 | + </dependency> | ||
42 | + <dependency> | ||
39 | <groupId>io.netty</groupId> | 43 | <groupId>io.netty</groupId> |
40 | <artifactId>netty</artifactId> | 44 | <artifactId>netty</artifactId> |
41 | </dependency> | 45 | </dependency> | ... | ... |
... | @@ -18,7 +18,7 @@ | ... | @@ -18,7 +18,7 @@ |
18 | <feature name="${project.artifactId}" version="${project.version}" | 18 | <feature name="${project.artifactId}" version="${project.version}" |
19 | description="${project.description}"> | 19 | description="${project.description}"> |
20 | <feature>onos-api</feature> | 20 | <feature>onos-api</feature> |
21 | - <bundle>mvn:io.netty/netty/3.9.2.Final</bundle> | 21 | + <bundle>mvn:org.onosproject/openflowj/0.9.3.onos-SNAPSHOT</bundle> |
22 | <bundle>mvn:${project.groupId}/onos-of-api/${project.version}</bundle> | 22 | <bundle>mvn:${project.groupId}/onos-of-api/${project.version}</bundle> |
23 | <bundle>mvn:${project.groupId}/onos-of-ctl/${project.version}</bundle> | 23 | <bundle>mvn:${project.groupId}/onos-of-ctl/${project.version}</bundle> |
24 | 24 | ... | ... |
... | @@ -55,6 +55,10 @@ | ... | @@ -55,6 +55,10 @@ |
55 | <classifier>tests</classifier> | 55 | <classifier>tests</classifier> |
56 | <scope>test</scope> | 56 | <scope>test</scope> |
57 | </dependency> | 57 | </dependency> |
58 | + <dependency> | ||
59 | + <groupId>org.onosproject</groupId> | ||
60 | + <artifactId>openflowj</artifactId> | ||
61 | + </dependency> | ||
58 | 62 | ||
59 | <dependency> | 63 | <dependency> |
60 | <groupId>org.onosproject</groupId> | 64 | <groupId>org.onosproject</groupId> | ... | ... |
-
Please register or login to post a comment