remove 'verify' phase 117/head
authorAlex Heneveld <alex.heneveld@cloudsoftcorp.com>
Tue, 15 Jan 2019 18:16:28 +0000 (18:16 +0000)
committerAlex Heneveld <alex.heneveld@cloudsoftcorp.com>
Tue, 15 Jan 2019 18:34:29 +0000 (18:34 +0000)
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
ui-modules/features/pom.xml

index 461b5d5..34f4580 100644 (file)
             <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>
index 5fe554a..d1f2ef6 100644 (file)
             <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>