From 9c372bdbea67aac3424f8830d4eef333a57205e8 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 16 Feb 2020 10:21:54 +0100
Subject: [PATCH] Improve Maven build

---
 .../META-INF/MANIFEST.MF                      | 48 +++++++++++--------
 org.argeo.tp.factory.core/pom.xml             |  2 +-
 pom.xml                                       |  1 +
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/org.argeo.tp.factory.core/META-INF/MANIFEST.MF b/org.argeo.tp.factory.core/META-INF/MANIFEST.MF
index 2ab0c3e..7bfcca4 100644
--- a/org.argeo.tp.factory.core/META-INF/MANIFEST.MF
+++ b/org.argeo.tp.factory.core/META-INF/MANIFEST.MF
@@ -7,24 +7,32 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Argeo Third Party Factory
 Bundle-RequiredExecutionEnvironment: JavaSE-11,JavaSE-1.8
 Bundle-SymbolicName: org.argeo.tp.factory.core
-Bundle-Version: 2.1.28.SNAPSHOT-r20200215110733
-Import-Package: javax.jcr;version="[2.0,3)",org.argeo.cms.spring;version
- ="[2.1,3)",org.argeo.slc.repo;version="[2.1,3)",org.argeo.slc.repo.osgi
- ;version="[2.1,3)",org.springframework.cglib.proxy;resolution:=optional
- ;version="[3.2,4)",org.springframework.cglib.core;resolution:=optional;
- version="[3.2,4)",org.springframework.cglib.reflect;resolution:=optiona
- l;version="[3.2,4)",org.aopalliance.aop;resolution:=optional;version="[
- 1.0,2)",org.argeo.slc.runtime;version="[2.1,3)",org.argeo.slc.core.exec
- ution;resolution:=optional;version="[2.1,3)",org.argeo.slc.core.executi
- on.tasks;resolution:=optional;version="[2.1,3)",org.argeo.slc.execution
- ;version="[2.1,3)",org.argeo.slc.osgi;resolution:=optional;version="[2.
- 1,3)",org.argeo.slc.test;version="[2.1,3)",org.springframework.aop;reso
- lution:=optional;version="[3.2,4)",org.springframework.aop.framework;re
- solution:=optional;version="[3.2,4)",org.springframework.aop.scope;reso
- lution:=optional;version="[3.2,4)",org.springframework.beans.factory.co
- nfig;resolution:=optional;version="[3.2,4)",org.springframework.core.io
- ;resolution:=optional;version="[3.2,4)",javax.security.auth.callback;re
- solution:=optional
+Bundle-Version: 2.1.28.SNAPSHOT-r20200216092056
+Import-Package: 
+ javax.jcr;version="[2.0,3)",
+ org.argeo.cms.spring;version="[2.1,3)",
+ org.argeo.slc.repo;version="[2.1,3)",
+ org.argeo.slc.repo.osgi;version="[2.1,3)",
+ org.springframework.cglib.proxy;resolution:=optional;version="[3.2,4)",
+ org.springframework.cglib.core;resolution:=optional;version="[3.2,4)",
+ org.springframework.cglib.reflect;resolution:=optional;version="[3.2,4)
+ ",
+ org.aopalliance.aop;resolution:=optional;version="[1.0,2)",
+ org.argeo.slc.runtime;version="[2.1,3)",
+ org.argeo.slc.core.execution;resolution:=optional;version="[2.1,3)",
+ org.argeo.slc.core.execution.tasks;resolution:=optional;version="[2.1,3
+ )",
+ org.argeo.slc.execution;version="[2.1,3)",
+ org.argeo.slc.osgi;resolution:=optional;version="[2.1,3)",
+ org.argeo.slc.test;version="[2.1,3)",
+ org.springframework.aop;resolution:=optional;version="[3.2,4)",
+ org.springframework.aop.framework;resolution:=optional;version="[3.2,4)
+ ",
+ org.springframework.aop.scope;resolution:=optional;version="[3.2,4)",
+ org.springframework.beans.factory.config;resolution:=optional;version="
+ [3.2,4)",
+ org.springframework.core.io;resolution:=optional;version="[3.2,4)",
+ javax.security.auth.callback;resolution:=optional
 Include-Resource: META-INF/spring/eclipse.jetty.xml=META-INF/spring/ecli
  pse.jetty.xml,META-INF/spring/eclipse.equinox.xml=META-INF/spring/eclip
  se.equinox.xml,META-INF/spring/apache.commons.xml=META-INF/spring/apach
@@ -39,8 +47,8 @@ Include-Resource: META-INF/spring/eclipse.jetty.xml=META-INF/spring/ecli
  stribution.xml=META-INF/spring/distribution.xml,META-INF/spring/osgi.xm
  l=META-INF/spring/osgi.xml,META-INF/spring/eclipse.rap.e4.xml=META-INF/
  spring/eclipse.rap.e4.xml,META-INF/spring/bouncycastle.xml=META-INF/spr
- ing/bouncycastle.xml,META-INF/MANIFEST.MF=META-INF/MANIFEST.MF
+ ing/bouncycastle.xml
 Private-Package: !*
-SLC-BuildTimestamp: 20200215110733
+SLC-Build-Timestamp: 20200216092056
 SLC-Category: org.argeo.tp.factory
 SLC-ExecutionModule: default
diff --git a/org.argeo.tp.factory.core/pom.xml b/org.argeo.tp.factory.core/pom.xml
index 24e003c..f4c2395 100644
--- a/org.argeo.tp.factory.core/pom.xml
+++ b/org.argeo.tp.factory.core/pom.xml
@@ -22,7 +22,7 @@
 			<resource>
 				<directory>.</directory>
 				<includes>
-					<include>META-INF/**</include>
+					<include>META-INF/spring/**</include>
 				</includes>
 			</resource>
 			<resource>
diff --git a/pom.xml b/pom.xml
index 9c324a4..420dba1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,6 +7,7 @@
 	<version>2.1.28-SNAPSHOT</version>
 	<name>Argeo Java OSGi Distribution</name>
 	<description>OSGi packaging of free / open source third party libraries</description>
+	<packaging>pom</packaging>
 	<modules>
 		<module>org.argeo.tp.factory.core</module>
 	</modules>
-- 
2.30.2