Merge IBM development contributiions. As it does not appear possible …

…to alter the git log messages to include jira issue numbers, the git commit hashes will be added to the jira issues.

.gitignore

@@ -1,5 +1,7 @@
 *.i??
 .project
+.metadata
+.idea
 .classpath
 .settings
 target

pom.xml

@@ -44,7 +44,7 @@
         <antrun.version>1.1</antrun.version>
         <!--<antlr.version>2.7.5</antlr.version>-->
         <bcel.version>5.2</bcel.version>
-        <junit.version>4.5</junit.version>
+        <junit.version>4.12</junit.version>
         <compile.flags>-Xlint:unchecked,deprecation,fallthrough,finally</compile.flags>
         <java.endorsed.dirs>${basedir}/target/classes</java.endorsed.dirs>
         <compile.forked>false</compile.forked>
@@ -71,19 +71,20 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>yoko-core</module>
+        <module>yoko-osgi</module>
         <module>yoko-spec-corba</module>
         <module>yoko-rmi-spec</module>
+        <module>yoko-util</module>
         <module>yoko-rmi-impl</module>
-        <module>yoko-osgi</module>
+        <module>yoko-core</module>
     </modules>
 
     <dependencyManagement>
         <dependencies>
             <!--  Yoko modules -->
             <dependency>
                 <groupId>org.apache.yoko</groupId>
-                <artifactId>yoko-core</artifactId>
+                <artifactId>yoko-osgi</artifactId>
                 <version>${project.version}</version>
             </dependency>