Committed by
Phaneendra-Huawei
Tabs converted to spaces in pom files
Change-Id: Id20ba34388b1f41d0d542e773d49b221c0bfb3f7
Showing
10 changed files
with
148 additions
and
148 deletions
| ... | @@ -43,7 +43,7 @@ | ... | @@ -43,7 +43,7 @@ |
| 43 | <version>${project.version}</version> | 43 | <version>${project.version}</version> |
| 44 | </dependency> | 44 | </dependency> |
| 45 | 45 | ||
| 46 | - <dependency> | 46 | + <dependency> |
| 47 | <groupId>org.onosproject</groupId> | 47 | <groupId>org.onosproject</groupId> |
| 48 | <artifactId>onlab-thirdparty</artifactId> | 48 | <artifactId>onlab-thirdparty</artifactId> |
| 49 | </dependency> | 49 | </dependency> | ... | ... |
| 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 2 | -<!-- ~ Copyright 2014 Open Networking Laboratory ~ ~ Licensed under the Apache | 2 | +<!-- ~ Copyright 2014 Open Networking Laboratory ~ ~ Licensed under the Apache |
| 3 | - License, Version 2.0 (the "License"); ~ you may not use this file except | 3 | + License, Version 2.0 (the "License"); ~ you may not use this file except |
| 4 | - in compliance with the License. ~ You may obtain a copy of the License at | 4 | + in compliance with the License. ~ You may obtain a copy of the License at |
| 5 | - ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable | 5 | + ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable |
| 6 | - law or agreed to in writing, software ~ distributed under the License is | 6 | + law or agreed to in writing, software ~ distributed under the License is |
| 7 | - distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY | 7 | + distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY |
| 8 | - KIND, either express or implied. ~ See the License for the specific language | 8 | + KIND, either express or implied. ~ See the License for the specific language |
| 9 | - governing permissions and ~ limitations under the License. --> | 9 | + governing permissions and ~ limitations under the License. --> |
| 10 | <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | 10 | <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
| 11 | - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | 11 | + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
| 12 | - <modelVersion>4.0.0</modelVersion> | 12 | + <modelVersion>4.0.0</modelVersion> |
| 13 | 13 | ||
| 14 | - <parent> | 14 | + <parent> |
| 15 | - <groupId>org.onosproject</groupId> | 15 | + <groupId>org.onosproject</groupId> |
| 16 | - <artifactId>onos-app-vtn</artifactId> | 16 | + <artifactId>onos-app-vtn</artifactId> |
| 17 | - <version>1.4.0-SNAPSHOT</version> | 17 | + <version>1.4.0-SNAPSHOT</version> |
| 18 | - <relativePath>../pom.xml</relativePath> | 18 | + <relativePath>../pom.xml</relativePath> |
| 19 | - </parent> | 19 | + </parent> |
| 20 | 20 | ||
| 21 | - <artifactId>onos-app-vtn-onosfw</artifactId> | 21 | + <artifactId>onos-app-vtn-onosfw</artifactId> |
| 22 | - <packaging>pom</packaging> | 22 | + <packaging>pom</packaging> |
| 23 | 23 | ||
| 24 | - <description>ONOS framework applications</description> | 24 | + <description>ONOS framework applications</description> |
| 25 | 25 | ||
| 26 | - <dependencies> | 26 | + <dependencies> |
| 27 | - <dependency> | 27 | + <dependency> |
| 28 | - <groupId>org.onosproject</groupId> | 28 | + <groupId>org.onosproject</groupId> |
| 29 | - <artifactId>onos-app-vtn-rsc</artifactId> | 29 | + <artifactId>onos-app-vtn-rsc</artifactId> |
| 30 | - <version>${project.version}</version> | 30 | + <version>${project.version}</version> |
| 31 | - </dependency> | 31 | + </dependency> |
| 32 | - <dependency> | 32 | + <dependency> |
| 33 | - <groupId>org.onosproject</groupId> | 33 | + <groupId>org.onosproject</groupId> |
| 34 | - <artifactId>onos-app-vtn-web</artifactId> | 34 | + <artifactId>onos-app-vtn-web</artifactId> |
| 35 | - <version>${project.version}</version> | 35 | + <version>${project.version}</version> |
| 36 | - </dependency> | 36 | + </dependency> |
| 37 | - <dependency> | 37 | + <dependency> |
| 38 | - <groupId>org.onosproject</groupId> | 38 | + <groupId>org.onosproject</groupId> |
| 39 | - <artifactId>onos-app-vtn-mgr</artifactId> | 39 | + <artifactId>onos-app-vtn-mgr</artifactId> |
| 40 | - <version>${project.version}</version> | 40 | + <version>${project.version}</version> |
| 41 | - </dependency> | 41 | + </dependency> |
| 42 | - </dependencies> | 42 | + </dependencies> |
| 43 | 43 | ||
| 44 | </project> | 44 | </project> | ... | ... |
| ... | @@ -36,9 +36,9 @@ | ... | @@ -36,9 +36,9 @@ |
| 36 | <module>vtnmgr</module> | 36 | <module>vtnmgr</module> |
| 37 | <module>vtnweb</module> | 37 | <module>vtnweb</module> |
| 38 | <module>app</module> | 38 | <module>app</module> |
| 39 | - </modules> | 39 | + </modules> |
| 40 | - <dependencies> | 40 | + <dependencies> |
| 41 | - <dependency> | 41 | + <dependency> |
| 42 | <groupId>org.onosproject</groupId> | 42 | <groupId>org.onosproject</groupId> |
| 43 | <artifactId>onlab-junit</artifactId> | 43 | <artifactId>onlab-junit</artifactId> |
| 44 | <scope>test</scope> | 44 | <scope>test</scope> | ... | ... |
| ... | @@ -15,42 +15,42 @@ | ... | @@ -15,42 +15,42 @@ |
| 15 | ~ limitations under the License. | 15 | ~ limitations under the License. |
| 16 | --> | 16 | --> |
| 17 | <project | 17 | <project |
| 18 | - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" | 18 | + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" |
| 19 | - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> | 19 | + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |
| 20 | - <modelVersion>4.0.0</modelVersion> | 20 | + <modelVersion>4.0.0</modelVersion> |
| 21 | - <parent> | 21 | + <parent> |
| 22 | - <groupId>org.onosproject</groupId> | 22 | + <groupId>org.onosproject</groupId> |
| 23 | - <artifactId>onos-app-vtn</artifactId> | 23 | + <artifactId>onos-app-vtn</artifactId> |
| 24 | - <version>1.4.0-SNAPSHOT</version> | 24 | + <version>1.4.0-SNAPSHOT</version> |
| 25 | - <relativePath>../pom.xml</relativePath> | 25 | + <relativePath>../pom.xml</relativePath> |
| 26 | - </parent> | 26 | + </parent> |
| 27 | 27 | ||
| 28 | 28 | ||
| 29 | - <artifactId>onos-app-vtn-rsc</artifactId> | 29 | + <artifactId>onos-app-vtn-rsc</artifactId> |
| 30 | - <packaging>bundle</packaging> | 30 | + <packaging>bundle</packaging> |
| 31 | 31 | ||
| 32 | - <dependencies> | 32 | + <dependencies> |
| 33 | - <dependency> | 33 | + <dependency> |
| 34 | - <groupId>org.onosproject</groupId> | 34 | + <groupId>org.onosproject</groupId> |
| 35 | - <artifactId>onos-api</artifactId> | 35 | + <artifactId>onos-api</artifactId> |
| 36 | - </dependency> | 36 | + </dependency> |
| 37 | - <dependency> | 37 | + <dependency> |
| 38 | - <groupId>org.onosproject</groupId> | 38 | + <groupId>org.onosproject</groupId> |
| 39 | - <artifactId>onos-cli</artifactId> | 39 | + <artifactId>onos-cli</artifactId> |
| 40 | - <version>${project.version}</version> | 40 | + <version>${project.version}</version> |
| 41 | - </dependency> | 41 | + </dependency> |
| 42 | - <dependency> | 42 | + <dependency> |
| 43 | - <groupId>org.apache.felix</groupId> | 43 | + <groupId>org.apache.felix</groupId> |
| 44 | - <artifactId>org.apache.felix.scr.annotations</artifactId> | 44 | + <artifactId>org.apache.felix.scr.annotations</artifactId> |
| 45 | - </dependency> | 45 | + </dependency> |
| 46 | - <dependency> | 46 | + <dependency> |
| 47 | - <groupId>org.apache.karaf.shell</groupId> | 47 | + <groupId>org.apache.karaf.shell</groupId> |
| 48 | - <artifactId>org.apache.karaf.shell.console</artifactId> | 48 | + <artifactId>org.apache.karaf.shell.console</artifactId> |
| 49 | - </dependency> | 49 | + </dependency> |
| 50 | - <dependency> | 50 | + <dependency> |
| 51 | - <groupId>org.onosproject</groupId> | 51 | + <groupId>org.onosproject</groupId> |
| 52 | - <artifactId>onos-core-serializers</artifactId> | 52 | + <artifactId>onos-core-serializers</artifactId> |
| 53 | - <version>${project.version}</version> | 53 | + <version>${project.version}</version> |
| 54 | - </dependency> | 54 | + </dependency> |
| 55 | - </dependencies> | 55 | + </dependencies> |
| 56 | </project> | 56 | </project> | ... | ... |
| ... | @@ -50,7 +50,7 @@ | ... | @@ -50,7 +50,7 @@ |
| 50 | <groupId>org.onosproject</groupId> | 50 | <groupId>org.onosproject</groupId> |
| 51 | <artifactId>onos-api</artifactId> | 51 | <artifactId>onos-api</artifactId> |
| 52 | </dependency>--> | 52 | </dependency>--> |
| 53 | - <dependency> | 53 | + <dependency> |
| 54 | <groupId>org.onosproject</groupId> | 54 | <groupId>org.onosproject</groupId> |
| 55 | <artifactId>onos-api</artifactId> | 55 | <artifactId>onos-api</artifactId> |
| 56 | <classifier>tests</classifier> | 56 | <classifier>tests</classifier> | ... | ... |
| ... | @@ -34,7 +34,7 @@ | ... | @@ -34,7 +34,7 @@ |
| 34 | <modules> | 34 | <modules> |
| 35 | <module>dist</module> | 35 | <module>dist</module> |
| 36 | <module>persistence</module> | 36 | <module>persistence</module> |
| 37 | - <module>serializers</module> | 37 | + <module>serializers</module> |
| 38 | </modules> | 38 | </modules> |
| 39 | 39 | ||
| 40 | <dependencies> | 40 | <dependencies> | ... | ... |
| ... | @@ -15,35 +15,35 @@ | ... | @@ -15,35 +15,35 @@ |
| 15 | ~ limitations under the License. | 15 | ~ limitations under the License. |
| 16 | --> | 16 | --> |
| 17 | <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | 17 | <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
| 18 | - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | 18 | + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
| 19 | - <modelVersion>4.0.0</modelVersion> | 19 | + <modelVersion>4.0.0</modelVersion> |
| 20 | - <parent> | 20 | + <parent> |
| 21 | - <groupId>org.onosproject</groupId> | 21 | + <groupId>org.onosproject</groupId> |
| 22 | - <artifactId>onos-ovsdb</artifactId> | 22 | + <artifactId>onos-ovsdb</artifactId> |
| 23 | - <version>1.4.0-SNAPSHOT</version> | 23 | + <version>1.4.0-SNAPSHOT</version> |
| 24 | - <relativePath>../pom.xml</relativePath> | 24 | + <relativePath>../pom.xml</relativePath> |
| 25 | - </parent> | 25 | + </parent> |
| 26 | - <artifactId>onos-ovsdb-rfc</artifactId> | 26 | + <artifactId>onos-ovsdb-rfc</artifactId> |
| 27 | - <packaging>bundle</packaging> | 27 | + <packaging>bundle</packaging> |
| 28 | 28 | ||
| 29 | - <dependencies> | 29 | + <dependencies> |
| 30 | - <dependency> | 30 | + <dependency> |
| 31 | - <groupId>org.apache.felix</groupId> | 31 | + <groupId>org.apache.felix</groupId> |
| 32 | - <artifactId>org.apache.felix.scr.annotations</artifactId> | 32 | + <artifactId>org.apache.felix.scr.annotations</artifactId> |
| 33 | - </dependency> | 33 | + </dependency> |
| 34 | - <dependency> | 34 | + <dependency> |
| 35 | - <groupId>org.osgi</groupId> | 35 | + <groupId>org.osgi</groupId> |
| 36 | - <artifactId>org.osgi.compendium</artifactId> | 36 | + <artifactId>org.osgi.compendium</artifactId> |
| 37 | - </dependency> | 37 | + </dependency> |
| 38 | - </dependencies> | 38 | + </dependencies> |
| 39 | 39 | ||
| 40 | - <build> | 40 | + <build> |
| 41 | - <plugins> | 41 | + <plugins> |
| 42 | - <plugin> | 42 | + <plugin> |
| 43 | - <groupId>org.apache.felix</groupId> | 43 | + <groupId>org.apache.felix</groupId> |
| 44 | - <artifactId>maven-scr-plugin</artifactId> | 44 | + <artifactId>maven-scr-plugin</artifactId> |
| 45 | - </plugin> | 45 | + </plugin> |
| 46 | - </plugins> | 46 | + </plugins> |
| 47 | - </build> | 47 | + </build> |
| 48 | 48 | ||
| 49 | </project> | 49 | </project> | ... | ... |
| ... | @@ -20,8 +20,8 @@ | ... | @@ -20,8 +20,8 @@ |
| 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> | 23 | + <bundle>mvn:${project.groupId}/onos-pcepio/${project.version}</bundle> |
| 24 | - <bundle>mvn:${project.groupId}/onos-pcep-controller-api/${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> | 25 | <bundle>mvn:${project.groupId}/onos-pcep-controller-impl/${project.version}</bundle> |
| 26 | <bundle>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</bundle> | 26 | <bundle>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</bundle> |
| 27 | <bundle>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</bundle> | 27 | <bundle>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</bundle> | ... | ... |
| ... | @@ -14,49 +14,49 @@ | ... | @@ -14,49 +14,49 @@ |
| 14 | ~ limitations under the License. | 14 | ~ limitations under the License. |
| 15 | --> | 15 | --> |
| 16 | <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | 16 | <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
| 17 | - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | 17 | + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
| 18 | - <modelVersion>4.0.0</modelVersion> | 18 | + <modelVersion>4.0.0</modelVersion> |
| 19 | - <parent> | 19 | + <parent> |
| 20 | - <groupId>org.onosproject</groupId> | 20 | + <groupId>org.onosproject</groupId> |
| 21 | - <artifactId>onos-pcep-providers</artifactId> | 21 | + <artifactId>onos-pcep-providers</artifactId> |
| 22 | - <version>1.4.0-SNAPSHOT</version> | 22 | + <version>1.4.0-SNAPSHOT</version> |
| 23 | - <relativePath>../pom.xml</relativePath> | 23 | + <relativePath>../pom.xml</relativePath> |
| 24 | - </parent> | 24 | + </parent> |
| 25 | 25 | ||
| 26 | - <artifactId>onos-pcep</artifactId> | 26 | + <artifactId>onos-pcep</artifactId> |
| 27 | - <packaging>pom</packaging> | 27 | + <packaging>pom</packaging> |
| 28 | <description>PCEP protocol southbound providers</description> | 28 | <description>PCEP protocol southbound providers</description> |
| 29 | - | 29 | + |
| 30 | <dependencies> | 30 | <dependencies> |
| 31 | - <dependency> | 31 | + <dependency> |
| 32 | - <groupId>org.onosproject</groupId> | 32 | + <groupId>org.onosproject</groupId> |
| 33 | - <artifactId>onos-app-pcep-api</artifactId> | 33 | + <artifactId>onos-app-pcep-api</artifactId> |
| 34 | - </dependency> | 34 | + </dependency> |
| 35 | <dependency> | 35 | <dependency> |
| 36 | - <groupId>org.onosproject</groupId> | 36 | + <groupId>org.onosproject</groupId> |
| 37 | - <artifactId>onos-pcepio</artifactId> | 37 | + <artifactId>onos-pcepio</artifactId> |
| 38 | - <version>${project.version}</version> | 38 | + <version>${project.version}</version> |
| 39 | - </dependency> | 39 | + </dependency> |
| 40 | <dependency> | 40 | <dependency> |
| 41 | - <groupId>org.onosproject</groupId> | 41 | + <groupId>org.onosproject</groupId> |
| 42 | - <artifactId>onos-pcep-controller-api</artifactId> | 42 | + <artifactId>onos-pcep-controller-api</artifactId> |
| 43 | - <version>${project.version}</version> | 43 | + <version>${project.version}</version> |
| 44 | - </dependency> | 44 | + </dependency> |
| 45 | <dependency> | 45 | <dependency> |
| 46 | - <groupId>org.onosproject</groupId> | 46 | + <groupId>org.onosproject</groupId> |
| 47 | - <artifactId>onos-pcep-controller-impl</artifactId> | 47 | + <artifactId>onos-pcep-controller-impl</artifactId> |
| 48 | - <version>${project.version}</version> | 48 | + <version>${project.version}</version> |
| 49 | - </dependency> | 49 | + </dependency> |
| 50 | - <dependency> | 50 | + <dependency> |
| 51 | - <groupId>org.onosproject</groupId> | 51 | + <groupId>org.onosproject</groupId> |
| 52 | - <artifactId>onos-pcep-provider-topology</artifactId> | 52 | + <artifactId>onos-pcep-provider-topology</artifactId> |
| 53 | - <version>${project.version}</version> | 53 | + <version>${project.version}</version> |
| 54 | - </dependency> | 54 | + </dependency> |
| 55 | - <dependency> | 55 | + <dependency> |
| 56 | - <groupId>org.onosproject</groupId> | 56 | + <groupId>org.onosproject</groupId> |
| 57 | - <artifactId>onos-pcep-provider-tunnel</artifactId> | 57 | + <artifactId>onos-pcep-provider-tunnel</artifactId> |
| 58 | - <version>${project.version}</version> | 58 | + <version>${project.version}</version> |
| 59 | - </dependency> | 59 | + </dependency> |
| 60 | 60 | ||
| 61 | - </dependencies> | 61 | + </dependencies> |
| 62 | </project> | 62 | </project> | ... | ... |
| ... | @@ -25,8 +25,8 @@ | ... | @@ -25,8 +25,8 @@ |
| 25 | <packaging>pom</packaging> | 25 | <packaging>pom</packaging> |
| 26 | <description>PCEP protocol providers root</description> | 26 | <description>PCEP protocol providers root</description> |
| 27 | <modules> | 27 | <modules> |
| 28 | - <module>topology</module> | 28 | + <module>topology</module> |
| 29 | - <module>tunnel</module> | 29 | + <module>tunnel</module> |
| 30 | - <module>app</module> | 30 | + <module>app</module> |
| 31 | </modules> | 31 | </modules> |
| 32 | </project> | 32 | </project> |
| ... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
-
Please register or login to post a comment