You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/01/31 14:36:12 UTC

svn commit: r501837 [3/5] - in /incubator/servicemix/branches/servicemix-3.1: ./ archetypes/ archetypes/servicemix-archetypes-itests/ archetypes/servicemix-binding-component/ archetypes/servicemix-eip-service-unit/ archetypes/servicemix-embedded-simple...

Modified: incubator/servicemix/branches/servicemix-3.1/deployables/sharedlibraries/servicemix-shared/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/deployables/sharedlibraries/servicemix-shared/pom.xml?view=diff&rev=501837&r1=501836&r2=501837
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/deployables/sharedlibraries/servicemix-shared/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/deployables/sharedlibraries/servicemix-shared/pom.xml Wed Jan 31 05:36:09 2007
@@ -1,77 +1,76 @@
-<?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">
-
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    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>sharedlibraries</artifactId>
-    <version>3.1-incubating-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>servicemix-shared</artifactId>
-  <packaging>jbi-shared-library</packaging>
-  <name>ServiceMix :: Shared</name>
-  <description>ServiceMix Shared Library</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-soap</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>wsdl4j</groupId>
-      <artifactId>wsdl4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>      
-      <plugin>
-        <groupId>org.apache.servicemix.tooling</groupId>
-        <artifactId>jbi-maven-plugin</artifactId>
-        <configuration>
-          <!-- 
-               make sure parent first delegation is used because 
-               we include duplicates libraries shipped with servicemix
-            -->
-          <classLoaderDelegation>parent-first</classLoaderDelegation>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
+<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">
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    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>sharedlibraries</artifactId>
+    <version>3.1-incubating</version>
+  </parent>
+
+  <artifactId>servicemix-shared</artifactId>
+  <packaging>jbi-shared-library</packaging>
+  <name>ServiceMix :: Shared</name>
+  <description>ServiceMix Shared Library</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.servicemix</groupId>
+      <artifactId>servicemix-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix</groupId>
+      <artifactId>servicemix-soap</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>wsdl4j</groupId>
+      <artifactId>wsdl4j</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>      
+      <plugin>
+        <groupId>org.apache.servicemix.tooling</groupId>
+        <artifactId>jbi-maven-plugin</artifactId>
+        <configuration>
+          <!-- 
+               make sure parent first delegation is used because 
+               we include duplicates libraries shipped with servicemix
+            -->
+          <classLoaderDelegation>parent-first</classLoaderDelegation>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
\ No newline at end of file

Modified: incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix-web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix-web/pom.xml?view=diff&rev=501837&r1=501836&r2=501837
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix-web/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix-web/pom.xml Wed Jan 31 05:36:09 2007
@@ -1,177 +1,177 @@
-<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">
-
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    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>assemblies</artifactId>
-    <version>3.1-incubating-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>apache-servicemix-web</artifactId>
-  <packaging>war</packaging>
-  <name>ServiceMix :: WebApp distribution</name>
-  <description>WebApp distribution</description>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-web-console</artifactId>
-      <type>war</type>
-    </dependency>
-    <!-- It seems to be needed to avoid including this jar inside the war 
-         Need to find where it comes from -->
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-core</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.geronimo.modules</groupId>
-          <artifactId>geronimo-transaction</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.modules</groupId>
-          <artifactId>geronimo-connector</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-jms_1.1_spec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jencks</groupId>
-          <artifactId>jencks</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.xbean</groupId>
-          <artifactId>xbean-naming</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.activemq</groupId>
-          <artifactId>activemq-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jaxen</groupId>
-          <artifactId>jaxen</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>hsqldb</groupId>
-          <artifactId>hsqldb</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xalan</groupId>
-          <artifactId>xalan</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xerces</groupId>
-          <artifactId>xercesImpl</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>mx4j</groupId>
-          <artifactId>mx4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>mx4j</groupId>
-          <artifactId>mx4j-remote</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xml-apis</groupId>
-          <artifactId>xml-apis</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>${spring-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>wsdl4j</groupId>
-      <artifactId>wsdl4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>javax.activation</groupId>
-      <artifactId>activation</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.mail</groupId>
-      <artifactId>mail</artifactId>
-      <version>1.4</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <warSourceDirectory>src/main/webapp/</warSourceDirectory>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
-        <version>${jetty-version}</version>
-        <configuration>
-          <connectors>
-            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-              <port>${jetty.port}</port>
-              <maxIdleTime>60000</maxIdleTime>
-            </connector>
-          </connectors>
-          <systemProperties>
-            <!-- enable easy connection to JConsole -->
-            <systemProperty>
-              <name>com.sun.management.jmxremote</name>
-              <value />
-            </systemProperty>
-          </systemProperties>
-          <scanIntervalSeconds>10</scanIntervalSeconds>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <properties>
-    <jetty.port>8080</jetty.port>
-  </properties>
-
+<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">
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    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>assemblies</artifactId>
+    <version>3.1-incubating</version>
+  </parent>
+
+  <artifactId>apache-servicemix-web</artifactId>
+  <packaging>war</packaging>
+  <name>ServiceMix :: WebApp distribution</name>
+  <description>WebApp distribution</description>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>org.apache.servicemix</groupId>
+      <artifactId>servicemix-web-console</artifactId>
+      <type>war</type>
+    </dependency>
+    <!-- It seems to be needed to avoid including this jar inside the war 
+         Need to find where it comes from -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix</groupId>
+      <artifactId>servicemix-core</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.geronimo.modules</groupId>
+          <artifactId>geronimo-transaction</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.geronimo.modules</groupId>
+          <artifactId>geronimo-connector</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-jms_1.1_spec</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jencks</groupId>
+          <artifactId>jencks</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.xbean</groupId>
+          <artifactId>xbean-naming</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.activemq</groupId>
+          <artifactId>activemq-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jaxen</groupId>
+          <artifactId>jaxen</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>hsqldb</groupId>
+          <artifactId>hsqldb</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xalan</groupId>
+          <artifactId>xalan</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>mx4j</groupId>
+          <artifactId>mx4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>mx4j</groupId>
+          <artifactId>mx4j-remote</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>${spring-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>wsdl4j</groupId>
+      <artifactId>wsdl4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <version>1.4</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <warSourceDirectory>src/main/webapp/</warSourceDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>maven-jetty-plugin</artifactId>
+        <version>${jetty-version}</version>
+        <configuration>
+          <connectors>
+            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+              <port>${jetty.port}</port>
+              <maxIdleTime>60000</maxIdleTime>
+            </connector>
+          </connectors>
+          <systemProperties>
+            <!-- enable easy connection to JConsole -->
+            <systemProperty>
+              <name>com.sun.management.jmxremote</name>
+              <value />
+            </systemProperty>
+          </systemProperties>
+          <scanIntervalSeconds>10</scanIntervalSeconds>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <properties>
+    <jetty.port>8080</jetty.port>
+  </properties>
+
 </project>

Modified: incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/pom.xml?view=diff&rev=501837&r1=501836&r2=501837
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/pom.xml Wed Jan 31 05:36:09 2007
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>assemblies</artifactId>
-    <version>3.1-incubating-SNAPSHOT</version>
+    <version>3.1-incubating</version>
   </parent>
 
   <artifactId>apache-servicemix</artifactId>

Modified: incubator/servicemix/branches/servicemix-3.1/distributions/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/distributions/pom.xml?view=diff&rev=501837&r1=501836&r2=501837
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/distributions/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/distributions/pom.xml Wed Jan 31 05:36:09 2007
@@ -1,68 +1,68 @@
-<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">
-
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    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>servicemix</artifactId>
-    <version>3.1-incubating-SNAPSHOT</version>
-  </parent>
-  
-  <groupId>org.apache.servicemix</groupId>
-  <artifactId>assemblies</artifactId>
-  <version>3.1-incubating-SNAPSHOT</version>
-  <name>ServiceMix :: Assemblies</name>
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>apache-servicemix</module>
-    <module>apache-servicemix-web</module>
-  </modules>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix</groupId>
-                <artifactId>build</artifactId>
-                <version>${servicemix-version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>build</artifactId>
-                        <version>3.1-incubating-SNAPSHOT</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-
+<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">
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    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>servicemix</artifactId>
+    <version>3.1-incubating</version>
+  </parent>
+  
+  <groupId>org.apache.servicemix</groupId>
+  <artifactId>assemblies</artifactId>
+  <version>3.1-incubating</version>
+  <name>ServiceMix :: Assemblies</name>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>apache-servicemix</module>
+    <module>apache-servicemix-web</module>
+  </modules>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.servicemix</groupId>
+                <artifactId>build</artifactId>
+                <version>${servicemix-version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.servicemix</groupId>
+                        <artifactId>build</artifactId>
+                        <version>3.1-incubating-SNAPSHOT</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/dependencies/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/dependencies/pom.xml?view=diff&rev=501837&r1=501836&r2=501837
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/dependencies/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/dependencies/pom.xml Wed Jan 31 05:36:09 2007
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.servicemix.geronimo</groupId>
         <artifactId>geronimo</artifactId>
-        <version>3.1-incubating-SNAPSHOT</version>
+        <version>3.1-incubating</version>
     </parent>
 
     <artifactId>dependencies</artifactId>

Modified: incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/deployer-service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/deployer-service/pom.xml?view=diff&rev=501837&r1=501836&r2=501837
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/deployer-service/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/deployer-service/pom.xml Wed Jan 31 05:36:09 2007
@@ -1,73 +1,72 @@
-<?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">
-
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix.geronimo</groupId>
-        <artifactId>geronimo</artifactId>
-        <version>3.1-incubating-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>deployer-service</artifactId>
-    <name>ServiceMix :: Geronimo :: Deployer service</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix.geronimo</groupId>
-            <artifactId>servicemix-service</artifactId>
-            <version>3.1-incubating-SNAPSHOT</version>
-            <type>jar</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${geronimo-version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-deployment</artifactId>
-            <version>${geronimo-version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
-            <version>${geronimo-version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-common</artifactId>
-            <version>${geronimo-version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-j2ee</artifactId>
-            <version>${geronimo-version}</version>
-        </dependency>
-
-    </dependencies>
-
-</project>
+<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">
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.servicemix.geronimo</groupId>
+        <artifactId>geronimo</artifactId>
+        <version>3.1-incubating</version>
+    </parent>
+
+    <artifactId>deployer-service</artifactId>
+    <name>ServiceMix :: Geronimo :: Deployer service</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.servicemix.geronimo</groupId>
+            <artifactId>servicemix-service</artifactId>
+            <version>3.1-incubating</version>
+            <type>jar</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${geronimo-version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deployment</artifactId>
+            <version>${geronimo-version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${geronimo-version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-common</artifactId>
+            <version>${geronimo-version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+            <version>${geronimo-version}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>
\ No newline at end of file

Modified: incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/deployer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/deployer/pom.xml?view=diff&rev=501837&r1=501836&r2=501837
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/deployer/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/deployer/pom.xml Wed Jan 31 05:36:09 2007
@@ -1,85 +1,84 @@
-<?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">
-
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix.geronimo</groupId>
-        <artifactId>geronimo</artifactId>
-        <version>3.1-incubating-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>deployer</artifactId>
-    <name>ServiceMix :: Geronimo :: Deployer plugin</name>
-    <packaging>car</packaging>
-
-    <dependencies>
-        <!-- Needed to download dependencies -->
-        <dependency>
-            <groupId>org.apache.servicemix.geronimo</groupId>
-            <artifactId>dependencies</artifactId>
-            <version>3.1-incubating-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.geronimo</groupId>
-            <artifactId>deployer-service</artifactId>
-            <version>${servicemix-version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.geronimo</groupId>
-            <artifactId>servicemix</artifactId>
-            <version>${servicemix-version}</version>
-            <type>car</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/resources/META-INF</directory>
-                <includes>
-                    <include>geronimo-plugin.xml</include>
-                </includes>
-                <targetPath>META-INF</targetPath>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <version>${car-maven-plugin-version}</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <planFileName>geronimo-service.xml</planFileName>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>    
-</project>
+<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">
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.servicemix.geronimo</groupId>
+        <artifactId>geronimo</artifactId>
+        <version>3.1-incubating</version>
+    </parent>
+
+    <artifactId>deployer</artifactId>
+    <name>ServiceMix :: Geronimo :: Deployer plugin</name>
+    <packaging>car</packaging>
+
+    <dependencies>
+        <!-- Needed to download dependencies -->
+        <dependency>
+            <groupId>org.apache.servicemix.geronimo</groupId>
+            <artifactId>dependencies</artifactId>
+            <version>3.1-incubating</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.geronimo</groupId>
+            <artifactId>deployer-service</artifactId>
+            <version>${servicemix-version}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.geronimo</groupId>
+            <artifactId>servicemix</artifactId>
+            <version>${servicemix-version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/resources/META-INF</directory>
+                <includes>
+                    <include>geronimo-plugin.xml</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <version>${car-maven-plugin-version}</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <planFileName>geronimo-service.xml</planFileName>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>    
+</project>
\ No newline at end of file

Modified: incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/pom.xml?view=diff&rev=501837&r1=501836&r2=501837
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/pom.xml Wed Jan 31 05:36:09 2007
@@ -1,51 +1,50 @@
-<?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">
-
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    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>platforms</artifactId>
-        <version>3.1-incubating-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
-    <name>Servicemix :: Geronimo</name>
-    <packaging>pom</packaging>
-  
-    <properties>
-        <geronimo-version>1.2-beta</geronimo-version>
-        <geronimoVersion>${geronimo-version}</geronimoVersion>
-        <car-maven-plugin-version>${geronimo-version}</car-maven-plugin-version>
-        <geronimoSchemaVersion>1.2</geronimoSchemaVersion>
-        <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car</gbeanDeployer>
-    </properties>
-    
-    <modules>
-        <module>servicemix-service</module>
-        <module>deployer-service</module>
-        <module>dependencies</module>
-        <module>servicemix</module>
-        <module>deployer</module>
-    </modules>
-
-</project>
+<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">
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    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>platforms</artifactId>
+        <version>3.1-incubating</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.geronimo</groupId>
+    <artifactId>geronimo</artifactId>
+    <name>Servicemix :: Geronimo</name>
+    <packaging>pom</packaging>
+  
+    <properties>
+        <geronimo-version>1.2-beta</geronimo-version>
+        <geronimoVersion>${geronimo-version}</geronimoVersion>
+        <car-maven-plugin-version>${geronimo-version}</car-maven-plugin-version>
+        <geronimoSchemaVersion>1.2</geronimoSchemaVersion>
+        <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car</gbeanDeployer>
+    </properties>
+    
+    <modules>
+        <module>servicemix-service</module>
+        <module>deployer-service</module>
+        <module>dependencies</module>
+        <module>servicemix</module>
+        <module>deployer</module>
+    </modules>
+
+</project>
\ No newline at end of file

Modified: incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/servicemix-service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/servicemix-service/pom.xml?view=diff&rev=501837&r1=501836&r2=501837
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/servicemix-service/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/servicemix-service/pom.xml Wed Jan 31 05:36:09 2007
@@ -1,46 +1,45 @@
-<?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">
-
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix.geronimo</groupId>
-        <artifactId>geronimo</artifactId>
-        <version>3.1-incubating-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>servicemix-service</artifactId>
-    <name>ServiceMix :: Geronimo :: ServiceMix service</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-core</artifactId>
-            <version>${servicemix-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${geronimo-version}</version>
-        </dependency>
-    </dependencies>
-
-</project>
+<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">
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.servicemix.geronimo</groupId>
+        <artifactId>geronimo</artifactId>
+        <version>3.1-incubating</version>
+    </parent>
+
+    <artifactId>servicemix-service</artifactId>
+    <name>ServiceMix :: Geronimo :: ServiceMix service</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-core</artifactId>
+            <version>${servicemix-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${geronimo-version}</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file

Modified: incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/servicemix/pom.xml?view=diff&rev=501837&r1=501836&r2=501837
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/servicemix/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/servicemix/pom.xml Wed Jan 31 05:36:09 2007
@@ -1,184 +1,183 @@
-<?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">
-
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix.geronimo</groupId>
-        <artifactId>geronimo</artifactId>
-        <version>3.1-incubating-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>servicemix</artifactId>
-    <name>ServiceMix :: Geronimo :: ServiceMix plugin</name>
-    <packaging>car</packaging>
-
-    <dependencies>
-        <!-- Needed to download Geronimo dependencies -->
-        <dependency>
-            <groupId>org.apache.servicemix.geronimo</groupId>
-            <artifactId>dependencies</artifactId>
-            <version>3.1-incubating-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- For build ordering -->
-        <dependency>
-            <groupId>org.apache.servicemix.geronimo</groupId>
-            <artifactId>servicemix-service</artifactId>
-            <version>3.1-incubating-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-jbi</artifactId>
-            <version>3.1-incubating-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-core</artifactId>
-            <version>3.1-incubating-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-services</artifactId>
-            <version>3.1-incubating-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activeio-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>wsdl4j</groupId>
-            <artifactId>wsdl4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jencks</groupId>
-            <artifactId>jencks</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>backport-util-concurrent</groupId>
-            <artifactId>backport-util-concurrent</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <version>${spring-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>${spring-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-dao</artifactId>
-            <version>${spring-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jmx</artifactId>
-            <version>${spring-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-spring</artifactId>
-            <version>${xbean-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-kernel</artifactId>
-            <version>${xbean-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-server</artifactId>
-            <version>${xbean-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-classloader</artifactId>
-            <version>${xbean-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>${woodstox-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-        <!-- Only needed to build the car -->
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${geronimo-version}</version>
-            <scope>provided</scope>
-            <type>car</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/resources/META-INF</directory>
-                <includes>
-                    <include>geronimo-plugin.xml</include>
-                </includes>
-                <targetPath>META-INF</targetPath>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <version>${car-maven-plugin-version}</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <planFileName>geronimo-service.xml</planFileName>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>    
-</project>
+<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">
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.servicemix.geronimo</groupId>
+        <artifactId>geronimo</artifactId>
+        <version>3.1-incubating</version>
+    </parent>
+
+    <artifactId>servicemix</artifactId>
+    <name>ServiceMix :: Geronimo :: ServiceMix plugin</name>
+    <packaging>car</packaging>
+
+    <dependencies>
+        <!-- Needed to download Geronimo dependencies -->
+        <dependency>
+            <groupId>org.apache.servicemix.geronimo</groupId>
+            <artifactId>dependencies</artifactId>
+            <version>3.1-incubating</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- For build ordering -->
+        <dependency>
+            <groupId>org.apache.servicemix.geronimo</groupId>
+            <artifactId>servicemix-service</artifactId>
+            <version>3.1-incubating</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-jbi</artifactId>
+            <version>3.1-incubating</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-core</artifactId>
+            <version>3.1-incubating</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-services</artifactId>
+            <version>3.1-incubating</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activeio-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>wsdl4j</groupId>
+            <artifactId>wsdl4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jencks</groupId>
+            <artifactId>jencks</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>${spring-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${spring-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-dao</artifactId>
+            <version>${spring-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jmx</artifactId>
+            <version>${spring-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-spring</artifactId>
+            <version>${xbean-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-kernel</artifactId>
+            <version>${xbean-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-server</artifactId>
+            <version>${xbean-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-classloader</artifactId>
+            <version>${xbean-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+            <version>${woodstox-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>transaction</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+        </dependency>
+        <!-- Only needed to build the car -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${geronimo-version}</version>
+            <scope>provided</scope>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/resources/META-INF</directory>
+                <includes>
+                    <include>geronimo-plugin.xml</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <version>${car-maven-plugin-version}</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <planFileName>geronimo-service.xml</planFileName>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>    
+</project>
\ No newline at end of file

Modified: incubator/servicemix/branches/servicemix-3.1/platforms/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/platforms/pom.xml?view=diff&rev=501837&r1=501836&r2=501837
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/platforms/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/platforms/pom.xml Wed Jan 31 05:36:09 2007
@@ -1,67 +1,67 @@
-<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">
-
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    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>servicemix</artifactId>
-    <version>3.1-incubating-SNAPSHOT</version>
-  </parent>
-  
-  <groupId>org.apache.servicemix</groupId>
-  <artifactId>platforms</artifactId>
-  <version>3.1-incubating-SNAPSHOT</version>
-  <name>ServiceMix :: Platforms</name>
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>geronimo</module>
-  </modules>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix</groupId>
-                <artifactId>build</artifactId>
-                <version>${servicemix-version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>build</artifactId>
-                        <version>3.1-incubating-SNAPSHOT</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-
+<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">
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    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>servicemix</artifactId>
+    <version>3.1-incubating</version>
+  </parent>
+  
+  <groupId>org.apache.servicemix</groupId>
+  <artifactId>platforms</artifactId>
+  <version>3.1-incubating</version>
+  <name>ServiceMix :: Platforms</name>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>geronimo</module>
+  </modules>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.servicemix</groupId>
+                <artifactId>build</artifactId>
+                <version>${servicemix-version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.servicemix</groupId>
+                        <artifactId>build</artifactId>
+                        <version>3.1-incubating-SNAPSHOT</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: incubator/servicemix/branches/servicemix-3.1/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/pom.xml?view=diff&rev=501837&r1=501836&r2=501837
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/pom.xml Wed Jan 31 05:36:09 2007
@@ -30,7 +30,7 @@
     <artifactId>servicemix</artifactId>
     <packaging>pom</packaging>
     <name>ServiceMix</name>
-    <version>3.1-incubating-SNAPSHOT</version>
+    <version>3.1-incubating</version>
     <description>
     ServiceMix is an open source ESB based on the Java Business
     Integration framework - JSR-208 
@@ -186,9 +186,9 @@
     </developers>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/servicemix/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/servicemix/trunk</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/incubator/servicemix/trunk</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/servicemix/tags/servicemix-3.1</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/servicemix/tags/servicemix-3.1</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/incubator/servicemix/tags/servicemix-3.1</url>
     </scm>
 
     <properties>
@@ -393,37 +393,37 @@
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-jbi</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-services</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-core</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-audit</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-components</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-common</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-console</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
@@ -433,117 +433,117 @@
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-jms</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-jsr181</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-http</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-sca</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-soap</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-shared</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-wsn2005</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-lwcontainer</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-eip</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-script</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-file</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-ftp</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-xmpp</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-quartz</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-saxon</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix.samples</groupId>
                 <artifactId>servicemix-web</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
                 <type>war</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix.samples</groupId>
                 <artifactId>wsdl-first</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix.samples</groupId>
                 <artifactId>loan-broker</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix.samples</groupId>
                 <artifactId>bridge</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix.samples</groupId>
                 <artifactId>basic</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-beanflow</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-web-console</artifactId>
-                <version>3.1-incubating-SNAPSHOT</version>
+                <version>3.1-incubating</version>
                 <type>war</type>
             </dependency>
 
@@ -1666,7 +1666,7 @@
                 <plugin>
                     <groupId>org.apache.servicemix.tooling</groupId>
                     <artifactId>jbi-maven-plugin</artifactId>
-                    <version>3.1-incubating-SNAPSHOT</version>
+                    <version>3.1-incubating</version>
                     <extensions>true</extensions>
                 </plugin>
                 <plugin>
@@ -1786,4 +1786,4 @@
             </plugin>
         </plugins>
     </reporting>
-</project>
+</project>
\ No newline at end of file

Modified: incubator/servicemix/branches/servicemix-3.1/samples/basic/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/samples/basic/pom.xml?view=diff&rev=501837&r1=501836&r2=501837
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/samples/basic/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/samples/basic/pom.xml Wed Jan 31 05:36:09 2007
@@ -1,116 +1,116 @@
-<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">
-
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    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>samples</artifactId>
-        <version>3.1-incubating-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.samples</groupId>
-    <artifactId>basic</artifactId>
-    <name>ServiceMix :: Samples :: Basic</name>
-
-    <!-- Add ServiceMix repository -->
-    <pluginRepositories>
-      <pluginRepository>
-        <id>apache.incubating</id>
-        <name>Apache Incubating Repository</name>
-        <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      </pluginRepository>
-    </pluginRepositories>
-    <repositories>
-      <repository>
-        <id>apache.incubating</id>
-        <name>Apache Incubating Repository</name>
-        <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-components</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-jms</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>quartz</groupId>
-            <artifactId>quartz</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-ra</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jca</artifactId>
-            <version>${spring-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jencks</groupId>
-            <artifactId>jencks-amqpool</artifactId>
-            <version>${jencks-version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.1</version>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>src</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/src.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    
-    <properties>
-        <topDirectoryLocation>../..</topDirectoryLocation>
-    </properties>
-
+<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">
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    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>samples</artifactId>
+        <version>3.1-incubating</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.samples</groupId>
+    <artifactId>basic</artifactId>
+    <name>ServiceMix :: Samples :: Basic</name>
+
+    <!-- Add ServiceMix repository -->
+    <pluginRepositories>
+      <pluginRepository>
+        <id>apache.incubating</id>
+        <name>Apache Incubating Repository</name>
+        <url>http://people.apache.org/repo/m2-incubating-repository</url>
+      </pluginRepository>
+    </pluginRepositories>
+    <repositories>
+      <repository>
+        <id>apache.incubating</id>
+        <name>Apache Incubating Repository</name>
+        <url>http://people.apache.org/repo/m2-incubating-repository</url>
+      </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-components</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-jms</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>quartz</groupId>
+            <artifactId>quartz</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-ra</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jca</artifactId>
+            <version>${spring-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jencks</groupId>
+            <artifactId>jencks-amqpool</artifactId>
+            <version>${jencks-version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.servicemix.tooling</groupId>
+                <artifactId>jbi-maven-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.1</version>
+                <inherited>false</inherited>
+                <executions>
+                    <execution>
+                        <id>src</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/src.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    
+    <properties>
+        <topDirectoryLocation>../..</topDirectoryLocation>
+    </properties>
+
 </project>