You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2010/11/18 10:58:55 UTC

svn commit: r1036377 - in /servicemix/components/bindings/servicemix-xmpp/trunk: .gitignore pom.xml

Author: jbonofre
Date: Thu Nov 18 09:58:55 2010
New Revision: 1036377

URL: http://svn.apache.org/viewvc?rev=1036377&view=rev
Log:
Cleanup POM and align dependencies.

Added:
    servicemix/components/bindings/servicemix-xmpp/trunk/.gitignore
Modified:
    servicemix/components/bindings/servicemix-xmpp/trunk/pom.xml

Added: servicemix/components/bindings/servicemix-xmpp/trunk/.gitignore
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-xmpp/trunk/.gitignore?rev=1036377&view=auto
==============================================================================
--- servicemix/components/bindings/servicemix-xmpp/trunk/.gitignore (added)
+++ servicemix/components/bindings/servicemix-xmpp/trunk/.gitignore Thu Nov 18 09:58:55 2010
@@ -0,0 +1,5 @@
+target
+.project
+.classpath
+.settings
+*.i??
\ No newline at end of file

Modified: servicemix/components/bindings/servicemix-xmpp/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-xmpp/trunk/pom.xml?rev=1036377&r1=1036376&r2=1036377&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-xmpp/trunk/pom.xml (original)
+++ servicemix/components/bindings/servicemix-xmpp/trunk/pom.xml Thu Nov 18 09:58:55 2010
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
     <!--
 
         Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,12 +18,14 @@
         See the License for the specific language governing permissions and
         limitations under the License.
     -->
+
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.apache.servicemix</groupId>
         <artifactId>components-pom</artifactId>
         <version>6-SNAPSHOT</version>
-        <relativePath>../../components-pom/pom.xml</relativePath>    
+        <relativePath>../../components-pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.servicemix</groupId>
@@ -39,6 +42,8 @@
     </scm>
 
     <properties>
+        <smack.bundle.version>3.1.0_2</smack.bundle.version>
+
         <servicemix.osgi.import>
             !org.apache.servicemix.xmpp*,
             !META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.xmpp,
@@ -63,29 +68,41 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-shared</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
-            <scope>provided</scope>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.1_spec</artifactId>
+        </dependency>        
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-shared</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.smack</artifactId>
-            <version>3.1.0_1</version>
+            <version>${smack.bundle.version}</version>
         </dependency>
+
+        <!-- provided -->
         <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- for unit/integration testing -->
+        <!-- test -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-core</artifactId>
@@ -97,17 +114,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>2.4</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -150,4 +156,5 @@
             </plugin>
         </plugins>
     </build>
+    
 </project>