Added: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/control.xml URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/control.xml?rev=1354055&view=auto ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/control.xml (added) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/control.xml Tue Jun 26 15:13:19 2012 @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<!-- + ~ 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. + --> + +<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0"; name="check-dependencies-features"> + <feature description="dependency-module-c" version="1.0-SNAPSHOT" name="dependency-module-c"> + <bundle>mvn:test/dependency-module-a/1.0-SNAPSHOT</bundle> + <bundle>mvn:test/dependency-module-b/1.0-SNAPSHOT</bundle> + </feature> + <feature description="dependency-module-d" version="1.0-SNAPSHOT" name="dependency-module-d"> + <bundle>mvn:test/dependency-module-c/1.0-SNAPSHOT</bundle> + <bundle>mvn:test/dependency-module-a/1.0-SNAPSHOT</bundle> + <bundle>mvn:test/dependency-module-b/1.0-SNAPSHOT</bundle> + </feature> +</features>
Copied: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependencies-features/pom.xml (from r1354026, karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml) URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependencies-features/pom.xml?p2=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependencies-features/pom.xml&p1=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml&r1=1354026&r2=1354055&rev=1354055&view=diff ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml (original) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependencies-features/pom.xml Tue Jun 26 15:13:19 2012 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0"?> <!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more contributor license agreements. See the NOTICE file @@ -17,34 +17,65 @@ ~ specific language governing permissions and limitations ~ under the License. --> + <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>test</groupId> + <artifactId>test-check-dependencies</artifactId> + <version>1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> <groupId>test</groupId> - <artifactId>test-basic-generation</artifactId> - <version>@pom.version@</version> - <packaging>bundle</packaging> + <artifactId>check-dependencies-features</artifactId> + <version>1.0-SNAPSHOT</version> + + <packaging>feature</packaging> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <dependencies> + <dependency> + <groupId>test</groupId> + <artifactId>dependency-module-a</artifactId> + <version>1.0-SNAPSHOT</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>test</groupId> + <artifactId>dependency-module-b</artifactId> + <version>1.0-SNAPSHOT</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>test</groupId> + <artifactId>dependency-module-c</artifactId> + <version>1.0-SNAPSHOT</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>test</groupId> + <artifactId>dependency-module-d</artifactId> + <version>1.0-SNAPSHOT</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> </dependencies> <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>2.3.7</version> - <extensions>true</extensions> - </plugin> - <plugin> <groupId>org.apache.karaf.tooling</groupId> <artifactId>karaf-maven-plugin</artifactId> <version>@pom.version@</version> + <extensions>true</extensions> <executions> <execution> <id>generate-features-file</id> @@ -53,7 +84,8 @@ <goal>features-generate-descriptor</goal> </goals> <configuration> - <includeTransitiveDependency>false</includeTransitiveDependency> + <aggregateFeatures>true</aggregateFeatures> + <checkDependencyChange>true</checkDependencyChange> </configuration> </execution> </executions> Copied: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-a/pom.xml (from r1354026, karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml) URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-a/pom.xml?p2=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-a/pom.xml&p1=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml&r1=1354026&r2=1354055&rev=1354055&view=diff ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml (original) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-a/pom.xml Tue Jun 26 15:13:19 2012 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0"?> <!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more contributor license agreements. See the NOTICE file @@ -17,13 +17,20 @@ ~ specific language governing permissions and limitations ~ under the License. --> + <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>test</groupId> + <artifactId>test-check-dependencies</artifactId> + <version>1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> <groupId>test</groupId> - <artifactId>test-basic-generation</artifactId> - <version>@pom.version@</version> + <artifactId>dependency-module-a</artifactId> + <version>1.0-SNAPSHOT</version> <packaging>bundle</packaging> <properties> @@ -41,23 +48,6 @@ <version>2.3.7</version> <extensions>true</extensions> </plugin> - <plugin> - <groupId>org.apache.karaf.tooling</groupId> - <artifactId>karaf-maven-plugin</artifactId> - <version>@pom.version@</version> - <executions> - <execution> - <id>generate-features-file</id> - <phase>package</phase> - <goals> - <goal>features-generate-descriptor</goal> - </goals> - <configuration> - <includeTransitiveDependency>false</includeTransitiveDependency> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project> Copied: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-a/src/main/java/test/A.java (from r1354026, karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh) URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-a/src/main/java/test/A.java?p2=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-a/src/main/java/test/A.java&p1=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh&r1=1354026&r2=1354055&rev=1354055&view=diff ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh (original) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-a/src/main/java/test/A.java Tue Jun 26 15:13:19 2012 @@ -17,18 +17,9 @@ * under the License. */ -import org.custommonkey.xmlunit.*; -import java.io.*; -import java.lang.*; +package test.a; -String control = "<features xmlns=\"http://karaf.apache.org/xmlns/features/v1.0.0\"; name=\"test-basic-generation\"/>"; - -File generated = new File( basedir, "target/feature/feature.xml" ); -StringReader sr = new StringReader(control); -try { - XMLAssert.assertXMLEqual(sr, new FileReader(generated)); -} catch (AssertionError ignored) { - return false; +public class A +{ + public static String ASTRING = "A-string"; } - -return true; Copied: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-b/pom.xml (from r1354026, karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml) URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-b/pom.xml?p2=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-b/pom.xml&p1=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml&r1=1354026&r2=1354055&rev=1354055&view=diff ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml (original) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-b/pom.xml Tue Jun 26 15:13:19 2012 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0"?> <!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more contributor license agreements. See the NOTICE file @@ -17,13 +17,21 @@ ~ specific language governing permissions and limitations ~ under the License. --> + <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>test</groupId> + <artifactId>test-check-dependencies</artifactId> + <version>1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> <groupId>test</groupId> - <artifactId>test-basic-generation</artifactId> - <version>@pom.version@</version> + <artifactId>dependency-module-b</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>bundle</packaging> <properties> @@ -41,23 +49,6 @@ <version>2.3.7</version> <extensions>true</extensions> </plugin> - <plugin> - <groupId>org.apache.karaf.tooling</groupId> - <artifactId>karaf-maven-plugin</artifactId> - <version>@pom.version@</version> - <executions> - <execution> - <id>generate-features-file</id> - <phase>package</phase> - <goals> - <goal>features-generate-descriptor</goal> - </goals> - <configuration> - <includeTransitiveDependency>false</includeTransitiveDependency> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project> Copied: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-b/src/main/java/test/B.java (from r1354026, karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh) URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-b/src/main/java/test/B.java?p2=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-b/src/main/java/test/B.java&p1=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh&r1=1354026&r2=1354055&rev=1354055&view=diff ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh (original) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-b/src/main/java/test/B.java Tue Jun 26 15:13:19 2012 @@ -17,18 +17,9 @@ * under the License. */ -import org.custommonkey.xmlunit.*; -import java.io.*; -import java.lang.*; +package test.b; -String control = "<features xmlns=\"http://karaf.apache.org/xmlns/features/v1.0.0\"; name=\"test-basic-generation\"/>"; - -File generated = new File( basedir, "target/feature/feature.xml" ); -StringReader sr = new StringReader(control); -try { - XMLAssert.assertXMLEqual(sr, new FileReader(generated)); -} catch (AssertionError ignored) { - return false; +public class B +{ + public static String BSTRING = "B-string"; } - -return true; Copied: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-c/pom.xml (from r1354026, karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml) URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-c/pom.xml?p2=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-c/pom.xml&p1=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml&r1=1354026&r2=1354055&rev=1354055&view=diff ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml (original) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-c/pom.xml Tue Jun 26 15:13:19 2012 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0"?> <!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more contributor license agreements. See the NOTICE file @@ -17,13 +17,21 @@ ~ specific language governing permissions and limitations ~ under the License. --> + <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>test</groupId> + <artifactId>test-check-dependencies</artifactId> + <version>1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> <groupId>test</groupId> - <artifactId>test-basic-generation</artifactId> - <version>@pom.version@</version> + <artifactId>dependency-module-c</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>bundle</packaging> <properties> @@ -31,6 +39,16 @@ </properties> <dependencies> + <dependency> + <groupId>test</groupId> + <artifactId>dependency-module-a</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>test</groupId> + <artifactId>dependency-module-b</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> </dependencies> <build> @@ -41,23 +59,6 @@ <version>2.3.7</version> <extensions>true</extensions> </plugin> - <plugin> - <groupId>org.apache.karaf.tooling</groupId> - <artifactId>karaf-maven-plugin</artifactId> - <version>@pom.version@</version> - <executions> - <execution> - <id>generate-features-file</id> - <phase>package</phase> - <goals> - <goal>features-generate-descriptor</goal> - </goals> - <configuration> - <includeTransitiveDependency>false</includeTransitiveDependency> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project> Copied: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-c/src/main/java/test/C.java (from r1354026, karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh) URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-c/src/main/java/test/C.java?p2=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-c/src/main/java/test/C.java&p1=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh&r1=1354026&r2=1354055&rev=1354055&view=diff ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh (original) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-c/src/main/java/test/C.java Tue Jun 26 15:13:19 2012 @@ -17,18 +17,14 @@ * under the License. */ -import org.custommonkey.xmlunit.*; -import java.io.*; -import java.lang.*; +package test.c; -String control = "<features xmlns=\"http://karaf.apache.org/xmlns/features/v1.0.0\"; name=\"test-basic-generation\"/>"; +import test.a.*; +import test.b.*; -File generated = new File( basedir, "target/feature/feature.xml" ); -StringReader sr = new StringReader(control); -try { - XMLAssert.assertXMLEqual(sr, new FileReader(generated)); -} catch (AssertionError ignored) { - return false; +public class C +{ + public static String createStringWithDependencies() { + return A.ASTRING + " " + B.BSTRING + " " + "C-string"; + } } - -return true; Copied: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-d/pom.xml (from r1354026, karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml) URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-d/pom.xml?p2=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-d/pom.xml&p1=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml&r1=1354026&r2=1354055&rev=1354055&view=diff ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml (original) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-d/pom.xml Tue Jun 26 15:13:19 2012 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0"?> <!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more contributor license agreements. See the NOTICE file @@ -17,13 +17,21 @@ ~ specific language governing permissions and limitations ~ under the License. --> + <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>test</groupId> + <artifactId>test-check-dependencies</artifactId> + <version>1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> <groupId>test</groupId> - <artifactId>test-basic-generation</artifactId> - <version>@pom.version@</version> + <artifactId>dependency-module-d</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>bundle</packaging> <properties> @@ -31,6 +39,11 @@ </properties> <dependencies> + <dependency> + <groupId>test</groupId> + <artifactId>dependency-module-c</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> </dependencies> <build> @@ -41,23 +54,6 @@ <version>2.3.7</version> <extensions>true</extensions> </plugin> - <plugin> - <groupId>org.apache.karaf.tooling</groupId> - <artifactId>karaf-maven-plugin</artifactId> - <version>@pom.version@</version> - <executions> - <execution> - <id>generate-features-file</id> - <phase>package</phase> - <goals> - <goal>features-generate-descriptor</goal> - </goals> - <configuration> - <includeTransitiveDependency>false</includeTransitiveDependency> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project> Copied: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-d/src/main/java/test/D.java (from r1354026, karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh) URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-d/src/main/java/test/D.java?p2=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-d/src/main/java/test/D.java&p1=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh&r1=1354026&r2=1354055&rev=1354055&view=diff ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh (original) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/dependency-module-d/src/main/java/test/D.java Tue Jun 26 15:13:19 2012 @@ -17,18 +17,13 @@ * under the License. */ -import org.custommonkey.xmlunit.*; -import java.io.*; -import java.lang.*; +package test.d; -String control = "<features xmlns=\"http://karaf.apache.org/xmlns/features/v1.0.0\"; name=\"test-basic-generation\"/>"; +import test.c.*; -File generated = new File( basedir, "target/feature/feature.xml" ); -StringReader sr = new StringReader(control); -try { - XMLAssert.assertXMLEqual(sr, new FileReader(generated)); -} catch (AssertionError ignored) { - return false; +public class D +{ + public String createStringWithDependencies() { + return C.createStringWithDependencies() + " " + "D-string"; + } } - -return true; Copied: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/pom.xml (from r1354026, karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml) URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/pom.xml?p2=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/pom.xml&p1=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml&r1=1354026&r2=1354055&rev=1354055&view=diff ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml (original) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/pom.xml Tue Jun 26 15:13:19 2012 @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> + <!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more contributor license agreements. See the NOTICE file @@ -17,28 +18,31 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> +<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/maven-v4_0_0.xsd";> + <!-- invalid model version to make build fail --> <modelVersion>4.0.0</modelVersion> - <groupId>test</groupId> - <artifactId>test-basic-generation</artifactId> - <version>@pom.version@</version> - <packaging>bundle</packaging> + <artifactId>test-check-dependencies</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>pom</packaging> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> - <dependencies> - </dependencies> + <modules> + <module>dependency-module-a</module> + <module>dependency-module-b</module> + <module>dependency-module-c</module> + <module>dependency-module-d</module> + <module>dependencies-features</module> + </modules> <build> <plugins> <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>2.3.7</version> <extensions>true</extensions> </plugin> <plugin> @@ -53,11 +57,10 @@ <goal>features-generate-descriptor</goal> </goals> <configuration> - <includeTransitiveDependency>false</includeTransitiveDependency> </configuration> </execution> </executions> </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file Copied: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/verify.bsh (from r1354026, karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh) URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/verify.bsh?p2=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/verify.bsh&p1=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh&r1=1354026&r2=1354055&rev=1354055&view=diff ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh (original) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-check-dependencies/verify.bsh Tue Jun 26 15:13:19 2012 @@ -21,14 +21,15 @@ import org.custommonkey.xmlunit.*; import java.io.*; import java.lang.*; -String control = "<features xmlns=\"http://karaf.apache.org/xmlns/features/v1.0.0\"; name=\"test-basic-generation\"/>"; +Reader r = new FileReader(new File(basedir, "control.xml")); -File generated = new File( basedir, "target/feature/feature.xml" ); -StringReader sr = new StringReader(control); -try { - XMLAssert.assertXMLEqual(sr, new FileReader(generated)); -} catch (AssertionError ignored) { - return false; +// load the features file pushed to the repository +File generated = new File( localRepositoryPath, "test/check-dependencies-features/1.0-SNAPSHOT/check-dependencies-features-1.0-SNAPSHOT-features.xml" ); +if (generated.exists()) { + try { + XMLAssert.assertXMLEqual(r, new FileReader(generated)); + return true; + } catch (Throwable ignored) { } } -return true; +return false; Added: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-input-file/control.xml URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-input-file/control.xml?rev=1354055&view=auto ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-input-file/control.xml (added) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-input-file/control.xml Tue Jun 26 15:13:19 2012 @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<!-- + ~ 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. + --> + +<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0"; name="test-input-file"> + <feature description="Test Description" version="1.0-SNAPSHOT" name="test-input-file"> + <details>Test Description</details> + <bundle>mvn:test/test-input-file/1.0-SNAPSHOT</bundle> + </feature> +</features> Copied: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-input-file/pom.xml (from r1354026, karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml) URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-input-file/pom.xml?p2=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-input-file/pom.xml&p1=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml&r1=1354026&r2=1354055&rev=1354055&view=diff ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml (original) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-input-file/pom.xml Tue Jun 26 15:13:19 2012 @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> + <!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more contributor license agreements. See the NOTICE file @@ -17,14 +18,16 @@ ~ specific language governing permissions and limitations ~ under the License. --> + <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> <groupId>test</groupId> - <artifactId>test-basic-generation</artifactId> - <version>@pom.version@</version> + <artifactId>test-input-file</artifactId> + <version>1.0-SNAPSHOT</version> <packaging>bundle</packaging> + <description>Test Description</description> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -53,7 +56,6 @@ <goal>features-generate-descriptor</goal> </goals> <configuration> - <includeTransitiveDependency>false</includeTransitiveDependency> </configuration> </execution> </executions> Added: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-input-file/src/main/feature/feature.xml URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-input-file/src/main/feature/feature.xml?rev=1354055&view=auto ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-input-file/src/main/feature/feature.xml (added) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-input-file/src/main/feature/feature.xml Tue Jun 26 15:13:19 2012 @@ -0,0 +1,24 @@ +<!-- + ~ 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. + --> + +<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0"; name="${project.artifactId}"> + <feature name="${project.artifactId}" version="${project.version}" description="${project.description}"> + <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle> + </feature> +</features> Copied: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-input-file/src/main/java/test/App.java (from r1354026, karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh) URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-input-file/src/main/java/test/App.java?p2=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-input-file/src/main/java/test/App.java&p1=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh&r1=1354026&r2=1354055&rev=1354055&view=diff ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh (original) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-input-file/src/main/java/test/App.java Tue Jun 26 15:13:19 2012 @@ -17,18 +17,16 @@ * under the License. */ -import org.custommonkey.xmlunit.*; -import java.io.*; -import java.lang.*; +package test; -String control = "<features xmlns=\"http://karaf.apache.org/xmlns/features/v1.0.0\"; name=\"test-basic-generation\"/>"; - -File generated = new File( basedir, "target/feature/feature.xml" ); -StringReader sr = new StringReader(control); -try { - XMLAssert.assertXMLEqual(sr, new FileReader(generated)); -} catch (AssertionError ignored) { - return false; +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } } - -return true; Copied: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-input-file/verify.bsh (from r1354026, karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh) URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-input-file/verify.bsh?p2=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-input-file/verify.bsh&p1=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh&r1=1354026&r2=1354055&rev=1354055&view=diff ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh (original) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-input-file/verify.bsh Tue Jun 26 15:13:19 2012 @@ -21,14 +21,15 @@ import org.custommonkey.xmlunit.*; import java.io.*; import java.lang.*; -String control = "<features xmlns=\"http://karaf.apache.org/xmlns/features/v1.0.0\"; name=\"test-basic-generation\"/>"; +Reader r = new FileReader(new File(basedir, "control.xml")); -File generated = new File( basedir, "target/feature/feature.xml" ); -StringReader sr = new StringReader(control); -try { - XMLAssert.assertXMLEqual(sr, new FileReader(generated)); -} catch (AssertionError ignored) { - return false; +// load the features file pushed to the repository +File generated = new File( localRepositoryPath, "test/test-input-file/1.0-SNAPSHOT/test-input-file-1.0-SNAPSHOT-features.xml" ); +if (generated.exists()) { + try { + XMLAssert.assertXMLEqual(r, new FileReader(generated)); + return true; + } catch (Throwable ignored) { } } -return true; +return false; Added: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-type-classifier/control.xml URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-type-classifier/control.xml?rev=1354055&view=auto ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-type-classifier/control.xml (added) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-type-classifier/control.xml Tue Jun 26 15:13:19 2012 @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<!-- + ~ 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. + --> + +<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0"; name="test-type-classifier"/> \ No newline at end of file Copied: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-type-classifier/pom.xml (from r1354026, karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml) URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-type-classifier/pom.xml?p2=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-type-classifier/pom.xml&p1=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml&r1=1354026&r2=1354055&rev=1354055&view=diff ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml (original) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-type-classifier/pom.xml Tue Jun 26 15:13:19 2012 @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> + <!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more contributor license agreements. See the NOTICE file @@ -22,17 +23,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>test</groupId> - <artifactId>test-basic-generation</artifactId> - <version>@pom.version@</version> + <artifactId>test-type-classifier</artifactId> + <version>1.0-SNAPSHOT</version> <packaging>bundle</packaging> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> - <dependencies> - </dependencies> - <build> <plugins> <plugin> @@ -53,7 +51,8 @@ <goal>features-generate-descriptor</goal> </goals> <configuration> - <includeTransitiveDependency>false</includeTransitiveDependency> + <attachmentArtifactType>zazzle</attachmentArtifactType> + <attachmentArtifactClassifier>fershizzle</attachmentArtifactClassifier> </configuration> </execution> </executions> Copied: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-type-classifier/src/main/java/test/App.java (from r1354026, karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh) URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-type-classifier/src/main/java/test/App.java?p2=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-type-classifier/src/main/java/test/App.java&p1=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh&r1=1354026&r2=1354055&rev=1354055&view=diff ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh (original) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-type-classifier/src/main/java/test/App.java Tue Jun 26 15:13:19 2012 @@ -17,18 +17,16 @@ * under the License. */ -import org.custommonkey.xmlunit.*; -import java.io.*; -import java.lang.*; +package test; -String control = "<features xmlns=\"http://karaf.apache.org/xmlns/features/v1.0.0\"; name=\"test-basic-generation\"/>"; - -File generated = new File( basedir, "target/feature/feature.xml" ); -StringReader sr = new StringReader(control); -try { - XMLAssert.assertXMLEqual(sr, new FileReader(generated)); -} catch (AssertionError ignored) { - return false; +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } } - -return true; Copied: karaf/trunk/tooling/karaf-maven-plugin/src/it/test-type-classifier/verify.bsh (from r1354026, karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh) URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/it/test-type-classifier/verify.bsh?p2=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-type-classifier/verify.bsh&p1=karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh&r1=1354026&r2=1354055&rev=1354055&view=diff ============================================================================== --- karaf/trunk/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh (original) +++ karaf/trunk/tooling/karaf-maven-plugin/src/it/test-type-classifier/verify.bsh Tue Jun 26 15:13:19 2012 @@ -21,14 +21,15 @@ import org.custommonkey.xmlunit.*; import java.io.*; import java.lang.*; -String control = "<features xmlns=\"http://karaf.apache.org/xmlns/features/v1.0.0\"; name=\"test-basic-generation\"/>"; +Reader r = new FileReader(new File(basedir, "control.xml")); -File generated = new File( basedir, "target/feature/feature.xml" ); -StringReader sr = new StringReader(control); -try { - XMLAssert.assertXMLEqual(sr, new FileReader(generated)); -} catch (AssertionError ignored) { - return false; +// load the features file pushed to the repository +File generated = new File( localRepositoryPath, "test/test-type-classifier/1.0-SNAPSHOT/test-type-classifier-1.0-SNAPSHOT-fershizzle.zazzle" ); +if (generated.exists()) { + try { + XMLAssert.assertXMLEqual(r, new FileReader(generated)); + return true; + } catch (Throwable ignored) { } } -return true; +return false;
