diff --git a/joram/a3/common/pom.xml b/joram/a3/common/pom.xml
index 683ccfff3b55445e9298d67b8b7ef913d4b6e628..a92f530a19a6e030a9ebc2ba63e8868f80ae0de4 100644
--- a/joram/a3/common/pom.xml
+++ b/joram/a3/common/pom.xml
@@ -12,7 +12,7 @@
org.objectweb.joram
a3
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/a3/osgi/pom.xml b/joram/a3/osgi/pom.xml
index 2e75c6befe58eff4492862769c8462d5eff11495..0f457a0415971e83ebb3e5ca49ecde8630124e88 100644
--- a/joram/a3/osgi/pom.xml
+++ b/joram/a3/osgi/pom.xml
@@ -12,7 +12,7 @@
org.objectweb.joram
a3
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/a3/pom.xml b/joram/a3/pom.xml
index 22245443fc730e796bb2a5a4f68800946f59490b..4c7ab992c27d6c4deec617333c7e858cf2d4c4c3 100644
--- a/joram/a3/pom.xml
+++ b/joram/a3/pom.xml
@@ -11,7 +11,7 @@
org.objectweb.joram
parent
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/a3/rt/pom.xml b/joram/a3/rt/pom.xml
index e1117f6bec9a944447e75855d4b1ca2df12b189e..1e65cf50c06494c258e249064bb177997678f4ec 100644
--- a/joram/a3/rt/pom.xml
+++ b/joram/a3/rt/pom.xml
@@ -12,7 +12,7 @@
org.objectweb.joram
a3
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/assembly/pom.xml b/joram/assembly/pom.xml
index b12d912caa0ab7ee5cf37efbd32b32d1882e514d..ce83f58ef737d0abfa2393f48290157e030d1c08 100644
--- a/joram/assembly/pom.xml
+++ b/joram/assembly/pom.xml
@@ -11,7 +11,7 @@
org.objectweb.joram
parent
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/conf/pom.xml b/joram/conf/pom.xml
index 0db76ac45fdf0103bf797bb34f773c7bef5d7e7a..af37e5e730c1cafecff13571ef9fb34180dbf882 100644
--- a/joram/conf/pom.xml
+++ b/joram/conf/pom.xml
@@ -10,7 +10,7 @@
parent
org.objectweb.joram
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
\ No newline at end of file
diff --git a/joram/jndi/client/pom.xml b/joram/jndi/client/pom.xml
index f96fb3cb3cc60213e70e243f0f94f5368380bd04..81bbc60f4f3b69b78a1b75598b214033f41c936d 100644
--- a/joram/jndi/client/pom.xml
+++ b/joram/jndi/client/pom.xml
@@ -12,7 +12,7 @@
org.objectweb.joram
jndi
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/jndi/server/pom.xml b/joram/jndi/server/pom.xml
index fb751906faa1f915d5398865a26d6d3589b4e403..3cc23e51ce99caf3fab9389d57fcfbaa1ed49fa8 100644
--- a/joram/jndi/server/pom.xml
+++ b/joram/jndi/server/pom.xml
@@ -12,7 +12,7 @@
org.objectweb.joram
jndi
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/jndi/shared/pom.xml b/joram/jndi/shared/pom.xml
index 8d6a3867fa0ddab8764700901c19acc3e6288dd3..1de14a66120f8abd7a4f22d29971c9c2f4a03add 100644
--- a/joram/jndi/shared/pom.xml
+++ b/joram/jndi/shared/pom.xml
@@ -11,7 +11,7 @@
org.objectweb.joram
jndi
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/joram/client/jca/pom.xml b/joram/joram/client/jca/pom.xml
index 9cb43c178b1f987f795443327bea35faf7cd2e1d..6ba5e0dded19257dacfb065ececf1ca64eed24a4 100644
--- a/joram/joram/client/jca/pom.xml
+++ b/joram/joram/client/jca/pom.xml
@@ -11,7 +11,7 @@
org.objectweb.joram
joram-client
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/joram/client/jms/pom.xml b/joram/joram/client/jms/pom.xml
index 614fcafaf8d56fcda3496540c9e500edc487dfa3..7a02c7114fe4ba5434a07b59d826b4074fd7537e 100644
--- a/joram/joram/client/jms/pom.xml
+++ b/joram/joram/client/jms/pom.xml
@@ -12,11 +12,12 @@
org.objectweb.joram
joram-client
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
${project.version}
+ ${joram.protocol}
diff --git a/joram/joram/client/jms/src/main/resources/joram.version b/joram/joram/client/jms/src/main/resources/joram.version
index 8d0374a68b02caf409fa1d30647cd47c4ddd4786..319e0d2d1f7150f137475556fbc628420a5cd056 100644
--- a/joram/joram/client/jms/src/main/resources/joram.version
+++ b/joram/joram/client/jms/src/main/resources/joram.version
@@ -1 +1,2 @@
-joram.version = ${version.filter.value}
\ No newline at end of file
+joram.version = ${version.filter.value}
+joram.protocol = ${protocol.filter.value}
\ No newline at end of file
diff --git a/joram/joram/client/pom.xml b/joram/joram/client/pom.xml
index 5554900abc56fe46dde9e2d1542664980f33c948..1be484f18b59fc62779f6bd7cfda7c187d1c8272 100644
--- a/joram/joram/client/pom.xml
+++ b/joram/joram/client/pom.xml
@@ -11,7 +11,7 @@
org.objectweb.joram
joram
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/joram/jca/jonas/pom.xml b/joram/joram/jca/jonas/pom.xml
index 00c1993d5b7d3a04c1ff68a813c0f30c6e08dba8..176bb9881a185a8fb7d22c32769bedbedcec71b2 100644
--- a/joram/joram/jca/jonas/pom.xml
+++ b/joram/joram/jca/jonas/pom.xml
@@ -11,7 +11,7 @@
org.objectweb.joram
joram-jca
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
\ No newline at end of file
diff --git a/joram/joram/jca/pom.xml b/joram/joram/jca/pom.xml
index edc619dd56e8830e018441d0022b26bb8b2ec7e2..2e206604a3a10eca47450b41b1c2733099afa1c9 100644
--- a/joram/joram/jca/pom.xml
+++ b/joram/joram/jca/pom.xml
@@ -11,7 +11,7 @@
org.objectweb.joram
joram
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/joram/jca/ra/pom.xml b/joram/joram/jca/ra/pom.xml
index a15853f466115eed613b4748901f6a1a6d2730da..b123eb53b57bfe3c7d49dc0abd6470c9587eb47f 100644
--- a/joram/joram/jca/ra/pom.xml
+++ b/joram/joram/jca/ra/pom.xml
@@ -11,7 +11,7 @@
org.objectweb.joram
joram-jca
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/joram/jca/remote/pom.xml b/joram/joram/jca/remote/pom.xml
index 5a52aaf450fded33bc25bdacd0636ac10a53f433..6d6c09151c79eda3736fa761e96e8509a38d356a 100644
--- a/joram/joram/jca/remote/pom.xml
+++ b/joram/joram/jca/remote/pom.xml
@@ -11,7 +11,7 @@
org.objectweb.joram
joram-jca
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/joram/mom/core/pom.xml b/joram/joram/mom/core/pom.xml
index d854190b9817a5de6d00d2bcd0ea104c38c122bc..354c9a3100d6e6fea5f61a02806dc94307151e59 100644
--- a/joram/joram/mom/core/pom.xml
+++ b/joram/joram/mom/core/pom.xml
@@ -12,7 +12,7 @@
org.objectweb.joram
joram-mom
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/joram/mom/extensions/collector/pom.xml b/joram/joram/mom/extensions/collector/pom.xml
index 030b0eea3dd3653192fac638581b2bc3d8f6a79c..62728cc8a4ec409485597b5e0a36b6334bd81518 100644
--- a/joram/joram/mom/extensions/collector/pom.xml
+++ b/joram/joram/mom/extensions/collector/pom.xml
@@ -11,7 +11,7 @@
org.objectweb.joram
joram-mom-extensions
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/joram/mom/extensions/ftp/pom.xml b/joram/joram/mom/extensions/ftp/pom.xml
index bb4fd96d399458cf3854c02bc773cf5f8093164c..c8211feabccf932ed025c4fe8945ab62b17b1108 100644
--- a/joram/joram/mom/extensions/ftp/pom.xml
+++ b/joram/joram/mom/extensions/ftp/pom.xml
@@ -11,7 +11,7 @@
org.objectweb.joram
joram-mom-extensions
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/joram/mom/extensions/jmsbridge/pom.xml b/joram/joram/mom/extensions/jmsbridge/pom.xml
index 91f990888ee548f509a9b0a74bab544808985b94..c7a84332c8a41747f98a5a901fe3f12557a07dd1 100644
--- a/joram/joram/mom/extensions/jmsbridge/pom.xml
+++ b/joram/joram/mom/extensions/jmsbridge/pom.xml
@@ -12,7 +12,7 @@
org.objectweb.joram
joram-mom-extensions
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/joram/mom/extensions/mail/pom.xml b/joram/joram/mom/extensions/mail/pom.xml
index 0a294445953b767c3b6732db9e4bcc046ca0479b..fa872a8f7b3644b5cde8d26c33b95ba8bc4a2fd3 100644
--- a/joram/joram/mom/extensions/mail/pom.xml
+++ b/joram/joram/mom/extensions/mail/pom.xml
@@ -12,7 +12,7 @@
org.objectweb.joram
joram-mom-extensions
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/joram/mom/extensions/pom.xml b/joram/joram/mom/extensions/pom.xml
index 9b764fa2c8a1c2496f7a74486ca5c1da67b67a58..7c473368d169be5b694e7f84b04eac2362bf15a4 100644
--- a/joram/joram/mom/extensions/pom.xml
+++ b/joram/joram/mom/extensions/pom.xml
@@ -11,7 +11,7 @@
org.objectweb.joram
joram-mom
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/joram/mom/extensions/scheduler/pom.xml b/joram/joram/mom/extensions/scheduler/pom.xml
index 7b05aa412ef1663564af62e9b7ab67cefe143f45..7eca3de0359a6a7c45280db8d4aa4d8b7502cbbc 100644
--- a/joram/joram/mom/extensions/scheduler/pom.xml
+++ b/joram/joram/mom/extensions/scheduler/pom.xml
@@ -11,7 +11,7 @@
org.objectweb.joram
joram-mom-extensions
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/joram/mom/pom.xml b/joram/joram/mom/pom.xml
index 2ac9efafe12b99b91fbd843115fb132b3bbb895b..8c7bcac362be81e29c6c3466f03fe7efa3e57431 100644
--- a/joram/joram/mom/pom.xml
+++ b/joram/joram/mom/pom.xml
@@ -12,7 +12,7 @@
org.objectweb.joram
joram
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/joram/pom.xml b/joram/joram/pom.xml
index a3a1973205e615eb44caa5da76e09753812d4767..e19c9aa600307889ffa5356d23dc9d1b3c0ac9e7 100644
--- a/joram/joram/pom.xml
+++ b/joram/joram/pom.xml
@@ -11,7 +11,7 @@
parent
org.objectweb.joram
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/joram/security/jonas/pom.xml b/joram/joram/security/jonas/pom.xml
index 9289ddecc25891f9f7cd4e88ddae1c98ab8dd275..44a010e11f29e745e87b9102a61381f164edb2b4 100644
--- a/joram/joram/security/jonas/pom.xml
+++ b/joram/joram/security/jonas/pom.xml
@@ -12,7 +12,7 @@
org.objectweb.joram
joram-security
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/joram/security/pom.xml b/joram/joram/security/pom.xml
index 8f211f5136a8057d6aa2cbe7cd54a189f2cfab6a..d30a89af4956f495f803fb05799ec665bf226384 100644
--- a/joram/joram/security/pom.xml
+++ b/joram/joram/security/pom.xml
@@ -11,7 +11,7 @@
org.objectweb.joram
joram
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/joram/shared/pom.xml b/joram/joram/shared/pom.xml
index 6126ccb285fb8b330d93a47b7d833302eb7c7885..9c13dbb292a9960e7541ece1146fd062247f75d1 100644
--- a/joram/joram/shared/pom.xml
+++ b/joram/joram/shared/pom.xml
@@ -12,11 +12,12 @@
joram
org.objectweb.joram
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
- ${project.version}
+ ${project.version}
+ ${joram.protocol}
diff --git a/joram/joram/shared/src/main/java/org/objectweb/joram/shared/stream/MetaData.java b/joram/joram/shared/src/main/java/org/objectweb/joram/shared/stream/MetaData.java
index 8f705b6ae0d0f044b6243b39c007aeb578b5b005..d77ffd82595d5ebd0d80055405b46b8bfc588678 100644
--- a/joram/joram/shared/src/main/java/org/objectweb/joram/shared/stream/MetaData.java
+++ b/joram/joram/shared/src/main/java/org/objectweb/joram/shared/stream/MetaData.java
@@ -69,7 +69,14 @@ public class MetaData {
InputStream in = MetaData.class.getResourceAsStream("/joram.version");
BufferedReader reader = new BufferedReader(new InputStreamReader(in));
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) {
if (logger.isLoggable(BasicLevel.DEBUG))
logger.log(BasicLevel.DEBUG, "MetaData.getVersionInResource:: EXCEPTION", e);
@@ -81,7 +88,6 @@ public class MetaData {
major = Integer.parseInt(st.nextToken());
minor = Integer.parseInt(st.nextToken());
build = Integer.parseInt(st.nextToken());
- protocol = Integer.parseInt(st.nextToken("-").substring(1));
} catch (Exception e) {
if (logger.isLoggable(BasicLevel.DEBUG))
logger.log(BasicLevel.DEBUG, "MetaData.getVersionInResource:: EXCEPTION", e);
diff --git a/joram/joram/shared/src/main/resources/joram.version b/joram/joram/shared/src/main/resources/joram.version
index 8d0374a68b02caf409fa1d30647cd47c4ddd4786..319e0d2d1f7150f137475556fbc628420a5cd056 100644
--- a/joram/joram/shared/src/main/resources/joram.version
+++ b/joram/joram/shared/src/main/resources/joram.version
@@ -1 +1,2 @@
-joram.version = ${version.filter.value}
\ No newline at end of file
+joram.version = ${version.filter.value}
+joram.protocol = ${protocol.filter.value}
\ No newline at end of file
diff --git a/joram/joram/tools/jasp/pom.xml b/joram/joram/tools/jasp/pom.xml
index 69b31e5b0b6b3bc420c63814822044bd95cc6272..3b990930841f80dd8dec421a34622ce3f9b220e9 100644
--- a/joram/joram/tools/jasp/pom.xml
+++ b/joram/joram/tools/jasp/pom.xml
@@ -12,7 +12,7 @@
org.objectweb.joram
joram-tools
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/joram/tools/pom.xml b/joram/joram/tools/pom.xml
index a1c485e5b58f455784ffe2ab46b06ff5f281e070..aa34cf350d9b18cb64d6d2eedced7fb2551fe9cb 100644
--- a/joram/joram/tools/pom.xml
+++ b/joram/joram/tools/pom.xml
@@ -12,7 +12,7 @@
org.objectweb.joram
joram
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/licenses/pom.xml b/joram/licenses/pom.xml
index bb9915ea7b3275b88b45c4ceba6bab88ac0ad5f4..deac2297e6fb1976e7788aa5dec0b285fa26e4fd 100644
--- a/joram/licenses/pom.xml
+++ b/joram/licenses/pom.xml
@@ -10,7 +10,7 @@
parent
org.objectweb.joram
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
\ No newline at end of file
diff --git a/joram/pom.xml b/joram/pom.xml
index 7d984941ba0513c951a45959d92479fe1a595a4e..e0ff7dce06f5eb9f67747af16a2e69e85c95ef72 100644
--- a/joram/pom.xml
+++ b/joram/pom.xml
@@ -5,12 +5,12 @@
org.objectweb.joram
parent
pom
-
- 5.4.1.54-SNAPSHOT
+
+ 5.5.0-SNAPSHOT
JORAM
http://maven.apache.org
Builds the Joram project.
-
+
org.ow2
ow2
@@ -152,6 +152,7 @@
org.apache.maven.plugins
maven-compiler-plugin
+ 2.3.2
1.5
1.5
@@ -161,6 +162,8 @@
+
+ 55
1.1
1.4.1
diff --git a/joram/release/pom.xml b/joram/release/pom.xml
index 1e751d5879df6b728fbc067dffd4c6341e6d5a16..d9ad6f687fd2f8bd1242bb9c808073e56e52b5eb 100644
--- a/joram/release/pom.xml
+++ b/joram/release/pom.xml
@@ -11,7 +11,7 @@
org.objectweb.joram
parent
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT
diff --git a/joram/samples/pom.xml b/joram/samples/pom.xml
index 0d16fbdd9579470f432626d1119c882f0e7d519b..e2678017d2e56ba55647b75f4efd659994116c01 100644
--- a/joram/samples/pom.xml
+++ b/joram/samples/pom.xml
@@ -11,7 +11,7 @@
parent
org.objectweb.joram
- 5.4.1.54-SNAPSHOT
+ 5.5.0-SNAPSHOT