diff options
| author | gjoranv <gv@verizonmedia.com> | 2020-08-17 22:18:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-17 22:18:06 +0200 |
| commit | b2b460e9002aecb2d4588e5ab63ac42fc4e34271 (patch) | |
| tree | d6ee30ac7dee25a0e0ef410787bff8e1271a7311 /parent | |
| parent | 129e53226bb499e20f715c2f2c176544cb113974 (diff) | |
| parent | cd55ffb2dede346e80d92c856386e321e202e6af (diff) | |
Merge pull request #14061 from vespa-engine/gjoranv/upgrade-maven-bundle-plugin
Upgrade maven-bundle-plugin to 4.1.0, and remove 'noee' instruction
Diffstat (limited to 'parent')
| -rw-r--r-- | parent/pom.xml | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/parent/pom.xml b/parent/pom.xml index 052e5b8de7a..a9998af3962 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> |