Skip to content
Permalink
Browse files
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.
  • Loading branch information
djencks committed Feb 19, 2017
2 parents b8721ed + fab2a98 commit e1e6d270dab5ef037aca55802103ad68ea53267b
Showing 320 changed files with 20,260 additions and 13,350 deletions.
@@ -1,5 +1,7 @@
*.i??
.project
.metadata
.idea
.classpath
.settings
target
69 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>