Code Review / controller.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Cleanup sal-karaf-xsql/pom.xml
[controller.git] / opendaylight / md-sal / sal-karaf-xsql / pom.xml
diff --git a/opendaylight/md-sal/sal-karaf-xsql/pom.xml b/opendaylight/md-sal/sal-karaf-xsql/pom.xml
index c32d96084144e97c2bccd06bd7e6b30893a0bf29..27797d36adf2f30016c33f5e5fd2b114b9aa481d 100644 (file)
--- a/opendaylight/md-sal/sal-karaf-xsql/pom.xml
+++ b/opendaylight/md-sal/sal-karaf-xsql/pom.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
-\r
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
     <!--
         Licensed to the Apache Software Foundation (ASF) under one or more
         contributor license agreements.  See the NOTICE file distributed with
     <!--
         Licensed to the Apache Software Foundation (ASF) under one or more
         contributor license agreements.  See the NOTICE file distributed with
@@ -16,91 +16,87 @@
         WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
         See the License for the specific language governing permissions and
         limitations under the License.
         WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
         See the License for the specific language governing permissions and
         limitations under the License.
-    -->\r
-\r
-    <modelVersion>4.0.0</modelVersion>\r
-\r
-    <parent>\r
-    <artifactId>sal-parent</artifactId>\r
-    <groupId>org.opendaylight.controller</groupId>\r
-    <version>1.1-SNAPSHOT</version>\r
-  </parent>\r
-\r
-    <groupId>xsqlcommand</groupId>\r
-    <artifactId>xsqlcommand</artifactId>\r
-    <packaging>bundle</packaging>\r
-    <version>1.0.0-SNAPSHOT</version>\r
-    <name>Apache Karaf :: Shell odl/xsql Commands</name>\r
-\r
-    <description>Provides the OSGi odl commands</description>\r
-\r
-    <dependencies>\r
-        <dependency>\r
-            <groupId>org.apache.karaf.shell</groupId>\r
-            <artifactId>org.apache.karaf.shell.console</artifactId>\r
-            <version>3.0.1</version>\r
-        </dependency>\r
-\r
-        <dependency>\r
-            <groupId>org.osgi</groupId>\r
-            <artifactId>org.osgi.core</artifactId>\r
-            <version>5.0.0</version>\r
-            <scope>provided</scope>\r
-        </dependency>\r
-\r
-        <dependency>\r
-            <groupId>org.osgi</groupId>\r
-            <artifactId>org.osgi.compendium</artifactId>\r
-            <version>5.0.0</version>\r
-            <scope>provided</scope>\r
-        </dependency>\r
-\r
-        <dependency>\r
-            <groupId>junit</groupId>\r
-            <artifactId>junit</artifactId>\r
-            <version>4.11</version>\r
-            <scope>test</scope>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.opendaylight.controller</groupId>\r
-            <artifactId>sal-dom-xsql</artifactId>\r
-            <type>bundle</type>\r
-            <version>1.1-SNAPSHOT</version>\r
-        </dependency>\r
-    </dependencies>\r
-\r
-    <build>\r
-        <plugins>\r
-            <plugin>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <inherited>true</inherited>\r
-                <version>2.3.2</version>\r
-                <configuration>\r
-                    <source>1.5</source>\r
-                    <target>1.5</target>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <groupId>org.apache.felix</groupId>\r
-                <artifactId>maven-bundle-plugin</artifactId>\r
-                <version>2.4.0</version>\r
-                <extensions>true</extensions>\r
-                <configuration>\r
-                    <instructions>\r
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>\r
-                        <Export-Package>org.opendaylight.controller.xsql*;version=${project.version}</Export-Package>\r
-                        <Import-Package>!org.opendaylight.controller.xsql*,\r
-                            org.apache.aries.blueprint,\r
-                            org.osgi.service.blueprint.container,\r
-                            org.osgi.service.blueprint.reflect,\r
-                            org.apache.felix.service.command,\r
-                            org.apache.karaf.shell.commands,\r
-                            org.apache.karaf.shell.console,\r
-                            *</Import-Package>\r
-                    </instructions>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
-    </build>\r
-\r
-</project>\r
+    -->
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>bundle-parent</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>sal-karaf-xsql</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+    <name>Apache Karaf :: Shell odl/xsql Commands</name>
+
+    <description>Provides the OSGi odl commands</description>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>1.5.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.karaf.shell</groupId>
+            <artifactId>org.apache.karaf.shell.console</artifactId>
+            <version>${karaf.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <version>5.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-dom-xsql</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.opendaylight.controller.xsql*;version=${project.version}</Export-Package>
+                        <Import-Package>!org.opendaylight.controller.xsql*,
+                            org.apache.aries.blueprint,
+                            org.osgi.service.blueprint.container,
+                            org.osgi.service.blueprint.reflect,
+                            org.apache.karaf.shell.commands,
+                            org.apache.karaf.shell.console,
+                            *</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
OpenDaylight controller