projects / gpl / argeo-tp.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 006004f)
Use latest Argeo SLC.
authormbaudier <mbaudier@prodigy>
Thu, 4 Nov 2021 07:46:11 +0000 (08:46 +0100)
committermbaudier <mbaudier@prodigy>
Thu, 4 Nov 2021 07:46:11 +0000 (08:46 +0100)
demo/slc_localrepo.properties patch | blob | history
org.argeo.tp.factory.core/META-INF/MANIFEST.MF patch | blob | history
org.argeo.tp.factory.core/pom.xml patch | blob | history
org.argeo.tp.factory.extras/META-INF/MANIFEST.MF patch | blob | history
org.argeo.tp.factory.extras/pom.xml patch | blob | history

diff --git a/demo/slc_localrepo.properties b/demo/slc_localrepo.properties
index a897633020de9c73c099cfea0a379d1d78beefec..130b214dee85556227aebee209290b7556b7725c 100644 (file)
--- a/demo/slc_localrepo.properties
+++ b/demo/slc_localrepo.properties
@@ -1,6 +1,5 @@
 argeo.osgi.start.2.http=\
 org.eclipse.equinox.http.servlet,\
-org.eclipse.equinox.http.jetty,\
 org.eclipse.equinox.cm,\
 org.eclipse.rap.rwt.osgi
 
diff --git a/org.argeo.tp.factory.core/META-INF/MANIFEST.MF b/org.argeo.tp.factory.core/META-INF/MANIFEST.MF
index 88649218668dbd984e075dd7c0ef4a72d5d9771b..03c608f7347302f06428bfa07fef48e0c1cc1c6a 100644 (file)
--- a/org.argeo.tp.factory.core/META-INF/MANIFEST.MF
+++ b/org.argeo.tp.factory.core/META-INF/MANIFEST.MF
@@ -2,18 +2,20 @@ Manifest-Version: 1.0
 Automatic-Module-Name: org.argeo.tp.factory.core\r
 Bundle-Description: OSGi packaging of free / open source third party lib\r
  raries\r
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-License: https://www.gnu.org/licenses/lgpl-3.0.txt\r
 Bundle-ManifestVersion: 2\r
 Bundle-Name: Core 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-r20200320074906\r
+Bundle-Vendor: Argeo GmbH\r
+Bundle-Version: 2.1.28.SNAPSHOT-r20211104073959\r
 Import-Package: \r
  javax.jcr;version="[2.0,3)",\r
  org.argeo.slc.repo;version="[2.1,3)",\r
  org.argeo.slc.repo.osgi;version="[2.1,3)",\r
  org.argeo.slc.spring.auth;version="[2.1,3)",\r
  org.argeo.slc.spring.repo.osgi;version="[2.1,3)",\r
+ org.argeo.security.jackrabbit;resolution:=optional;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
@@ -34,22 +36,22 @@ Import-Package:
  [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
- e.commons.xml,META-INF/spring/misc.xml=META-INF/spring/misc.xml,META-IN\r
- F/spring/jackson.xml=META-INF/spring/jackson.xml,META-INF/spring/templa\r
- tes.xml=META-INF/spring/templates.xml,META-INF/spring/javax.xml=META-IN\r
- F/spring/javax.xml,META-INF/spring/sdk.xml=META-INF/spring/sdk.xml,META\r
- -INF/spring/apache.xml=META-INF/spring/apache.xml,META-INF/spring/eclip\r
- se.rcp.e4.xml=META-INF/spring/eclipse.rcp.e4.xml,META-INF/spring/eclips\r
- e.rap.e3.xml=META-INF/spring/eclipse.rap.e3.xml,META-INF/spring/apache.\r
- jackrabbit.xml=META-INF/spring/apache.jackrabbit.xml,META-INF/spring/di\r
- 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\r
+Include-Resource: META-INF/spring/eclipse.rap.e4.xml=META-INF/spring/ecl\r
+ ipse.rap.e4.xml,META-INF/spring/templates.xml=META-INF/spring/templates\r
+ .xml,META-INF/spring/distribution.xml=META-INF/spring/distribution.xml,\r
+ META-INF/spring/osgi.xml=META-INF/spring/osgi.xml,META-INF/spring/eclip\r
+ se.rap.e3.xml=META-INF/spring/eclipse.rap.e3.xml,META-INF/spring/javax.\r
+ xml=META-INF/spring/javax.xml,META-INF/spring/eclipse.rcp.e4.xml=META-I\r
+ NF/spring/eclipse.rcp.e4.xml,META-INF/spring/bouncycastle.xml=META-INF/\r
+ spring/bouncycastle.xml,META-INF/spring/eclipse.equinox.xml=META-INF/sp\r
+ ring/eclipse.equinox.xml,META-INF/spring/sdk.xml=META-INF/spring/sdk.xm\r
+ l,META-INF/spring/jackson.xml=META-INF/spring/jackson.xml,META-INF/spri\r
+ ng/eclipse.jetty.xml=META-INF/spring/eclipse.jetty.xml,META-INF/spring/\r
+ apache.jackrabbit.xml=META-INF/spring/apache.jackrabbit.xml,META-INF/sp\r
+ ring/apache.commons.xml=META-INF/spring/apache.commons.xml,META-INF/spr\r
+ ing/apache.xml=META-INF/spring/apache.xml,META-INF/spring/misc.xml=META\r
+ -INF/spring/misc.xml\r
 Private-Package: !*\r
-SLC-Build-Timestamp: 20200320074906\r
+SLC-Build-Timestamp: 20211104073959\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 00c507d5ddbf4e19d155f5805ab7c0e4cde8227c..1e6bb9738225c1d78e461c383f239997ac0f4efb 100644 (file)
--- a/org.argeo.tp.factory.core/pom.xml
+++ b/org.argeo.tp.factory.core/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>lib</artifactId>
-               <version>2.1.17-SNAPSHOT</version>
+               <version>2.1.18-SNAPSHOT</version>
        </parent>
        <groupId>org.argeo.tp.factory</groupId>
        <artifactId>org.argeo.tp.factory.core</artifactId>
diff --git a/org.argeo.tp.factory.extras/META-INF/MANIFEST.MF b/org.argeo.tp.factory.extras/META-INF/MANIFEST.MF
index 81c97394b1c630c8df18964c9cd5aaa9ecea75e3..15ff3de6848155044c6e95ea3e048989a68a7f39 100644 (file)
--- a/org.argeo.tp.factory.extras/META-INF/MANIFEST.MF
+++ b/org.argeo.tp.factory.extras/META-INF/MANIFEST.MF
@@ -2,18 +2,20 @@ Manifest-Version: 1.0
 Automatic-Module-Name: org.argeo.tp.factory.extras\r
 Bundle-Description: SLC execution modules for generic tasks, to be used \r
  as parent pom\r
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-License: https://www.gnu.org/licenses/lgpl-3.0.txt\r
 Bundle-ManifestVersion: 2\r
 Bundle-Name: Extras Third Party Factory\r
 Bundle-RequiredExecutionEnvironment: JavaSE-11,JavaSE-1.8\r
 Bundle-SymbolicName: org.argeo.tp.factory.extras\r
-Bundle-Version: 2.1.14.SNAPSHOT-r20200320074906\r
+Bundle-Vendor: Argeo GmbH\r
+Bundle-Version: 2.1.14.SNAPSHOT-r20211104073959\r
 Import-Package: \r
  javax.jcr;version="[2.0,3)",\r
  org.argeo.slc.repo;version="[2.1,3)",\r
  org.argeo.slc.repo.osgi;version="[2.1,3)",\r
  org.argeo.slc.spring.auth;version="[2.1,3)",\r
  org.argeo.slc.spring.repo.osgi;version="[2.1,3)",\r
+ org.argeo.security.jackrabbit;resolution:=optional;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
@@ -34,22 +36,22 @@ Import-Package:
  [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/scripting.xml=META-INF/spring/scriptin\r
- g.xml,META-INF/spring/swagger.xml=META-INF/spring/swagger.xml,META-INF/\r
- spring/templates.xml=META-INF/spring/templates.xml,META-INF/spring/graa\r
- lvm.xml=META-INF/spring/graalvm.xml,META-INF/spring/jersey.xml=META-INF\r
- /spring/jersey.xml,META-INF/spring/apache.tomcat.xml=META-INF/spring/ap\r
- ache.tomcat.xml,META-INF/spring/apache.felix.xml=META-INF/spring/apache\r
- .felix.xml,META-INF/spring/extras.xml=META-INF/spring/extras.xml,META-I\r
- NF/spring/ws.xml=META-INF/spring/ws.xml,META-INF/spring/distribution.xm\r
- l=META-INF/spring/distribution.xml,META-INF/spring/apache.ant.xml=META-\r
- INF/spring/apache.ant.xml,META-INF/spring/eclipse.gemini.xml=META-INF/s\r
- pring/eclipse.gemini.xml,META-INF/spring/osgi.xml=META-INF/spring/osgi.\r
- xml,META-INF/spring/spring.xml=META-INF/spring/spring.xml,META-INF/spri\r
- ng/spring.security.xml=META-INF/spring/spring.security.xml,META-INF/spr\r
- ing/payment.xml=META-INF/spring/payment.xml,META-INF/MANIFEST.MF=META-I\r
- NF/MANIFEST.MF\r
+Include-Resource: META-INF/MANIFEST.MF=META-INF/MANIFEST.MF,META-INF/spr\r
+ ing/payment.xml=META-INF/spring/payment.xml,META-INF/spring/templates.x\r
+ ml=META-INF/spring/templates.xml,META-INF/spring/spring.security.xml=ME\r
+ TA-INF/spring/spring.security.xml,META-INF/spring/distribution.xml=META\r
+ -INF/spring/distribution.xml,META-INF/spring/apache.tomcat.xml=META-INF\r
+ /spring/apache.tomcat.xml,META-INF/spring/ws.xml=META-INF/spring/ws.xml\r
+ ,META-INF/spring/osgi.xml=META-INF/spring/osgi.xml,META-INF/spring/ecli\r
+ pse.gemini.xml=META-INF/spring/eclipse.gemini.xml,META-INF/spring/graal\r
+ vm.xml=META-INF/spring/graalvm.xml,META-INF/spring/spring.xml=META-INF/\r
+ spring/spring.xml,META-INF/spring/jersey.xml=META-INF/spring/jersey.xml\r
+ ,META-INF/spring/swagger.xml=META-INF/spring/swagger.xml,META-INF/sprin\r
+ g/apache.felix.xml=META-INF/spring/apache.felix.xml,META-INF/spring/apa\r
+ che.ant.xml=META-INF/spring/apache.ant.xml,META-INF/spring/scripting.xm\r
+ l=META-INF/spring/scripting.xml,META-INF/spring/extras.xml=META-INF/spr\r
+ ing/extras.xml\r
 Private-Package: !*\r
-SLC-Build-Timestamp: 20200320074906\r
+SLC-Build-Timestamp: 20211104073959\r
 SLC-Category: org.argeo.tp.factory\r
 SLC-ExecutionModule: default\r
diff --git a/org.argeo.tp.factory.extras/pom.xml b/org.argeo.tp.factory.extras/pom.xml
index 5bef932357d707f3f2e9e291a93a774ce7e51d90..d20bba12ca381b00ac9c17b4b27e25e2c0881471 100644 (file)
--- a/org.argeo.tp.factory.extras/pom.xml
+++ b/org.argeo.tp.factory.extras/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>lib</artifactId>
-               <version>2.1.17-SNAPSHOT</version>
+               <version>2.1.18-SNAPSHOT</version>
        </parent>
        <groupId>org.argeo.tp.factory</groupId>
        <artifactId>org.argeo.tp.factory.extras</artifactId>
Argeo Third Parties - An OSGi enterprise distribution