Bump versions by x.y.(z+1)

[dlux.git] / bundles / node / pom.xml

diff --git a/bundles/node/pom.xml b/bundles/node/pom.xml
index 251fac2230778027d64bb2eac9da218f195a7545..47e00a1db7dade5b5553ff3af91c3923aca973cb 100644 (file)
--- a/bundles/node/pom.xml
+++ b/bundles/node/pom.xml
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.dlux</groupId>
-    <artifactId>dlux-parent</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
+    <artifactId>bundles</artifactId>
+    <version>0.5.4-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
   <groupId>org.opendaylight.dlux</groupId>
@@ -14,17 +14,15 @@
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>5.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>4.2.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>1.4.0</version>
+      <version>${apache.felix.osgi.compendium.version}</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -33,7 +31,7 @@
     <dependency>
       <groupId>org.opendaylight.dlux</groupId>
       <artifactId>loader</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
+        <version>${project.version}</version>
     </dependency>
      <dependency>
       <groupId>org.opendaylight.dlux</groupId>
@@ -42,11 +40,18 @@
     </dependency>
   </dependencies>
  <build>
+     <resources>
+         <resource>
+             <directory>target/generated-resources</directory>
+         </resource>
+         <resource>
+             <directory>src/main/resources</directory>
+         </resource>
+     </resources>
     <plugins>
      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.6</version>
         <executions>
      <!--loader Resources-->
           <execution>
@@ -58,7 +63,7 @@
             <configuration>
               <outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
               <groupId>org.opendaylight.dlux</groupId>
-              <includeArtifactIds>dlux.core.resources</includeArtifactIds>
+              <includeArtifactIds>dlux.node.resources</includeArtifactIds>
               <excludes>META-INF\/**</excludes>
               <excludeTransitive>true</excludeTransitive>
               <ignorePermissions>false</ignorePermissions>