Committed by
Gerrit Code Review
Pcep tunnel provider added in features xml
Change-Id: If65a92c8c6a3c67ff4afb65851eab80fc51ebe25
Showing
6 changed files
with
35 additions
and
5 deletions
| ... | @@ -34,6 +34,10 @@ | ... | @@ -34,6 +34,10 @@ |
| 34 | <dependencies> | 34 | <dependencies> |
| 35 | <dependency> | 35 | <dependency> |
| 36 | <groupId>org.onosproject</groupId> | 36 | <groupId>org.onosproject</groupId> |
| 37 | + <artifactId>onos-app-pcep-api</artifactId> | ||
| 38 | + </dependency> | ||
| 39 | + <dependency> | ||
| 40 | + <groupId>org.onosproject</groupId> | ||
| 37 | <artifactId>onos-pcepio</artifactId> | 41 | <artifactId>onos-pcepio</artifactId> |
| 38 | </dependency> | 42 | </dependency> |
| 39 | <dependency> | 43 | <dependency> | ... | ... |
| ... | @@ -32,7 +32,6 @@ | ... | @@ -32,7 +32,6 @@ |
| 32 | 32 | ||
| 33 | <dependencies> | 33 | <dependencies> |
| 34 | <dependency> | 34 | <dependency> |
| 35 | - <!-- FIXME once experimenter gets merged to upstream --> | ||
| 36 | <groupId>org.onosproject</groupId> | 35 | <groupId>org.onosproject</groupId> |
| 37 | <artifactId>onos-pcep-controller-api</artifactId> | 36 | <artifactId>onos-pcep-controller-api</artifactId> |
| 38 | </dependency> | 37 | </dependency> | ... | ... |
pom.xml
100755 → 100644
| ... | @@ -410,19 +410,18 @@ | ... | @@ -410,19 +410,18 @@ |
| 410 | </dependency> | 410 | </dependency> |
| 411 | <dependency> | 411 | <dependency> |
| 412 | <groupId>org.onosproject</groupId> | 412 | <groupId>org.onosproject</groupId> |
| 413 | - <artifactId>onos-pcepio</artifactId> | 413 | + <artifactId>onos-app-pcep-api</artifactId> |
| 414 | <version>${project.version}</version> | 414 | <version>${project.version}</version> |
| 415 | </dependency> | 415 | </dependency> |
| 416 | - | ||
| 417 | <dependency> | 416 | <dependency> |
| 418 | <groupId>org.onosproject</groupId> | 417 | <groupId>org.onosproject</groupId> |
| 419 | - <artifactId>onos-pcep-controller-api</artifactId> | 418 | + <artifactId>onos-pcepio</artifactId> |
| 420 | <version>${project.version}</version> | 419 | <version>${project.version}</version> |
| 421 | </dependency> | 420 | </dependency> |
| 422 | 421 | ||
| 423 | <dependency> | 422 | <dependency> |
| 424 | <groupId>org.onosproject</groupId> | 423 | <groupId>org.onosproject</groupId> |
| 425 | - <artifactId>onos-app-pcep-api</artifactId> | 424 | + <artifactId>onos-pcep-controller-api</artifactId> |
| 426 | <version>${project.version}</version> | 425 | <version>${project.version}</version> |
| 427 | </dependency> | 426 | </dependency> |
| 428 | <dependency> | 427 | <dependency> |
| ... | @@ -439,6 +438,13 @@ | ... | @@ -439,6 +438,13 @@ |
| 439 | <scope>test</scope> | 438 | <scope>test</scope> |
| 440 | </dependency> | 439 | </dependency> |
| 441 | <dependency> | 440 | <dependency> |
| 441 | + <groupId>org.onosproject</groupId> | ||
| 442 | + <artifactId>onos-pcep-controller-api</artifactId> | ||
| 443 | + <version>${project.version}</version> | ||
| 444 | + <classifier>tests</classifier> | ||
| 445 | + <scope>test</scope> | ||
| 446 | + </dependency> | ||
| 447 | + <dependency> | ||
| 442 | <groupId>commons-pool</groupId> | 448 | <groupId>commons-pool</groupId> |
| 443 | <artifactId>commons-pool</artifactId> | 449 | <artifactId>commons-pool</artifactId> |
| 444 | <version>1.6</version> | 450 | <version>1.6</version> | ... | ... |
| ... | @@ -19,6 +19,9 @@ | ... | @@ -19,6 +19,9 @@ |
| 19 | features="${project.artifactId}"> | 19 | features="${project.artifactId}"> |
| 20 | <description>${project.description}</description> | 20 | <description>${project.description}</description> |
| 21 | <artifact>mvn:${project.groupId}/onos-app-pcep-api/${project.version}</artifact> | 21 | <artifact>mvn:${project.groupId}/onos-app-pcep-api/${project.version}</artifact> |
| 22 | + <artifact>mvn:${project.groupId}/onos-pcepio/${project.version}</artifact> | ||
| 23 | + <artifact>mvn:${project.groupId}/onos-pcep-controller-api/${project.version}</artifact> | ||
| 24 | + <artifact>mvn:${project.groupId}/onos-pcep-controller-impl/${project.version}</artifact> | ||
| 22 | <artifact>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</artifact> | 25 | <artifact>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</artifact> |
| 23 | <artifact>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</artifact> | 26 | <artifact>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</artifact> |
| 24 | </app> | 27 | </app> | ... | ... |
| ... | @@ -20,6 +20,9 @@ | ... | @@ -20,6 +20,9 @@ |
| 20 | description="${project.description}"> | 20 | description="${project.description}"> |
| 21 | <feature>onos-api</feature> | 21 | <feature>onos-api</feature> |
| 22 | <bundle>mvn:${project.groupId}/onos-app-pcep-api/${project.version}</bundle> | 22 | <bundle>mvn:${project.groupId}/onos-app-pcep-api/${project.version}</bundle> |
| 23 | + <bundle>mvn:${project.groupId}/onos-pcepio/${project.version}</bundle> | ||
| 24 | + <bundle>mvn:${project.groupId}/onos-pcep-controller-api/${project.version}</bundle> | ||
| 25 | + <bundle>mvn:${project.groupId}/onos-pcep-controller-impl/${project.version}</bundle> | ||
| 23 | <bundle>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</bundle> | 26 | <bundle>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</bundle> |
| 24 | <bundle>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</bundle> | 27 | <bundle>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</bundle> |
| 25 | </feature> | 28 | </feature> | ... | ... |
| ... | @@ -17,6 +17,21 @@ | ... | @@ -17,6 +17,21 @@ |
| 17 | <groupId>org.onosproject</groupId> | 17 | <groupId>org.onosproject</groupId> |
| 18 | <artifactId>onos-app-pcep-api</artifactId> | 18 | <artifactId>onos-app-pcep-api</artifactId> |
| 19 | </dependency> | 19 | </dependency> |
| 20 | + <dependency> | ||
| 21 | + <groupId>org.onosproject</groupId> | ||
| 22 | + <artifactId>onos-pcepio</artifactId> | ||
| 23 | + <version>${project.version}</version> | ||
| 24 | + </dependency> | ||
| 25 | + <dependency> | ||
| 26 | + <groupId>org.onosproject</groupId> | ||
| 27 | + <artifactId>onos-pcep-controller-api</artifactId> | ||
| 28 | + <version>${project.version}</version> | ||
| 29 | + </dependency> | ||
| 30 | + <dependency> | ||
| 31 | + <groupId>org.onosproject</groupId> | ||
| 32 | + <artifactId>onos-pcep-controller-impl</artifactId> | ||
| 33 | + <version>${project.version}</version> | ||
| 34 | + </dependency> | ||
| 20 | <dependency> | 35 | <dependency> |
| 21 | <groupId>org.onosproject</groupId> | 36 | <groupId>org.onosproject</groupId> |
| 22 | <artifactId>onos-pcep-provider-topology</artifactId> | 37 | <artifactId>onos-pcep-provider-topology</artifactId> | ... | ... |
-
Please register or login to post a comment