Improve Maven build

diff --git a/org.argeo.tp.factory.core/META-INF/MANIFEST.MF b/org.argeo.tp.factory.core/META-INF/MANIFEST.MF
index 2ab0c3e50e50f6c532cc09524ef33d50a24af12e..7bfcca4124189c9739d9877126a253a60e975a16 100644 (file)
--- 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\r
 Bundle-RequiredExecutionEnvironment: JavaSE-11,JavaSE-1.8\r
 Bundle-SymbolicName: org.argeo.tp.factory.core\r
-Bundle-Version: 2.1.28.SNAPSHOT-r20200215110733\r
-Import-Package: javax.jcr;version="[2.0,3)",org.argeo.cms.spring;version\r
- ="[2.1,3)",org.argeo.slc.repo;version="[2.1,3)",org.argeo.slc.repo.osgi\r
- ;version="[2.1,3)",org.springframework.cglib.proxy;resolution:=optional\r
- ;version="[3.2,4)",org.springframework.cglib.core;resolution:=optional;\r
- version="[3.2,4)",org.springframework.cglib.reflect;resolution:=optiona\r
- l;version="[3.2,4)",org.aopalliance.aop;resolution:=optional;version="[\r
- 1.0,2)",org.argeo.slc.runtime;version="[2.1,3)",org.argeo.slc.core.exec\r
- ution;resolution:=optional;version="[2.1,3)",org.argeo.slc.core.executi\r
- on.tasks;resolution:=optional;version="[2.1,3)",org.argeo.slc.execution\r
- ;version="[2.1,3)",org.argeo.slc.osgi;resolution:=optional;version="[2.\r
- 1,3)",org.argeo.slc.test;version="[2.1,3)",org.springframework.aop;reso\r
- lution:=optional;version="[3.2,4)",org.springframework.aop.framework;re\r
- solution:=optional;version="[3.2,4)",org.springframework.aop.scope;reso\r
- lution:=optional;version="[3.2,4)",org.springframework.beans.factory.co\r
- nfig;resolution:=optional;version="[3.2,4)",org.springframework.core.io\r
- ;resolution:=optional;version="[3.2,4)",javax.security.auth.callback;re\r
- solution:=optional\r
+Bundle-Version: 2.1.28.SNAPSHOT-r20200216092056\r
+Import-Package: \r
+ javax.jcr;version="[2.0,3)",\r
+ org.argeo.cms.spring;version="[2.1,3)",\r
+ org.argeo.slc.repo;version="[2.1,3)",\r
+ org.argeo.slc.repo.osgi;version="[2.1,3)",\r
+ org.springframework.cglib.proxy;resolution:=optional;version="[3.2,4)",\r
+ org.springframework.cglib.core;resolution:=optional;version="[3.2,4)",\r
+ org.springframework.cglib.reflect;resolution:=optional;version="[3.2,4)\r
+ ",\r
+ org.aopalliance.aop;resolution:=optional;version="[1.0,2)",\r
+ org.argeo.slc.runtime;version="[2.1,3)",\r
+ org.argeo.slc.core.execution;resolution:=optional;version="[2.1,3)",\r
+ org.argeo.slc.core.execution.tasks;resolution:=optional;version="[2.1,3\r
+ )",\r
+ org.argeo.slc.execution;version="[2.1,3)",\r
+ org.argeo.slc.osgi;resolution:=optional;version="[2.1,3)",\r
+ org.argeo.slc.test;version="[2.1,3)",\r
+ org.springframework.aop;resolution:=optional;version="[3.2,4)",\r
+ org.springframework.aop.framework;resolution:=optional;version="[3.2,4)\r
+ ",\r
+ org.springframework.aop.scope;resolution:=optional;version="[3.2,4)",\r
+ org.springframework.beans.factory.config;resolution:=optional;version="\r
+ [3.2,4)",\r
+ org.springframework.core.io;resolution:=optional;version="[3.2,4)",\r
+ javax.security.auth.callback;resolution:=optional\r
 Include-Resource: META-INF/spring/eclipse.jetty.xml=META-INF/spring/ecli\r
  pse.jetty.xml,META-INF/spring/eclipse.equinox.xml=META-INF/spring/eclip\r
  se.equinox.xml,META-INF/spring/apache.commons.xml=META-INF/spring/apach\r
@@ -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\r
  l=META-INF/spring/osgi.xml,META-INF/spring/eclipse.rap.e4.xml=META-INF/\r
  spring/eclipse.rap.e4.xml,META-INF/spring/bouncycastle.xml=META-INF/spr\r
- ing/bouncycastle.xml,META-INF/MANIFEST.MF=META-INF/MANIFEST.MF\r
+ ing/bouncycastle.xml\r
 Private-Package: !*\r
-SLC-BuildTimestamp: 20200215110733\r
+SLC-Build-Timestamp: 20200216092056\r
 SLC-Category: org.argeo.tp.factory\r
 SLC-ExecutionModule: default\r

diff --git a/org.argeo.tp.factory.core/pom.xml b/org.argeo.tp.factory.core/pom.xml
index 24e003c8dec676bb33018b4baa09f7915d78f4c4..f4c2395ce417467d817fd43b3eb17b40b7fefba3 100644 (file)
--- 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 9c324a435748a2500360a8dd745d45c97707560b..420dba19764996abda908b5c99b8dabc55dc5f87 100644 (file)
--- 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>