Revert "Support building without zip archives"

This reverts commit dd16e4611811b9fc7add790bf364f805d2795b93, which
breaks builds on our infrastructure (without the empty Karaf
archive).

Change-Id: I8f6cb74c97a827175f8bd6089c6b9a5217aae78e
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/features-test/pom.xml b/features-test/pom.xml
index e40fb2b72f6e92cc99a9bab549dd25aba8baf156..70309677aa42b13696ee28f5be7f4cf16a9bdccf 100644 (file)
--- a/features-test/pom.xml
+++ b/features-test/pom.xml
@@ -93,6 +93,17 @@
             <artifactId>org.osgi.core</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>opendaylight-karaf-empty</artifactId>
+            <type>zip</type>
+            <exclusions>
+              <exclusion>
+                <groupId>*</groupId>
+                <artifactId>*</artifactId>
+              </exclusion>
+            </exclusions>
+        </dependency>
         <!-- BEWARE of adding additional dependencies here...
              It will cause weird issues e.g. in integration/distribution/features/repos/distribution -->
         <dependency>
@@ -186,45 +197,4 @@
         </plugins>
     </build>
 
-    <!-- We use profiles to handle the different archives which are user-configurable.
-         We need at least one archive to be built. -->
-    <profiles>
-        <profile>
-            <id>zip</id>
-            <activation>
-                <property>
-                    <name>karaf.archiveZip</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.odlparent</groupId>
-                    <artifactId>opendaylight-karaf-empty</artifactId>
-                    <type>zip</type>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>*</groupId>
-                            <artifactId>*</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-            </dependencies>
-            <properties>
-                <archive.extension>zip</archive.extension>
-            </properties>
-        </profile>
-        <profile>
-            <id>tarGz</id>
-            <activation>
-                <property>
-                    <name>karaf.archiveTarGz</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <properties>
-                <archive.extension>tar.gz</archive.extension>
-            </properties>
-        </profile>
-    </profiles>
 </project>