summaryrefslogtreecommitdiffstats
path: root/parent
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2020-08-17 12:03:51 +0200
committergjoranv <gv@verizonmedia.com>2020-08-17 12:11:49 +0200
commitcd55ffb2dede346e80d92c856386e321e202e6af (patch)
tree620fe9c034f51ba0f919991cf0cbd3acd5ddf8ca /parent
parent7d9930400ef9a124d7493d3f774a770afb0f27cb (diff)
Upgrade maven-bundle-plugin to 4.1.0, and remove 'noee' instruction
- Add TODO on how to upgrade maven-bundle-plugin above 4.1.0
Diffstat (limited to 'parent')
-rw-r--r--parent/pom.xml9
1 files changed, 2 insertions, 7 deletions
diff --git a/parent/pom.xml b/parent/pom.xml
index 0cfe87c6488..da30e160d1b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -82,12 +82,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven-bundle-plugin.version}</version>
- <configuration>
- <!-- TODO: remove when bundle-plugin understands java 10, https://issues.apache.org/jira/browse/FELIX-5879 -->
- <instructions>
- <_noee>true</_noee>
- </instructions>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -770,7 +764,8 @@
<commons.math3.version>3.6.1</commons.math3.version>
<junit.version>5.6.2</junit.version>
<maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
- <maven-bundle-plugin.version>3.5.0</maven-bundle-plugin.version>
+ <!-- TODO: in order to upgrade above 4.1.0, we probably need to convert fat-model-deps to a jar artifact. -->
+ <maven-bundle-plugin.version>4.1.0</maven-bundle-plugin.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
<maven-deploy-plugin.version>2.8.1</maven-deploy-plugin.version>