rectified maven build

xwiki-contrib · Jul 2, 2012 · f9d31c6 · f9d31c6
1 parent e98891a
commit f9d31c6
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 0 deletions.
diff --git a/xwiki-android-rest/pom.xml b/xwiki-android-rest/pom.xml
@@ -42,6 +42,29 @@
 			<artifactId>xwiki-rest-simplexml-model</artifactId>
 			<version>${project.version}</version> 
 		</dependency>
+
+		<dependency>
+		    <groupId>org.simpleframework</groupId>
+		    <artifactId>simple-xml</artifactId>
+		    <version>2.6</version>
+		    <exclusions>
+		        <!-- StAX is not available on Android -->
+		        <exclusion>
+		            <artifactId>stax</artifactId>
+		            <groupId>stax</groupId>
+		        </exclusion>
+		        <exclusion>
+		            <artifactId>stax-api</artifactId>
+		            <groupId>stax</groupId>
+		        </exclusion>
+		        <!-- Provided by Android -->
+		        <exclusion>
+		            <artifactId>xpp3</artifactId>
+		            <groupId>xpp3</groupId>
+		        </exclusion>
+		   	 </exclusions>
+		</dependency>
+
 	</dependencies>
 
 	<build>

diff --git a/xwiki-android-test-rest/pom.xml b/xwiki-android-test-rest/pom.xml
@@ -60,5 +60,28 @@
       <artifactId>junit-dep</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+	    <groupId>org.simpleframework</groupId>
+	    <artifactId>simple-xml</artifactId>
+	    <version>2.6</version>
+	    <exclusions>
+	        <!-- StAX is not available on Android -->
+	        <exclusion>
+	            <artifactId>stax</artifactId>
+	            <groupId>stax</groupId>
+	        </exclusion>
+	        <exclusion>
+	            <artifactId>stax-api</artifactId>
+	            <groupId>stax</groupId>
+	        </exclusion>
+	        <!-- Provided by Android -->
+	        <exclusion>
+	            <artifactId>xpp3</artifactId>
+	            <groupId>xpp3</groupId>
+	        </exclusion>
+	    </exclusions>
+	</dependency>
+
+
   </dependencies>
 </project>
diff --git a/xwiki-android-tests-instrumentation/pom.xml b/xwiki-android-tests-instrumentation/pom.xml
@@ -60,5 +60,27 @@
       <artifactId>junit-dep</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+	    <groupId>org.simpleframework</groupId>
+	    <artifactId>simple-xml</artifactId>
+	    <version>2.6</version>
+	    <exclusions>
+	        <!-- StAX is not available on Android -->
+	        <exclusion>
+	            <artifactId>stax</artifactId>
+	            <groupId>stax</groupId>
+	        </exclusion>
+	        <exclusion>
+	            <artifactId>stax-api</artifactId>
+	            <groupId>stax</groupId>
+	        </exclusion>
+	        <!-- Provided by Android -->
+	        <exclusion>
+	            <artifactId>xpp3</artifactId>
+	            <groupId>xpp3</groupId>
+	        </exclusion>
+	    </exclusions>
+	</dependency>
   </dependencies>
 </project>