Skip to content

joram
joram
Commit 4910c887 authored by Nicolas Tachker's avatar Nicolas Tachker
Browse files
Options

joram version 5.5.0 

update protocol to 55
parent 39670c14
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 41 deletions
joram/a3/common/pom.xml
View file @ 4910c887
......@@ -12,7 +12,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>a3</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<build>
......
joram/a3/osgi/pom.xml
View file @ 4910c887
......@@ -12,7 +12,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>a3</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<build>
......
joram/a3/pom.xml
View file @ 4910c887
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>parent</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<modules>
......
joram/a3/rt/pom.xml
View file @ 4910c887
......@@ -12,7 +12,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>a3</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<build>
......
joram/assembly/pom.xml
View file @ 4910c887
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>parent</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<build>
......
joram/conf/pom.xml
View file @ 4910c887
......@@ -10,7 +10,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.objectweb.joram</groupId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
</project>
\ No newline at end of file
joram/jndi/client/pom.xml
View file @ 4910c887
......@@ -12,7 +12,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>jndi</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<build>
......
joram/jndi/server/pom.xml
View file @ 4910c887
......@@ -12,7 +12,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>jndi</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<build>
......
joram/jndi/shared/pom.xml
View file @ 4910c887
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>jndi</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<build>
......
joram/joram/client/jca/pom.xml
View file @ 4910c887
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>joram-client</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<build>
......
joram/joram/client/jms/pom.xml
View file @ 4910c887
......@@ -12,11 +12,12 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>joram-client</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<properties>
<version.filter.value>${project.version}</version.filter.value>
<protocol.filter.value>${joram.protocol}</protocol.filter.value>
</properties>
......
joram/joram/client/jms/src/main/resources/joram.version
View file @ 4910c887
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
joram/joram/client/pom.xml
View file @ 4910c887
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>joram</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<modules>
......
joram/joram/jca/jonas/pom.xml
View file @ 4910c887
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>joram-jca</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
</project>
\ No newline at end of file
joram/joram/jca/pom.xml
View file @ 4910c887
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>joram</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<modules>
......
joram/joram/jca/ra/pom.xml
View file @ 4910c887
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>joram-jca</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<dependencies>
......
joram/joram/jca/remote/pom.xml
View file @ 4910c887
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>joram-jca</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<dependencies>
......
joram/joram/mom/core/pom.xml
View file @ 4910c887
......@@ -12,7 +12,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>joram-mom</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<build>
......
joram/joram/mom/extensions/collector/pom.xml
View file @ 4910c887
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>joram-mom-extensions</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<build>
......
joram/joram/mom/extensions/ftp/pom.xml
View file @ 4910c887
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>joram-mom-extensions</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<build>
......
joram/joram/mom/extensions/jmsbridge/pom.xml
View file @ 4910c887
......@@ -12,7 +12,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>joram-mom-extensions</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<build>
......
joram/joram/mom/extensions/mail/pom.xml
View file @ 4910c887
......@@ -12,7 +12,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>joram-mom-extensions</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<build>
......
joram/joram/mom/extensions/pom.xml
View file @ 4910c887
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>joram-mom</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<modules>
......
joram/joram/mom/extensions/scheduler/pom.xml
View file @ 4910c887
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>joram-mom-extensions</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<build>
......
joram/joram/mom/pom.xml
View file @ 4910c887
......@@ -12,7 +12,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>joram</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<modules>
......
joram/joram/pom.xml
View file @ 4910c887
......@@ -11,7 +11,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.objectweb.joram</groupId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<modules>
......
joram/joram/security/jonas/pom.xml
View file @ 4910c887
......@@ -12,7 +12,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>joram-security</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<build>
......
joram/joram/security/pom.xml
View file @ 4910c887
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>joram</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<profiles>
......
joram/joram/shared/pom.xml
View file @ 4910c887
......@@ -12,11 +12,12 @@
<parent>
<artifactId>joram</artifactId>
<groupId>org.objectweb.joram</groupId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<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>
<build>
......
joram/joram/shared/src/main/java/org/objectweb/joram/shared/stream/MetaData.java
View file @ 4910c887
......@@ -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);
......
joram/joram/shared/src/main/resources/joram.version
View file @ 4910c887
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
joram/joram/tools/jasp/pom.xml
View file @ 4910c887
......@@ -12,7 +12,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>joram-tools</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<build>
......
joram/joram/tools/pom.xml
View file @ 4910c887
......@@ -12,7 +12,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>joram</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<modules>
......
joram/licenses/pom.xml
View file @ 4910c887
......@@ -10,7 +10,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.objectweb.joram</groupId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
</project>
\ No newline at end of file
joram/pom.xml
View file @ 4910c887
......@@ -5,12 +5,12 @@
<groupId>org.objectweb.joram</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
<!-- version : major.minor.build.protocol -->
<version>5.4.1.54-SNAPSHOT</version>
<!-- version : major.minor.build -->
<version>5.5.0-SNAPSHOT</version>
<name>JORAM</name>
<url>http://maven.apache.org</url>
<description>Builds the Joram project.</description>
<parent>
<groupId>org.ow2</groupId>
<artifactId>ow2</artifactId>
......@@ -152,6 +152,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
......@@ -161,6 +162,8 @@
</build>
<properties>
<!-- joram protocol -->
<joram.protocol>55</joram.protocol>
<!-- dependencies versions -->
<ow2.version>1.1</ow2.version>
<mail.version>1.4.1</mail.version>
......
joram/release/pom.xml
View file @ 4910c887
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.objectweb.joram</groupId>
<artifactId>parent</artifactId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<build>
......
joram/samples/pom.xml
View file @ 4910c887
......@@ -11,7 +11,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.objectweb.joram</groupId>
<version>5.4.1.54-SNAPSHOT</version>
<version>5.5.0-SNAPSHOT</version>
</parent>
<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