Commit 4910c887 authored by Nicolas Tachker's avatar Nicolas Tachker

joram version 5.5.0

update protocol to 55
parent 39670c14
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>a3</artifactId> <artifactId>a3</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>a3</artifactId> <artifactId>a3</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>a3</artifactId> <artifactId>a3</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
</project> </project>
\ No newline at end of file
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>jndi</artifactId> <artifactId>jndi</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>jndi</artifactId> <artifactId>jndi</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>jndi</artifactId> <artifactId>jndi</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>joram-client</artifactId> <artifactId>joram-client</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>
......
...@@ -12,11 +12,12 @@ ...@@ -12,11 +12,12 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>joram-client</artifactId> <artifactId>joram-client</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
<version.filter.value>${project.version}</version.filter.value> <version.filter.value>${project.version}</version.filter.value>
<protocol.filter.value>${joram.protocol}</protocol.filter.value>
</properties> </properties>
......
joram.version = ${version.filter.value} joram.version = ${version.filter.value}
\ No newline at end of file joram.protocol = ${protocol.filter.value}
\ No newline at end of file
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>joram</artifactId> <artifactId>joram</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>joram-jca</artifactId> <artifactId>joram-jca</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
</project> </project>
\ No newline at end of file
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>joram</artifactId> <artifactId>joram</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>joram-jca</artifactId> <artifactId>joram-jca</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>joram-jca</artifactId> <artifactId>joram-jca</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>joram-mom</artifactId> <artifactId>joram-mom</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>joram-mom-extensions</artifactId> <artifactId>joram-mom-extensions</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>joram-mom-extensions</artifactId> <artifactId>joram-mom-extensions</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>joram-mom-extensions</artifactId> <artifactId>joram-mom-extensions</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>joram-mom-extensions</artifactId> <artifactId>joram-mom-extensions</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>joram-mom</artifactId> <artifactId>joram-mom</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>joram-mom-extensions</artifactId> <artifactId>joram-mom-extensions</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>joram</artifactId> <artifactId>joram</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>joram-security</artifactId> <artifactId>joram-security</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>joram</artifactId> <artifactId>joram</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<profiles> <profiles>
......
...@@ -12,11 +12,12 @@ ...@@ -12,11 +12,12 @@
<parent> <parent>
<artifactId>joram</artifactId> <artifactId>joram</artifactId>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
<version.filter.value>${project.version}</version.filter.value> <!-- major.minor.build.protocol --> <version.filter.value>${project.version}</version.filter.value>
<protocol.filter.value>${joram.protocol}</protocol.filter.value>
</properties> </properties>
<build> <build>
......
...@@ -69,7 +69,14 @@ public class MetaData { ...@@ -69,7 +69,14 @@ public class MetaData {
InputStream in = MetaData.class.getResourceAsStream("/joram.version"); InputStream in = MetaData.class.getResourceAsStream("/joram.version");
BufferedReader reader = new BufferedReader(new InputStreamReader(in)); BufferedReader reader = new BufferedReader(new InputStreamReader(in));
String v = reader.readLine(); String v = reader.readLine();
implVersion = v.substring(v.indexOf('='), v.length()); while (v != null) {
if (v.contains("version"))
implVersion = v.substring(v.indexOf('=')+1, v.length());
else if (v.contains("protocol"))
protocol = Integer.parseInt(v.substring(v.indexOf('=')+1, v.length()).trim());
v = reader.readLine();
}
} catch (Exception e) { } catch (Exception e) {
if (logger.isLoggable(BasicLevel.DEBUG)) if (logger.isLoggable(BasicLevel.DEBUG))
logger.log(BasicLevel.DEBUG, "MetaData.getVersionInResource:: EXCEPTION", e); logger.log(BasicLevel.DEBUG, "MetaData.getVersionInResource:: EXCEPTION", e);
...@@ -81,7 +88,6 @@ public class MetaData { ...@@ -81,7 +88,6 @@ public class MetaData {
major = Integer.parseInt(st.nextToken()); major = Integer.parseInt(st.nextToken());
minor = Integer.parseInt(st.nextToken()); minor = Integer.parseInt(st.nextToken());
build = Integer.parseInt(st.nextToken()); build = Integer.parseInt(st.nextToken());
protocol = Integer.parseInt(st.nextToken("-").substring(1));
} catch (Exception e) { } catch (Exception e) {
if (logger.isLoggable(BasicLevel.DEBUG)) if (logger.isLoggable(BasicLevel.DEBUG))
logger.log(BasicLevel.DEBUG, "MetaData.getVersionInResource:: EXCEPTION", e); logger.log(BasicLevel.DEBUG, "MetaData.getVersionInResource:: EXCEPTION", e);
......
joram.version = ${version.filter.value} joram.version = ${version.filter.value}
\ No newline at end of file joram.protocol = ${protocol.filter.value}
\ No newline at end of file
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>joram-tools</artifactId> <artifactId>joram-tools</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>joram</artifactId> <artifactId>joram</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
</project> </project>
\ No newline at end of file
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<!-- version : major.minor.build.protocol --> <!-- version : major.minor.build -->
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
<name>JORAM</name> <name>JORAM</name>
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>
<description>Builds the Joram project.</description> <description>Builds the Joram project.</description>
<parent> <parent>
<groupId>org.ow2</groupId> <groupId>org.ow2</groupId>
<artifactId>ow2</artifactId> <artifactId>ow2</artifactId>
...@@ -152,6 +152,7 @@ ...@@ -152,6 +152,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration> <configuration>
<source>1.5</source> <source>1.5</source>
<target>1.5</target> <target>1.5</target>
...@@ -161,6 +162,8 @@ ...@@ -161,6 +162,8 @@
</build> </build>
<properties> <properties>
<!-- joram protocol -->
<joram.protocol>55</joram.protocol>
<!-- dependencies versions --> <!-- dependencies versions -->
<ow2.version>1.1</ow2.version> <ow2.version>1.1</ow2.version>
<mail.version>1.4.1</mail.version> <mail.version>1.4.1</mail.version>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<parent> <parent>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>org.objectweb.joram</groupId> <groupId>org.objectweb.joram</groupId>
<version>5.4.1.54-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>
......
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