Merge branch 'master' of https://github.com/ibissource/iaf.git

emilykok · Nov 11, 2013 · 3e65b9b · 3e65b9b
2 parents d19b8fb + 800f14d
commit 3e65b9b
Showing 11 changed files with 185 additions and 504 deletions.
diff --git a/coolgen/pom.xml b/coolgen/pom.xml
@@ -6,25 +6,20 @@
     <artifactId>ibis-parent</artifactId>
     <version>5.0.29-SNAPSHOT</version>
   </parent>
+
   <artifactId>ibis-adapterframework-coolgen</artifactId>
   <name>Ibis AdapterFramework support for CoolGen</name>
 
-  <properties>
-    <iaf-lib.basedir>${basedir}/../../iaf-lib</iaf-lib.basedir>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.ibissource</groupId>
       <artifactId>ibis-adapterframework-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>nl.nn.coolgen</groupId>
+      <groupId>nl.nn</groupId>
       <artifactId>coolgen</artifactId>
       <version>0</version>
-      <systemPath>${iaf-lib.basedir}/coolgen/NNCoolgenJavaProxies.jar</systemPath>
-      <scope>system</scope>
     </dependency>
- </dependencies>
+  </dependencies>
 
-</project>
+</project>