svn commit: r1201637 - in /camel/trunk: components/camel-hl7/pom.xml parent/pom.xml platforms/karaf/features/src/main/resources/features.xml tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java

[da...@apache.org]

Author: davsclaus
Date: Mon Nov 14 09:08:03 2011
New Revision: 1201637

URL: http://svn.apache.org/viewvc?rev=1201637&view=rev
Log:
CAMEL-4437: Upgraded to HAPI 1.2

Modified:
    camel/trunk/components/camel-hl7/pom.xml
    camel/trunk/parent/pom.xml
    camel/trunk/platforms/karaf/features/src/main/resources/features.xml
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java

Modified: camel/trunk/components/camel-hl7/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/pom.xml?rev=1201637&r1=1201636&r2=1201637&view=diff
==============================================================================
--- camel/trunk/components/camel-hl7/pom.xml (original)
+++ camel/trunk/components/camel-hl7/pom.xml Mon Nov 14 09:08:03 2011
@@ -33,17 +33,8 @@
 
     <properties>
         <camel.osgi.export.pkg>org.apache.camel.component.hl7.*</camel.osgi.export.pkg>
-        <hapi-version>1.0.1</hapi-version>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>hapi</id>
-            <name>HAPI Maven Repository</name>
-            <url>http://hl7api.sourceforge.net/m2/</url>
-        </repository>
-    </repositories>
-
     <dependencies>
 
         <dependency>

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1201637&r1=1201636&r2=1201637&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Nov 14 09:08:03 2011
@@ -82,6 +82,7 @@
     <h2-version>1.3.161</h2-version>
     <hadoop-version>0.20.203.0</hadoop-version>
     <hamcrest-version>1.1</hamcrest-version>
+    <hapi-version>1.2</hapi-version>
     <hawtbuf-version>1.6</hawtbuf-version>
     <hawtdb-version>1.6</hawtdb-version>
     <hazelcast-version>1.9.3</hazelcast-version>

Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1201637&r1=1201636&r2=1201637&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Mon Nov 14 09:08:03 2011
@@ -309,8 +309,8 @@
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hapi/${hapi-bundle-version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version}</bundle>
+    <bundle dependency="true">mvn:ca.uhn.hapi/hapi-osgi-base/${hapi-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-hl7/${pom.version}</bundle>
   </feature>
   <feature name='camel-ibatis' version='${pom.version}' resolver='(obr)' start-level='50'>

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java?rev=1201637&r1=1201636&r2=1201637&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java Mon Nov 14 09:08:03 2011
@@ -21,7 +21,6 @@ import ca.uhn.hl7v2.model.v24.segment.MS
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
@@ -33,7 +32,6 @@ import static org.ops4j.pax.exam.OptionU
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
 
 @RunWith(JUnit4TestRunner.class)
-@Ignore("HAPI bundle is wrong")
 public class HL7MLLPCodec2Test extends OSGiIntegrationSpringTestSupport implements Processor {
 
     @Override