agent assemblies setup
diff --git a/winegrower-cepages/winegrower-cepage-cxf-rs/pom.xml b/winegrower-cepages/winegrower-cepage-cxf-rs/pom.xml
index a383d51..2dcabe5 100644
--- a/winegrower-cepages/winegrower-cepage-cxf-rs/pom.xml
+++ b/winegrower-cepages/winegrower-cepage-cxf-rs/pom.xml
@@ -27,6 +27,7 @@
<artifactId>cxf-rs</artifactId>
<name>Apache Winegrower :: Cepages :: CXF JAX-RS</name>
+ <packaging>pom</packaging>
<dependencies>
<dependency>
diff --git a/winegrower-cepages/winegrower-cepage-http/pom.xml b/winegrower-cepages/winegrower-cepage-http/pom.xml
index da571a2..720ab49 100644
--- a/winegrower-cepages/winegrower-cepage-http/pom.xml
+++ b/winegrower-cepages/winegrower-cepage-http/pom.xml
@@ -32,6 +32,7 @@
<artifactId>winegrower-cepage-http</artifactId>
<name>Apache Winegrower :: Cepages :: HTTP</name>
+ <packaging>pom</packaging>
<properties>
<pax-web.version>7.2.3</pax-web.version>
diff --git a/winegrower-cepages/winegrower-cepage-jaxrs/pom.xml b/winegrower-cepages/winegrower-cepage-jaxrs/pom.xml
index e274ebb..ae802bb 100644
--- a/winegrower-cepages/winegrower-cepage-jaxrs/pom.xml
+++ b/winegrower-cepages/winegrower-cepage-jaxrs/pom.xml
@@ -32,6 +32,7 @@
<artifactId>jaxrs</artifactId>
<name>Apache Winegrower :: Cepages :: JAXRS</name>
+ <packaging>pom</packaging>
<dependencies>
<dependency>
diff --git a/winegrower-cepages/winegrower-cepage-shell/pom.xml b/winegrower-cepages/winegrower-cepage-shell/pom.xml
index 00f8729..3690a30 100644
--- a/winegrower-cepages/winegrower-cepage-shell/pom.xml
+++ b/winegrower-cepages/winegrower-cepage-shell/pom.xml
@@ -32,6 +32,7 @@
<artifactId>shell</artifactId>
<name>Apache Winegrower :: Cepages :: Shell</name>
+ <packaging>pom</packaging>
<dependencies>
<dependency>
diff --git a/winegrower-examples/http/pom.xml b/winegrower-examples/http/pom.xml
index f184669..67f488a 100644
--- a/winegrower-examples/http/pom.xml
+++ b/winegrower-examples/http/pom.xml
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.winegrower.examples</groupId>
<artifactId>http</artifactId>
<name>Apache Winegrower :: Examples :: HTTP</name>
@@ -44,6 +43,7 @@
<groupId>org.apache.winegrower.cepages</groupId>
<artifactId>winegrower-cepage-http</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
</dependencies>
diff --git a/winegrower-examples/jaxrs-whiteboard/pom.xml b/winegrower-examples/jaxrs-whiteboard/pom.xml
index c21a2bb..0ac7c10 100644
--- a/winegrower-examples/jaxrs-whiteboard/pom.xml
+++ b/winegrower-examples/jaxrs-whiteboard/pom.xml
@@ -47,6 +47,7 @@
<groupId>org.apache.winegrower.cepages</groupId>
<artifactId>jaxrs</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/winegrower-examples/jaxrs/pom.xml b/winegrower-examples/jaxrs/pom.xml
index 052adb8..203591a 100644
--- a/winegrower-examples/jaxrs/pom.xml
+++ b/winegrower-examples/jaxrs/pom.xml
@@ -44,6 +44,7 @@
<groupId>org.apache.winegrower.cepages</groupId>
<artifactId>cxf-rs</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
</dependencies>
diff --git a/winegrower-examples/shell/pom.xml b/winegrower-examples/shell/pom.xml
index 3e6f350..ee2ce1e 100644
--- a/winegrower-examples/shell/pom.xml
+++ b/winegrower-examples/shell/pom.xml
@@ -47,6 +47,7 @@
<groupId>org.apache.winegrower.cepages</groupId>
<artifactId>shell</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
</dependencies>
diff --git a/winegrower-extension/winegrower-agent/pom.xml b/winegrower-extension/winegrower-agent/pom.xml
index 48c9d19..d7ab20e 100644
--- a/winegrower-extension/winegrower-agent/pom.xml
+++ b/winegrower-extension/winegrower-agent/pom.xml
@@ -40,6 +40,14 @@
<artifactId>winegrower-core</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency> <!-- for reactor order only -->
+ <groupId>org.apache.winegrower.cepages</groupId>
+ <artifactId>jaxrs</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <type>pom</type>
+ </dependency>
</dependencies>
<build>
@@ -62,20 +70,20 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.1.0</version>
<executions>
<execution>
- <id>fatjar</id>
+ <id>core</id>
+ <phase>package</phase>
<goals>
- <goal>shade</goal>
+ <goal>single</goal>
</goals>
<configuration>
- <!-- TODO: slf4j is a bad choice here, to revise: drop from the framework or relocate it -->
- <createSourcesJar>true</createSourcesJar>
- <shadedArtifactAttached>true</shadedArtifactAttached>
- <shadedClassifierName>fatjar</shadedClassifierName>
- <createDependencyReducedPom>true</createDependencyReducedPom>
- <dependencyReducedPomLocation>${project.build.directory}/reduced-pom.xml</dependencyReducedPomLocation>
+ <descriptors>
+ <descriptor>src/main/assembly/core.xml</descriptor>
+ <descriptor>src/main/assembly/jaxrs.xml</descriptor>
+ </descriptors>
</configuration>
</execution>
</executions>
diff --git a/winegrower-extension/winegrower-agent/src/main/assembly/core.xml b/winegrower-extension/winegrower-agent/src/main/assembly/core.xml
new file mode 100644
index 0000000..f624016
--- /dev/null
+++ b/winegrower-extension/winegrower-agent/src/main/assembly/core.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://maven.apache.org/ASSEMBLY/2.0.0
+ http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+ <id>core</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <lineEnding>unix</lineEnding>
+ <directory>${project.basedir}/target/classes</directory>
+ <includes>
+ <include>README.txt</include>
+ <include>${project.basedir}/../../NOTICE</include>
+ <include>${project.basedir}/../../LICENSE</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>true</useProjectArtifact>
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+</assembly>
diff --git a/winegrower-extension/winegrower-agent/src/main/assembly/jaxrs.xml b/winegrower-extension/winegrower-agent/src/main/assembly/jaxrs.xml
new file mode 100644
index 0000000..c569790
--- /dev/null
+++ b/winegrower-extension/winegrower-agent/src/main/assembly/jaxrs.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://maven.apache.org/ASSEMBLY/2.0.0
+ http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+ <id>jaxrs</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <lineEnding>unix</lineEnding>
+ <directory>${project.basedir}/target/classes</directory>
+ <includes>
+ <include>${project.basedir}/../../NOTICE</include>
+ <include>${project.basedir}/../../LICENSE</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>true</useProjectArtifact>
+ <unpack>true</unpack>
+ <scope>provided</scope>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>true</useProjectArtifact>
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+</assembly>
