fixing mojo compilation + dropping optional config from jaxrs example
diff --git a/winegrower-examples/jaxrs/src/main/resources/OSGI-INF/blueprint/server.xml b/winegrower-examples/jaxrs/src/main/resources/OSGI-INF/blueprint/server.xml
index bc0b828..1896eaf 100644
--- a/winegrower-examples/jaxrs/src/main/resources/OSGI-INF/blueprint/server.xml
+++ b/winegrower-examples/jaxrs/src/main/resources/OSGI-INF/blueprint/server.xml
@@ -18,20 +18,11 @@
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jaxrs="http://cxf.apache.org/blueprint/jaxrs"
- xmlns:cxf="http://cxf.apache.org/blueprint/core"
xsi:schemaLocation="
http://www.osgi.org/xmlns/blueprint/v1.0.0
http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
http://cxf.apache.org/blueprint/jaxrs
- http://cxf.apache.org/schemas/blueprint/jaxrs.xsd
- http://cxf.apache.org/blueprint/core
- http://cxf.apache.org/schemas/blueprint/core.xsd">
- <cxf:bus>
- <cxf:features>
- <cxf:logging/>
- </cxf:features>
- </cxf:bus>
-
+ http://cxf.apache.org/schemas/blueprint/jaxrs.xsd">
<jaxrs:server id="harvestServer" address="/api">
<jaxrs:serviceBeans>
<bean class="org.apache.winegrower.example.jaxrs.Harvest"/>
diff --git a/winegrower-extension/winegrower-build/winegrower-maven-plugin/src/main/java/org/apache/winegrower/extension/build/maven/PourMojo.java b/winegrower-extension/winegrower-build/winegrower-maven-plugin/src/main/java/org/apache/winegrower/extension/build/maven/PourMojo.java
index 10e69d8..83ca6ea 100644
--- a/winegrower-extension/winegrower-build/winegrower-maven-plugin/src/main/java/org/apache/winegrower/extension/build/maven/PourMojo.java
+++ b/winegrower-extension/winegrower-build/winegrower-maven-plugin/src/main/java/org/apache/winegrower/extension/build/maven/PourMojo.java
@@ -13,7 +13,6 @@
*/
package org.apache.winegrower.extension.build.maven;
-import static java.util.Collections.singletonList;
import static java.util.Optional.ofNullable;
import static java.util.stream.Collectors.toList;
import static org.apache.maven.plugins.annotations.ResolutionScope.RUNTIME_PLUS_SYSTEM;
@@ -61,8 +60,8 @@
@Parameter(property = "winegrower.dependencyScopes", defaultValue = "provided,compile,system,runtime")
private Collection<String> dependencyScopes;
- @Parameter(property = "winegrower.prioritizedBundles", defaultValue = "org.apache.aries.blueprint.core")
- private Collection<String> prioritizedBundles;
+ @Parameter(property = "winegrower.prioritizedBundles")
+ private List<String> prioritizedBundles;
@Parameter(property = "winegrower.systemVariables")
private Map<String, String> systemVariables;
