projects
/
gpl
/
argeo-tp.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9c372bd
)
Adapt to changes in Argeo Platform.
author
Mathieu Baudier <mbaudier@argeo.org>
Fri, 13 Mar 2020 08:56:45 +0000
(09:56 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Fri, 13 Mar 2020 08:56:45 +0000
(09:56 +0100)
org.argeo.tp.factory.core/META-INF/MANIFEST.MF
patch
|
blob
|
history
org.argeo.tp.factory.core/META-INF/spring/bouncycastle.xml
patch
|
blob
|
history
org.argeo.tp.factory.core/META-INF/spring/eclipse.equinox.xml
patch
|
blob
|
history
org.argeo.tp.factory.core/META-INF/spring/templates.xml
patch
|
blob
|
history
diff --git
a/org.argeo.tp.factory.core/META-INF/MANIFEST.MF
b/org.argeo.tp.factory.core/META-INF/MANIFEST.MF
index 7bfcca4124189c9739d9877126a253a60e975a16..cf5d5834e113f6ed62a7333a3428767f6189da80 100644
(file)
--- a/
org.argeo.tp.factory.core/META-INF/MANIFEST.MF
+++ b/
org.argeo.tp.factory.core/META-INF/MANIFEST.MF
@@
-7,12
+7,13
@@
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-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-r20200
216092056
\r
+Bundle-Version: 2.1.28.SNAPSHOT-r20200
313085348
\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
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.argeo.slc.spring.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
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
@@
-49,6
+50,6
@@
Include-Resource: META-INF/spring/eclipse.jetty.xml=META-INF/spring/ecli
spring/eclipse.rap.e4.xml,META-INF/spring/bouncycastle.xml=META-INF/spr
\r
ing/bouncycastle.xml
\r
Private-Package: !*
\r
spring/eclipse.rap.e4.xml,META-INF/spring/bouncycastle.xml=META-INF/spr
\r
ing/bouncycastle.xml
\r
Private-Package: !*
\r
-SLC-Build-Timestamp: 20200
216092056
\r
+SLC-Build-Timestamp: 20200
313085348
\r
SLC-Category: org.argeo.tp.factory
\r
SLC-ExecutionModule: default
\r
SLC-Category: org.argeo.tp.factory
\r
SLC-ExecutionModule: default
\r
diff --git
a/org.argeo.tp.factory.core/META-INF/spring/bouncycastle.xml
b/org.argeo.tp.factory.core/META-INF/spring/bouncycastle.xml
index bce75701c3b8ffd691889fcec1e6dc4a89ee87b4..213d83f2ae9fd2a7749c337694ba5fb4e77830fe 100644
(file)
--- a/
org.argeo.tp.factory.core/META-INF/spring/bouncycastle.xml
+++ b/
org.argeo.tp.factory.core/META-INF/spring/bouncycastle.xml
@@
-59,7
+59,7
@@
</flow:flow>
<!-- FACTORY -->
</flow:flow>
<!-- FACTORY -->
- <bean id="template.bouncycastle" class="org.argeo.slc.repo.osgi.UriWrapper"
+ <bean id="template.bouncycastle" class="org.argeo.slc.
spring.
repo.osgi.UriWrapper"
abstract="true">
<property name="version" value="@{version}" />
<property name="groupId" value="org.argeo.tp.bouncycastle" />
abstract="true">
<property name="version" value="@{version}" />
<property name="groupId" value="org.argeo.tp.bouncycastle" />
diff --git
a/org.argeo.tp.factory.core/META-INF/spring/eclipse.equinox.xml
b/org.argeo.tp.factory.core/META-INF/spring/eclipse.equinox.xml
index 3c86a80a25b8afd55b239344bca0c747d57138d6..c8d230698358f795e13b66a2e976ce21883e8ed0 100644
(file)
--- a/
org.argeo.tp.factory.core/META-INF/spring/eclipse.equinox.xml
+++ b/
org.argeo.tp.factory.core/META-INF/spring/eclipse.equinox.xml
@@
-80,7
+80,7
@@
<!-- spec="equinoxVersion.spec"> -->
<!-- <flow:arg name="equinoxRelease" value="4.4.1" /> -->
<!-- <flow:arg name="equinoxTimestamp" value="201409250400" /> -->
<!-- spec="equinoxVersion.spec"> -->
<!-- <flow:arg name="equinoxRelease" value="4.4.1" /> -->
<!-- <flow:arg name="equinoxTimestamp" value="201409250400" /> -->
- <!-- <bean id="org.eclipse.jdt.core.compiler.batch" class="org.argeo.slc.repo.osgi.UriWrapper"> -->
+ <!-- <bean id="org.eclipse.jdt.core.compiler.batch" class="org.argeo.slc.
spring.
repo.osgi.UriWrapper"> -->
<!-- <property name="version" value="3.10.0.v20140902-0626" /> -->
<!-- <property name="uri" -->
<!-- value="http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-@{equinoxRelease}-@{equinoxTimestamp}/ecj-@{equinoxRelease}.jar"
<!-- <property name="version" value="3.10.0.v20140902-0626" /> -->
<!-- <property name="uri" -->
<!-- value="http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-@{equinoxRelease}-@{equinoxTimestamp}/ecj-@{equinoxRelease}.jar"
diff --git
a/org.argeo.tp.factory.core/META-INF/spring/templates.xml
b/org.argeo.tp.factory.core/META-INF/spring/templates.xml
index 2a2283f3ae6f569a4dfa6d76889e8f6120804f6f..9cf8de71dd01b8babcc8b8395b53105d2c076615 100644
(file)
--- a/
org.argeo.tp.factory.core/META-INF/spring/templates.xml
+++ b/
org.argeo.tp.factory.core/META-INF/spring/templates.xml
@@
-22,7
+22,7
@@
</bean>
<bean id="template.bndWrapper"
</bean>
<bean id="template.bndWrapper"
- class="org.argeo.slc.repo.osgi.BndWrapper" abstract="true">
+ class="org.argeo.slc.
spring.
repo.osgi.BndWrapper" abstract="true">
<property name="groupId" value="org.argeo.tp.misc" />
<property name="bndProperties">
<props>
<property name="groupId" value="org.argeo.tp.misc" />
<property name="bndProperties">
<props>
@@
-31,7
+31,7
@@
</property>
</bean>
<bean id="template.mavenWrapper"
</property>
</bean>
<bean id="template.mavenWrapper"
- class="org.argeo.slc.repo.osgi.MavenWrapper" abstract="true">
+ class="org.argeo.slc.
spring.
repo.osgi.MavenWrapper" abstract="true">
<property name="groupId" value="org.argeo.tp.misc" />
<property name="bndProperties">
<props>
<property name="groupId" value="org.argeo.tp.misc" />
<property name="bndProperties">
<props>