You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2020/09/29 18:59:39 UTC
[aries] branch trunk updated: ARIES-2008 Update to ASM 9.0 (and
other minor build cleanup
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
The following commit(s) were added to refs/heads/trunk by this push:
new d110436 ARIES-2008 Update to ASM 9.0 (and other minor build cleanup
d110436 is described below
commit d11043689b13d3c07b585b8018d91174e9c6f77a
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Tue Sep 29 14:59:13 2020 -0400
ARIES-2008 Update to ASM 9.0 (and other minor build cleanup
Signed-off-by: Raymond Augé <ro...@apache.org>
---
spi-fly/spi-fly-core/pom.xml | 4 ++--
spi-fly/spi-fly-dynamic-bundle/pom.xml | 10 +++++++---
spi-fly/spi-fly-dynamic-bundle/resolve.bndrun | 11 -----------
spi-fly/spi-fly-dynamic-framework-extension/pom.xml | 10 +++++++---
spi-fly/spi-fly-dynamic-framework-extension/resolve.bndrun | 5 -----
spi-fly/spi-fly-static-bundle/pom.xml | 8 ++++++--
spi-fly/spi-fly-static-bundle/resolve.bndrun | 5 -----
spi-fly/spi-fly-static-tool/pom.xml | 4 ++--
spi-fly/spi-fly-weaver/pom.xml | 6 +++---
9 files changed, 27 insertions(+), 36 deletions(-)
diff --git a/spi-fly/spi-fly-core/pom.xml b/spi-fly/spi-fly-core/pom.xml
index 156fbd3..becfe1b 100644
--- a/spi-fly/spi-fly-core/pom.xml
+++ b/spi-fly/spi-fly-core/pom.xml
@@ -47,8 +47,8 @@
</scm>
<properties>
- <maven.bundle.plugin.version>4.2.0</maven.bundle.plugin.version>
- <bnd.version>5.0.1</bnd.version>
+ <maven.bundle.plugin.version>5.1.1</maven.bundle.plugin.version>
+ <bnd.version>5.1.2</bnd.version>
</properties>
<dependencies>
diff --git a/spi-fly/spi-fly-dynamic-bundle/pom.xml b/spi-fly/spi-fly-dynamic-bundle/pom.xml
index c78cda8..18179e9 100644
--- a/spi-fly/spi-fly-dynamic-bundle/pom.xml
+++ b/spi-fly/spi-fly-dynamic-bundle/pom.xml
@@ -47,9 +47,9 @@
</scm>
<properties>
- <asm.version>8.0.1</asm.version>
- <maven.bundle.plugin.version>4.2.0</maven.bundle.plugin.version>
- <bnd.version>5.0.1</bnd.version>
+ <asm.version>9.0</asm.version>
+ <maven.bundle.plugin.version>5.1.1</maven.bundle.plugin.version>
+ <bnd.version>5.1.2</bnd.version>
</properties>
<dependencies>
@@ -211,6 +211,10 @@
<bndruns>
<bndrun>resolve.bndrun</bndrun>
</bndruns>
+ <bundles>
+ <bundle>target/${project.build.finalName}.jar</bundle>
+ </bundles>
+ <writeOnChanges>false</writeOnChanges>
</configuration>
<executions>
<execution>
diff --git a/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun b/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun
index 154e97f..938bb24 100644
--- a/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun
+++ b/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun
@@ -10,15 +10,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
--standalone: true
--resolve.effective: resolve, active
--runee: JavaSE-1.8
-runfw: org.apache.felix.framework
--runrequires: osgi.identity;filter:='(osgi.identity=${project.artifactId})'
--runbundles: \
- org.apache.aries.spifly.dynamic.bundle;version='[1.3.0,1.3.1)',\
- org.objectweb.asm;version='[8.0.1,8.0.2)',\
- org.objectweb.asm.commons;version='[8.0.1,8.0.2)',\
- org.objectweb.asm.tree;version='[8.0.1,8.0.2)',\
- org.objectweb.asm.tree.analysis;version='[8.0.1,8.0.2)',\
- org.objectweb.asm.util;version='[8.0.1,8.0.2)'
diff --git a/spi-fly/spi-fly-dynamic-framework-extension/pom.xml b/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
index 6bbca6a..3c9b7ab 100644
--- a/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
+++ b/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
@@ -47,9 +47,9 @@
</scm>
<properties>
- <asm.version>8.0.1</asm.version>
- <maven.bundle.plugin.version>4.2.0</maven.bundle.plugin.version>
- <bnd.version>5.0.1</bnd.version>
+ <asm.version>9.0</asm.version>
+ <maven.bundle.plugin.version>5.1.1</maven.bundle.plugin.version>
+ <bnd.version>5.1.2</bnd.version>
</properties>
<dependencies>
@@ -210,6 +210,10 @@
<bndruns>
<bndrun>resolve.bndrun</bndrun>
</bndruns>
+ <bundles>
+ <bundle>target/${project.build.finalName}.jar</bundle>
+ </bundles>
+ <writeOnChanges>false</writeOnChanges>
</configuration>
<executions>
<execution>
diff --git a/spi-fly/spi-fly-dynamic-framework-extension/resolve.bndrun b/spi-fly/spi-fly-dynamic-framework-extension/resolve.bndrun
index 4a7b3c0..938bb24 100644
--- a/spi-fly/spi-fly-dynamic-framework-extension/resolve.bndrun
+++ b/spi-fly/spi-fly-dynamic-framework-extension/resolve.bndrun
@@ -10,9 +10,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
--standalone: true
--resolve.effective: resolve, active
--runee: JavaSE-1.8
-runfw: org.apache.felix.framework
--runrequires: osgi.identity;filter:='(osgi.identity=${project.artifactId})'
--runbundles: org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.1)'
diff --git a/spi-fly/spi-fly-static-bundle/pom.xml b/spi-fly/spi-fly-static-bundle/pom.xml
index 0954bc0..4889d7d 100644
--- a/spi-fly/spi-fly-static-bundle/pom.xml
+++ b/spi-fly/spi-fly-static-bundle/pom.xml
@@ -47,8 +47,8 @@
</scm>
<properties>
- <maven.bundle.plugin.version>4.2.0</maven.bundle.plugin.version>
- <bnd.version>5.0.1</bnd.version>
+ <maven.bundle.plugin.version>5.1.1</maven.bundle.plugin.version>
+ <bnd.version>5.1.2</bnd.version>
</properties>
<dependencies>
@@ -170,6 +170,10 @@
<bndruns>
<bndrun>resolve.bndrun</bndrun>
</bndruns>
+ <bundles>
+ <bundle>target/${project.build.finalName}.jar</bundle>
+ </bundles>
+ <writeOnChanges>false</writeOnChanges>
</configuration>
<executions>
<execution>
diff --git a/spi-fly/spi-fly-static-bundle/resolve.bndrun b/spi-fly/spi-fly-static-bundle/resolve.bndrun
index 3917f05..938bb24 100644
--- a/spi-fly/spi-fly-static-bundle/resolve.bndrun
+++ b/spi-fly/spi-fly-static-bundle/resolve.bndrun
@@ -10,9 +10,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
--standalone: true
--resolve.effective: resolve, active
--runee: JavaSE-1.8
-runfw: org.apache.felix.framework
--runrequires: osgi.identity;filter:='(osgi.identity=${project.artifactId})'
--runbundles: org.apache.aries.spifly.static.bundle;version='[1.3.0,1.3.1)'
diff --git a/spi-fly/spi-fly-static-tool/pom.xml b/spi-fly/spi-fly-static-tool/pom.xml
index 6bcb4bf..5a1cfba 100644
--- a/spi-fly/spi-fly-static-tool/pom.xml
+++ b/spi-fly/spi-fly-static-tool/pom.xml
@@ -45,8 +45,8 @@
</scm>
<properties>
- <maven.bundle.plugin.version>4.2.0</maven.bundle.plugin.version>
- <bnd.version>5.0.1</bnd.version>
+ <maven.bundle.plugin.version>5.1.1</maven.bundle.plugin.version>
+ <bnd.version>5.1.2</bnd.version>
</properties>
<dependencies>
diff --git a/spi-fly/spi-fly-weaver/pom.xml b/spi-fly/spi-fly-weaver/pom.xml
index 52502ee..0025a67 100644
--- a/spi-fly/spi-fly-weaver/pom.xml
+++ b/spi-fly/spi-fly-weaver/pom.xml
@@ -42,9 +42,9 @@
</scm>
<properties>
- <asm.version>8.0.1</asm.version>
- <maven.bundle.plugin.version>4.2.0</maven.bundle.plugin.version>
- <bnd.version>5.0.1</bnd.version>
+ <asm.version>9.0</asm.version>
+ <maven.bundle.plugin.version>5.1.1</maven.bundle.plugin.version>
+ <bnd.version>5.1.2</bnd.version>
</properties>
<dependencies>