Testtools should not be bundles

Change-Id: I5e764fe167ed55a9b9b9318decabe283674ce3e2
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/bgp/testtool/pom.xml b/bgp/testtool/pom.xml
index c9296880c4c4ba550a75d45e64119b25a6050d96..66b4ab4b0be193af93eabdc5685a3efb8475a9fa 100644 (file)
--- a/bgp/testtool/pom.xml
+++ b/bgp/testtool/pom.xml
@@ -12,7 +12,7 @@
        <modelVersion>4.0.0</modelVersion>
        <artifactId>bgp-testtool</artifactId>
        <description>BGP Interop Testing Tool</description>
-       <packaging>bundle</packaging>
+       <packaging>jar</packaging>
        <name>${project.artifactId}</name>
        <prerequisites>
                <maven>3.0.4</maven>
@@ -64,20 +64,18 @@
 
        <build>
                <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${maven.bundle.version}</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                                               <Export-Package>
-                                                       org.opendaylight.protocol.bgp.testtool
-                                               </Export-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>${maven.jar.version}</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>org.opendaylight.protocol.bgp.testtool.Main</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-shade-plugin</artifactId>

diff --git a/pcep/testtool/pom.xml b/pcep/testtool/pom.xml
index 5fc7aa02873b5dc0509f901875f9b2a81d6895e1..a18b9fa56c2d62b506fc4775acbbdbaa15187d67 100644 (file)
--- a/pcep/testtool/pom.xml
+++ b/pcep/testtool/pom.xml
@@ -12,7 +12,7 @@
        <modelVersion>4.0.0</modelVersion>
        <artifactId>pcep-testtool</artifactId>
        <description>PCEP Interop Testing Tool</description>
-       <packaging>bundle</packaging>
+       <packaging>jar</packaging>
        <name>${project.artifactId}</name>
        <prerequisites>
                <maven>3.0.4</maven>
@@ -69,20 +69,18 @@
 
        <build>
                <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${maven.bundle.version}</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                                               <Export-Package>
-                                                       org.opendaylight.protocol.pcep.testtool
-                                               </Export-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>${maven.jar.version}</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>org.opendaylight.protocol.pcep.testtool.Main</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-shade-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
index ae5af762be77d3719f018b4b81b5a6e12291c3a7..c246765acfdf2a187675d9f8ae7df04b528ac767 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,7 @@
                <logback.version>1.0.7</logback.version>
                <maven.bundle.version>2.4.0</maven.bundle.version>
                <maven.compiler.version>3.1</maven.compiler.version>
+               <maven.jar.version>2.4</maven.jar.version>
                <maven.shade.version>2.1</maven.shade.version>
                <mockito.version>1.9.5</mockito.version>
                <netty.version>4.0.9.Final</netty.version>