Commit 6de91297 authored by Nicolas Tachker's avatar Nicolas Tachker

version Joram 5.12.0

......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>a3</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>a3</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>parent</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<modules>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>a3</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>a3</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
<?xml version="1.0" encoding="UTF-8"?>
<assembly>
<id>client</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>jar</format>
</formats>
<dependencySets>
<dependencySet>
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.ow2.spec.ee:ow2-jms-2.0-spec</include>
<include>org.ow2.spec.ee:ow2-jta-1.1-spec</include>
<include>org.objectweb.joram:jcup</include>
<include>org.ow2.joram:joram-shared</include>
<include>org.ow2.joram:joram-client-jms</include>
<include>org.ow2.joram:a3-common</include>
<include>org.ow2.joram:jndi-shared</include>
<include>org.ow2.joram:jndi-client</include>
<include>org.ow2.jonas.osgi:monolog</include>
</includes>
<useTransitiveFiltering>false</useTransitiveFiltering>
<useProjectArtifact>false</useProjectArtifact>
<unpack>true</unpack>
</dependencySet>
</dependencySets>
</assembly>
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>parent</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......@@ -35,6 +35,22 @@
<ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
</configuration>
</execution>
<!-- ============= client (joram) ===================== -->
<execution>
<id>client</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>client-assembly.xml</descriptor>
</descriptors>
<appendAssemblyId>true</appendAssemblyId>
<ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
......
......@@ -9,7 +9,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.ow2.joram</groupId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
</project>
\ No newline at end of file
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>jndi</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -10,7 +10,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.ow2.joram</groupId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<modules>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>jndi</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>jndi</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-client</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-client</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<properties>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<modules>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-client</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-jca</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
</project>
\ No newline at end of file
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<modules>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-jca</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<dependencies>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-jca</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<dependencies>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-mom</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<properties>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-mom</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-mom-extensions</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-mom-extensions</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-mom-extensions</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-mom-extensions</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-mom-extensions</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-mom</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<modules>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-mom-extensions</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<modules>
......
......@@ -10,7 +10,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.ow2.joram</groupId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<modules>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-security</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -10,7 +10,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<profiles>
......
......@@ -11,7 +11,7 @@
<parent>
<artifactId>joram</artifactId>
<groupId>org.ow2.joram</groupId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<properties>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-tools</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-tools</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<modules>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-tools-rest</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-tools-rest</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-tools-rest</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-tools</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<modules>
......
......@@ -9,7 +9,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.ow2.joram</groupId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
</project>
\ No newline at end of file
......@@ -6,7 +6,7 @@
<artifactId>parent</artifactId>
<packaging>pom</packaging>
<!-- version : major.minor.build -->
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
<name>JORAM</name>
<url>http://maven.apache.org</url>
<description>Builds the Joram project.</description>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>parent</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......@@ -167,6 +167,27 @@
<artifactId>joram-mom-extensions-scheduler</artifactId>
<version>${project.version}</version>
</artifactItem>
<!-- Joram tools -->
<artifactItem>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-tools-jasp</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-tools-rest-jms</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-tools-rest-jmx</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-tools-rest-admin</artifactId>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
</configuration>
</execution>
......@@ -376,11 +397,6 @@
<groupId>org.ow2.spec.ee</groupId>
<artifactId>ow2-jta-1.1-spec</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.jonas.osgi</groupId>
<artifactId>monolog</artifactId>
......@@ -431,6 +447,12 @@
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.joram</groupId>
<artifactId>a3-services</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.joram</groupId>
<artifactId>jndi-shared</artifactId>
......@@ -455,6 +477,10 @@
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-mom-extensions-ftp</artifactId>
......@@ -491,6 +517,24 @@
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-tools-rest-admin</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-tools-rest-jms</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-tools-rest-jmx</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.shell</artifactId>
......@@ -507,6 +551,20 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.command</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.shell</artifactId>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
......@@ -537,5 +595,74 @@
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.joram</groupId>
<artifactId>shell-mom</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.joram</groupId>
<artifactId>shell-jndi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.joram</groupId>
<artifactId>shell-a3</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.util.substitution</groupId>
<artifactId>substitution</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-continuation</artifactId>
</dependency>
<!-- This two artifacts are intended to register HTTPService (OSGi) -->
<!-- removed when updating jetty -->
<dependency>
<groupId>org.eclipse.equinox.http</groupId>
<artifactId>servlet</artifactId>
<version>1.0.0-v20070606</version>
</dependency>
<dependency>
<groupId>org.eclipse.equinox.http</groupId>
<artifactId>jetty</artifactId>
<version>3.0.100</version>
</dependency>
</dependencies>
<!-- This repository is needed to the jetty 3.0.100 artifact -->
<repositories>
<repository>
<id>jabylon</id>
<url>http://www.jabylon.org/maven/</url>
</repository>
</repositories>
</project>
\ No newline at end of file
......@@ -31,30 +31,58 @@
<includes>
<include>org.ow2.spec.ee:ow2-jms-2.0-spec</include>
<include>org.ow2.spec.ee:ow2-jta-1.1-spec</include>
<include>org.osgi:org.osgi.compendium</include>
<include>org.objectweb.joram:jcup</include>
<include>org.ow2.joram:joram-shared</include>
<include>org.ow2.joram:joram-mom-core</include>
<include>org.ow2.joram:joram-mom-amqp</include>
<include>org.ow2.joram:joram-client-jms</include>
<include>org.ow2.joram:a3-common</include>
<include>org.ow2.joram:a3-rt</include>
<include>org.ow2.joram:a3-osgi</include>
<include>org.ow2.joram:a3-services</include>
<include>org.ow2.joram:jndi-shared</include>
<include>org.ow2.joram:jndi-server</include>
<include>org.ow2.joram:jndi-client</include>
<include>org.ow2.jonas.osgi:monolog</include>
<include>org.ow2.joram:joram-mom-extensions-amqp</include>
<include>commons-io:commons-io</include>
<include>org.ow2.joram:joram-mom-extensions-ftp</include>
<include>org.ow2.joram:joram-mom-extensions-jmsbridge</include>
<include>org.ow2.joram:joram-mom-extensions-mail</include>
<include>org.ow2.joram:joram-mom-extensions-collector</include>
<include>org.ow2.joram:joram-mom-extensions-scheduler</include>
<include>org.ow2.joram:joram-tools-jasp</include>
<include>org.ow2.joram:joram-tools-rest-admin</include>
<include>org.ow2.joram:joram-tools-rest-jms</include>
<include>org.ow2.joram:joram-tools-rest-jmx</include>
<include>org.apache.felix:org.apache.felix.shell</include>
<include>org.apache.felix:org.apache.felix.shell.remote</include>
<include>org.apache.felix:org.apache.felix.shell.tui</include>
<include>org.apache.felix:org.apache.felix.gogo.runtime</include>
<include>org.apache.felix:org.apache.felix.gogo.command</include>
<include>org.apache.felix:org.apache.felix.gogo.shell</include>
<include>org.osgi:org.osgi.compendium</include>
<include>org.ow2.joram:joram-mom-amqp</include>
<include>org.ow2.joram:shell-mom</include>
<include>org.ow2.joram:shell-jndi</include>
<include>org.ow2.joram:shell-a3</include>
<include>org.ow2.util.substitution:substitution</include>
<include>org.glassfish.jersey.core:jersey-server</include>
<include>org.glassfish.jersey.containers:jersey-container-servlet-core</include>
<include>org.eclipse.jetty:jetty-server</include>
<include>org.eclipse.jetty:jetty-servlet</include>
<include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include>
<include>org.eclipse.jetty:jetty-continuation</include>
<include>org.eclipse.equinox.http:jetty</include>
<include>org.eclipse.equinox.http:servlet</include>
</includes>
<excludes>
<exclude>org.codehaus.stomp:stompconnect</exclude>
<exclude>org.apache.felix:org.apache.felix.bundlerepository</exclude>
<exclude>com.rabbitmq:amqp-client</exclude>
<exclude>org.objectweb.joram:jftp</exclude>
</excludes>
<useTransitiveFiltering>true</useTransitiveFiltering>
<useProjectArtifact>false</useProjectArtifact>
<unpack>false</unpack>
</dependencySet>
......
......@@ -10,7 +10,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.ow2.joram</groupId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>shell</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -9,7 +9,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<artifactId>shell</artifactId>
<version>5.12.0-SNAPSHOT</version>
<version>5.12.0</version>
</parent>
<build>
......
......@@ -9,7 +9,7 @@
<parent>
<groupId>org.ow2.joram</groupId>
<arti