Commit 560f76f9 authored by Guillaume Surrel's avatar Guillaume Surrel

Fix maven 3 warnings to increase build stability.

parent 5907cec6
......@@ -20,10 +20,11 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven.bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<DynamicImport-Package>*</DynamicImport-Package>
<Bundle-Activator>fr.dyade.aaa.common.osgi.Activator</Bundle-Activator>
<Export-Package>com.scalagent.jmx,
......
......@@ -20,10 +20,11 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven.bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Activator>fr.dyade.aaa.agent.osgi.Activator</Bundle-Activator>
<Export-Package>fr.dyade.aaa.agent.osgi</Export-Package>
<Import-Package>fr.dyade.aaa.agent,
......
......@@ -20,10 +20,11 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven.bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>fr.dyade.aaa.agent,fr.dyade.aaa.agent.conf,fr.dyade.aaa.util</Export-Package>
<Import-Package>com.scalagent.jmx,
fr.dyade.aaa.common,
......
......@@ -20,10 +20,11 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven.bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
fr.dyade.aaa.jndi2.client,
fr.dyade.aaa.jndi2.haclient,
......
......@@ -20,10 +20,11 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven.bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
fr.dyade.aaa.jndi2.distributed,
fr.dyade.aaa.jndi2.ha,
......
......@@ -19,10 +19,11 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven.bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>fr.dyade.aaa.jndi2.msg</Export-Package>
</instructions>
</configuration>
......
......@@ -19,10 +19,11 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven.bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
</instructions>
</configuration>
</plugin>
......
......@@ -32,11 +32,12 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven.bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Implementation-Version>${project.version}</Implementation-Version>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.objectweb.joram.client.osgi.Activator</Bundle-Activator>
<Import-Package>com.scalagent.jmx,
fr.dyade.aaa.agent;resolution:=optional,
......
......@@ -20,10 +20,11 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven.bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
com.scalagent.scheduler,
org.objectweb.joram.mom.dest,
......
......@@ -19,10 +19,11 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven.bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>org.objectweb.joram.mom.dest.amqp</Export-Package>
<Embed-Dependency>amqp-client</Embed-Dependency>
</instructions>
......
......@@ -19,10 +19,11 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven.bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>com.scalagent.joram.mom.dest.collector</Export-Package>
</instructions>
</configuration>
......
......@@ -19,10 +19,11 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven.bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>com.scalagent.joram.mom.dest.ftp</Export-Package>
<Embed-Dependency>jftp;scope=compile|runtime</Embed-Dependency>
<Import-Package>
......
......@@ -20,10 +20,11 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven.bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
fr.dyade.aaa.agent,
fr.dyade.aaa.common,
......
......@@ -20,10 +20,11 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven.bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>com.scalagent.joram.mom.dest.mail</Export-Package>
<Embed-Dependency>mail,activation</Embed-Dependency>
</instructions>
......
......@@ -19,10 +19,11 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven.bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>com.scalagent.joram.mom.dest.scheduler</Export-Package>
</instructions>
</configuration>
......
......@@ -20,10 +20,11 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven.bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>org.objectweb.joram.shared.security.jaas</Export-Package>
</instructions>
</configuration>
......
......@@ -31,11 +31,12 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven.bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Implementation-Version>${project.version}</Implementation-Version>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
org.objectweb.joram.shared,
org.objectweb.joram.shared.admin,
......
......@@ -20,12 +20,12 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven.bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.objectweb.joram.tools.jasp.osgi.Activator</Bundle-Activator>
<Export-Package>org.objectweb.joram.tools.jasp</Export-Package>
<Embed-Dependency>stompconnect|commons-logging;scope=compile|runtime;inline=true</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
<Import-Package>
......
......@@ -167,7 +167,7 @@
<!-- dependencies versions -->
<ow2.version>1.1</ow2.version>
<mail.version>1.4.1</mail.version>
<monolog.version>5.1.1</monolog.version>
<monolog.version>5.2.0</monolog.version>
<jcup.version>5.3.1</jcup.version>
<jftp.version>1.52</jftp.version>
<jgroups-all.version>2.2.8</jgroups-all.version>
......@@ -179,10 +179,11 @@
<commons-dbcp.version>1.2.2</commons-dbcp.version>
<mysql-connector-java.version>5.1.6</mysql-connector-java.version>
<connector.version>1.0.3</connector.version>
<felix.main.version>3.2.0</felix.main.version>
<felix.main.version>3.2.2</felix.main.version>
<felix.shell.version>1.4.2</felix.shell.version>
<felix.remote.version>1.1.2</felix.remote.version>
<felix.tui.version>1.4.1</felix.tui.version>
<maven.bundle.plugin.version>2.3.5</maven.bundle.plugin.version>
<!-- to prevent [WARNING] Using platform encoding -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<stomp.version>1.0</stomp.version>
......
......@@ -19,6 +19,7 @@
<!-- clean -->
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>2.4.1</version>
<configuration>
<filesets>
<fileset>
......
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