projects
/
gpl
/
argeo-tp.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3a09bd9
)
Improve Apache Commons in TP utils
author
Mathieu Baudier <mbaudier@argeo.org>
Thu, 23 Mar 2023 08:20:47 +0000
(09:20 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Thu, 23 Mar 2023 08:20:47 +0000
(09:20 +0100)
16 files changed:
repackage/org.argeo.tp.earth/geotools/merge.bnd
patch
|
blob
|
history
repackage/org.argeo.tp.jcr/org.apache.commons.dbcp.bnd
[deleted file]
patch
|
blob
|
history
repackage/org.argeo.tp.jcr/org.apache.commons.pool.bnd
[deleted file]
patch
|
blob
|
history
repackage/org.argeo.tp.utils/asm/common.bnd
[new file with mode: 0644]
patch
|
blob
repackage/org.argeo.tp.utils/asm/org.objectweb.asm.bnd
[new file with mode: 0644]
patch
|
blob
repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.analysis.bnd
[new file with mode: 0644]
patch
|
blob
repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.bnd
[new file with mode: 0644]
patch
|
blob
repackage/org.argeo.tp.utils/asm/org.objectweb.asm.util.bnd
[new file with mode: 0644]
patch
|
blob
repackage/org.argeo.tp.utils/net.sf.cglib.bnd
[new file with mode: 0644]
patch
|
blob
repackage/org.argeo.tp.utils/org.apache.commons.dbcp.bnd
[new file with mode: 0644]
patch
|
blob
repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd
[new file with mode: 0644]
patch
|
blob
repackage/org.argeo.tp.utils/org.apache.commons.digester.bnd
[new file with mode: 0644]
patch
|
blob
repackage/org.argeo.tp.utils/org.apache.commons.pool.bnd
[new file with mode: 0644]
patch
|
blob
repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd
[new file with mode: 0644]
patch
|
blob
sdk/output-argeo-tp-apps.target
patch
|
blob
|
history
sdk/output-argeo-tp-platform.target
patch
|
blob
|
history
diff --git
a/repackage/org.argeo.tp.earth/geotools/merge.bnd
b/repackage/org.argeo.tp.earth/geotools/merge.bnd
index 72c3760f00f96c7f6f630caf738f06f86ce80ddb..ba066ea9caef664a15e4f17f6a39c12836d6862c 100644
(file)
--- a/
repackage/org.argeo.tp.earth/geotools/merge.bnd
+++ b/
repackage/org.argeo.tp.earth/geotools/merge.bnd
@@
-38,8
+38,6
@@
org.jdom2.*;resolution:="optional",\
org.junit.*;resolution:="optional",\
org.parboiled.*;resolution:="optional",\
org.picocontainer.*;resolution:="optional",\
org.junit.*;resolution:="optional",\
org.parboiled.*;resolution:="optional",\
org.picocontainer.*;resolution:="optional",\
-org.apache.commons.digester.*;resolution:="optional",\
-org.apache.commons.pool.*;resolution:="optional",\
*
Argeo-Origin-M2-Merge: \
*
Argeo-Origin-M2-Merge: \
diff --git
a/repackage/org.argeo.tp.jcr/org.apache.commons.dbcp.bnd
b/repackage/org.argeo.tp.jcr/org.apache.commons.dbcp.bnd
deleted file mode 100644
(file)
index
b2af1db
..0000000
--- a/
repackage/org.argeo.tp.jcr/org.apache.commons.dbcp.bnd
+++ /dev/null
@@
-1,4
+0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: commons-dbcp:commons-dbcp:1.4
-Import-Package: javax.transaction.*; resolution:="optional",\
-*
diff --git
a/repackage/org.argeo.tp.jcr/org.apache.commons.pool.bnd
b/repackage/org.argeo.tp.jcr/org.apache.commons.pool.bnd
deleted file mode 100644
(file)
index
c5c3cc5
..0000000
--- a/
repackage/org.argeo.tp.jcr/org.apache.commons.pool.bnd
+++ /dev/null
@@
-1,2
+0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: commons-pool:commons-pool:1.6
diff --git a/repackage/org.argeo.tp.utils/asm/common.bnd
b/repackage/org.argeo.tp.utils/asm/common.bnd
new file mode 100644
(file)
index 0000000..
cc32d2b
--- /dev/null
+++ b/
repackage/org.argeo.tp.utils/asm/common.bnd
@@ -0,0
+1,2
@@
+SPDX-License-Identifier: BSD-3-Clause
+Argeo-Origin-M2: :9.4
diff --git a/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.bnd
b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.bnd
new file mode 100644
(file)
index 0000000..
c5eac67
--- /dev/null
+++ b/
repackage/org.argeo.tp.utils/asm/org.objectweb.asm.bnd
@@ -0,0
+1
@@
+Argeo-Origin-M2: org.ow2.asm:asm
diff --git a/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.analysis.bnd
b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.analysis.bnd
new file mode 100644
(file)
index 0000000..
c76963a
--- /dev/null
+++ b/
repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.analysis.bnd
@@ -0,0
+1
@@
+Argeo-Origin-M2: org.ow2.asm:asm-analysis
diff --git a/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.bnd
b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.bnd
new file mode 100644
(file)
index 0000000..
9ab0bbf
--- /dev/null
+++ b/
repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.bnd
@@ -0,0
+1
@@
+Argeo-Origin-M2: org.ow2.asm:asm-tree
diff --git a/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.util.bnd
b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.util.bnd
new file mode 100644
(file)
index 0000000..
84e6979
--- /dev/null
+++ b/
repackage/org.argeo.tp.utils/asm/org.objectweb.asm.util.bnd
@@ -0,0
+1
@@
+Argeo-Origin-M2: org.ow2.asm:asm-util
diff --git a/repackage/org.argeo.tp.utils/net.sf.cglib.bnd
b/repackage/org.argeo.tp.utils/net.sf.cglib.bnd
new file mode 100644
(file)
index 0000000..
78a087f
--- /dev/null
+++ b/
repackage/org.argeo.tp.utils/net.sf.cglib.bnd
@@ -0,0
+1,6
@@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: cglib:cglib:3.3.0
+
+Import-Package: \
+org.apache.tools.ant.*;resolution:=optional,\
+*
diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.dbcp.bnd
b/repackage/org.argeo.tp.utils/org.apache.commons.dbcp.bnd
new file mode 100644
(file)
index 0000000..
2fea39f
--- /dev/null
+++ b/
repackage/org.argeo.tp.utils/org.apache.commons.dbcp.bnd
@@ -0,0
+1,5
@@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: commons-dbcp:commons-dbcp:1.4
+
+Import-Package: javax.transaction.*; resolution:="optional",\
+*
diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd
b/repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd
new file mode 100644
(file)
index 0000000..
1f6e450
--- /dev/null
+++ b/
repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd
@@ -0,0
+1,5
@@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.commons:commons-dbcp2:2.9.0
+
+Import-Package: javax.transaction.*; resolution:="optional",\
+*
diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.digester.bnd
b/repackage/org.argeo.tp.utils/org.apache.commons.digester.bnd
new file mode 100644
(file)
index 0000000..
3936876
--- /dev/null
+++ b/
repackage/org.argeo.tp.utils/org.apache.commons.digester.bnd
@@ -0,0
+1,2
@@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: commons-digester:commons-digester:2.1
diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.pool.bnd
b/repackage/org.argeo.tp.utils/org.apache.commons.pool.bnd
new file mode 100644
(file)
index 0000000..
c5c3cc5
--- /dev/null
+++ b/
repackage/org.argeo.tp.utils/org.apache.commons.pool.bnd
@@ -0,0
+1,2
@@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: commons-pool:commons-pool:1.6
diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd
b/repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd
new file mode 100644
(file)
index 0000000..
6826cea
--- /dev/null
+++ b/
repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd
@@ -0,0
+1,2
@@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.commons:commons-pool2:2.11.1
diff --git
a/sdk/output-argeo-tp-apps.target
b/sdk/output-argeo-tp-apps.target
index 644d04486a3871f9834d8d95633a3993cc35bdf8..412a3a55773efe6c1a0c4057a1dda033dc409667 100644
(file)
--- a/
sdk/output-argeo-tp-apps.target
+++ b/
sdk/output-argeo-tp-apps.target
@@
-3,7
+3,9
@@
<target name="argeo-tp-backend">
<locations>
<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.utils" type="Directory"/>
<target name="argeo-tp-backend">
<locations>
<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.utils" type="Directory"/>
- <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.gis" type="Directory"/>
+ <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.publish" type="Directory"/>
+ <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.math" type="Directory"/>
+ <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.earth" type="Directory"/>
<location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
<location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-platform.target"/>
<location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
<location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-platform.target"/>
diff --git
a/sdk/output-argeo-tp-platform.target
b/sdk/output-argeo-tp-platform.target
index d63ff29ddf139ba359a054b4364393f6a7bc3a3d..39755d1248a5041140b48d8abf8de5c259ca7a9a 100644
(file)
--- a/
sdk/output-argeo-tp-platform.target
+++ b/
sdk/output-argeo-tp-platform.target
@@
-7,7
+7,7
@@
<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp" type="Directory"/>
<location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.osgi" type="Directory"/>
<location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp" type="Directory"/>
<location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.osgi" type="Directory"/>
<location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
- <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.
jetty
" type="Directory"/>
+ <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.
httpd
" type="Directory"/>
<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.build" type="Directory"/>
<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
</locations>
<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.build" type="Directory"/>
<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
</locations>