You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by bi...@apache.org on 2015/10/24 13:38:15 UTC

svn commit: r1710332 - in /felix/trunk/tools/maven-bundle-plugin: pom.xml src/it/dep-reduced/pom.xml src/it/dep-reduced/verify.groovy

Author: bimargulies
Date: Sat Oct 24 11:38:15 2015
New Revision: 1710332

URL: http://svn.apache.org/viewvc?rev=1710332&view=rev
Log:
FELIX-5073: fill in integration test.

Added:
    felix/trunk/tools/maven-bundle-plugin/src/it/dep-reduced/verify.groovy   (with props)
Modified:
    felix/trunk/tools/maven-bundle-plugin/pom.xml
    felix/trunk/tools/maven-bundle-plugin/src/it/dep-reduced/pom.xml

Modified: felix/trunk/tools/maven-bundle-plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/tools/maven-bundle-plugin/pom.xml?rev=1710332&r1=1710331&r2=1710332&view=diff
==============================================================================
--- felix/trunk/tools/maven-bundle-plugin/pom.xml (original)
+++ felix/trunk/tools/maven-bundle-plugin/pom.xml Sat Oct 24 11:38:15 2015
@@ -86,7 +86,10 @@
         <configuration>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
           <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-          <postBuildHookScript>verify</postBuildHookScript> <!-- no extension required -->
+          <postBuildHookScript>verify</postBuildHookScript>
+          <goals>
+            <goal>install</goal>
+          </goals>
         </configuration>
         <executions>
           <execution>

Modified: felix/trunk/tools/maven-bundle-plugin/src/it/dep-reduced/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/tools/maven-bundle-plugin/src/it/dep-reduced/pom.xml?rev=1710332&r1=1710331&r2=1710332&view=diff
==============================================================================
--- felix/trunk/tools/maven-bundle-plugin/src/it/dep-reduced/pom.xml (original)
+++ felix/trunk/tools/maven-bundle-plugin/src/it/dep-reduced/pom.xml Sat Oct 24 11:38:15 2015
@@ -30,6 +30,11 @@ under the License.
       <artifactId>commons-io</artifactId>
       <version>2.4</version>
     </dependency>
+    <dependency>
+    <groupId>org.apache.commons</groupId>
+    <artifactId>commons-compress</artifactId>
+    <version>1.10</version>
+</dependency>
   </dependencies>
   <build>
     <plugins>
@@ -41,8 +46,7 @@ under the License.
         <configuration>
           <createDependencyReducedPom>true</createDependencyReducedPom>
           <instructions>
-            <Embed-Dependency>*;scope=compile</Embed-Dependency>
-            <Export-Package>org.apache.commons.io</Export-Package>
+            <Embed-Dependency>commons-io</Embed-Dependency>
           </instructions>
         </configuration>
       </plugin>

Added: felix/trunk/tools/maven-bundle-plugin/src/it/dep-reduced/verify.groovy
URL: http://svn.apache.org/viewvc/felix/trunk/tools/maven-bundle-plugin/src/it/dep-reduced/verify.groovy?rev=1710332&view=auto
==============================================================================
--- felix/trunk/tools/maven-bundle-plugin/src/it/dep-reduced/verify.groovy (added)
+++ felix/trunk/tools/maven-bundle-plugin/src/it/dep-reduced/verify.groovy Sat Oct 24 11:38:15 2015
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, 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.
+ */
+
+File pomFile = new File( basedir, "dependency-reduced-pom.xml" );
+assert pomFile.isFile()
+
+def ns = new groovy.xml.Namespace("http://maven.apache.org/POM/4.0.0")
+def pom = new XmlParser().parse( pomFile )
+
+assert pom[ns.modelVersion].size() == 1
+assert pom[ns.dependencies][ns.dependency].size() == 1

Propchange: felix/trunk/tools/maven-bundle-plugin/src/it/dep-reduced/verify.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: felix/trunk/tools/maven-bundle-plugin/src/it/dep-reduced/verify.groovy
------------------------------------------------------------------------------
    svn:mime-type = text/plain