This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit eb59ecc5dbf0e6802d7131c2168d22cac108f0ec Author: Alex Heneveld <[email protected]> AuthorDate: Tue Jan 15 18:16:28 2019 +0000 remove 'verify' phase verify is failing with warnings about "warn" not being found (using new karaf-plugin version); don't think we changed anything to cause that and the resulting assembly is fine. not sure verify did much anyway! this commit also bring versions and config for that plugin in synch with what is done elsewhere. --- modularity-server/features/pom.xml | 39 ++------------------------------------ ui-modules/features/pom.xml | 39 ++------------------------------------ 2 files changed, 4 insertions(+), 74 deletions(-) diff --git a/modularity-server/features/pom.xml b/modularity-server/features/pom.xml index 461b5d5..34f4580 100644 --- a/modularity-server/features/pom.xml +++ b/modularity-server/features/pom.xml @@ -63,46 +63,11 @@ <plugin> <groupId>org.apache.karaf.tooling</groupId> <artifactId>karaf-maven-plugin</artifactId> + <version>${karaf.plugin.version}</version> + <extensions>true</extensions> <configuration> <startLevel>100</startLevel> - <aggregateFeatures>true</aggregateFeatures> - <resolver>(obr)</resolver> </configuration> - <executions> - <execution> - <id>verify-brooklyn-ui-modularity-feature</id> - <phase>test</phase> - <goals> - <goal>verify</goal> - </goals> - <configuration> - <distribution>org.apache.karaf.features:framework</distribution> - <framework><!--REQUIRED FEATURES--> - <feature>framework</feature> - <feature>aries-blueprint</feature> - <feature>config</feature> - <feature>feature</feature> - <feature>service</feature> - <feature>ssh</feature> - <feature>system</feature> - <feature>wrap</feature> - <feature>brooklyn-osgi-launcher</feature> - <feature>brooklyn-rest-resources</feature> - </framework> - <features><!--SELECTED FEATURES TO VERIFY--> - <feature>brooklyn-ui-modularity</feature> - <feature>brooklyn-ui-modularity-prereqs</feature> - <feature>brooklyn-ui-proxy</feature> - </features> - <descriptors> - <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor> - <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor> - <descriptor>mvn:org.apache.brooklyn/brooklyn-features/${brooklyn.version}/xml/features</descriptor> - <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> diff --git a/ui-modules/features/pom.xml b/ui-modules/features/pom.xml index 5fe554a..d1f2ef6 100644 --- a/ui-modules/features/pom.xml +++ b/ui-modules/features/pom.xml @@ -71,46 +71,11 @@ <plugin> <groupId>org.apache.karaf.tooling</groupId> <artifactId>karaf-maven-plugin</artifactId> + <version>${karaf.plugin.version}</version> + <extensions>true</extensions> <configuration> <startLevel>100</startLevel> - <aggregateFeatures>true</aggregateFeatures> - <resolver>(obr)</resolver> </configuration> - <executions> - <execution> - <id>verify-brooklyn-ui-modules-feature</id> - <phase>test</phase> - <goals> - <goal>verify</goal> - </goals> - <configuration> - <distribution>org.apache.karaf.features:framework</distribution> - <framework><!--REQUIRED FEATURES--> - <feature>framework</feature> - <feature>aries-blueprint</feature> - <feature>config</feature> - <feature>feature</feature> - <feature>service</feature> - <feature>ssh</feature> - <feature>system</feature> - <feature>wrap</feature> - <feature>brooklyn-osgi-launcher</feature> - <feature>brooklyn-rest-resources</feature> - <feature>brooklyn-ui-modularity</feature> - </framework> - <features><!--FEATURES TO VERIFY--> - <feature>brooklyn-ui-modules</feature> - </features> - <descriptors> - <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor> - <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor> - <descriptor>mvn:org.apache.brooklyn/brooklyn-features/${brooklyn.version}/xml/features</descriptor> - <descriptor>mvn:org.apache.brooklyn.ui.modularity/brooklyn-ui-modularity-features/${brooklyn.version}/xml/features</descriptor> - <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> </plugin> </plugins> </build>
