Commit 3a0a9929 authored by Andre Freyssinet's avatar Andre Freyssinet
Browse files

Inherits version of maven-assembly-plugin from parent.

No longer refer to OSGi release of javax.activation.
parent f041a802
......@@ -20,7 +20,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2.1</version>
<executions>
<!-- ============= joram-osgi ===================== -->
<execution>
......@@ -269,6 +268,7 @@
<artifactId>org.apache.felix.gogo.shell</artifactId>
</dependency>
<!-- /!\ Be careful, we may need 1.1-osgi version as declared in dependency L333-341 -->
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
......@@ -332,12 +332,13 @@
<!-- https://mvnrepository.com/artifact/javax.activation/activation This
artifact is a bundle version of activation 1.1. Be careful, it needs mulesoft
repository: https://repository.mulesoft.org/nexus/content/repositories/public -->
<dependency>
<!-- <dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1-osgi</version>
</dependency>
<!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
-->
<!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
......@@ -388,14 +389,12 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.jetty</artifactId>
<version>${felix.http.jetty.version}</version>
</dependency>
<!-- Replaces javax.servlet API (geronimo-servlet_3.0_spec). This bundle is explicitly needed by Felix HttpService component -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.servlet-api</artifactId>
<version>${felix.http.servlet-api.version}</version>
</dependency>
<!-- No longer needed replaced by felix.http.servlet-api
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment