servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r667527 - /servicemix/components/components-pom/trunk/pom.xml
Date Fri, 13 Jun 2008 13:26:03 GMT
Author: chirino
Date: Fri Jun 13 06:26:03 2008
New Revision: 667527

URL: http://svn.apache.org/viewvc?rev=667527&view=rev
Log:
Update to use the newly released servicemix-build module.

Modified:
    servicemix/components/components-pom/trunk/pom.xml

Modified: servicemix/components/components-pom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/components-pom/trunk/pom.xml?rev=667527&r1=667526&r2=667527&view=diff
==============================================================================
--- servicemix/components/components-pom/trunk/pom.xml (original)
+++ servicemix/components/components-pom/trunk/pom.xml Fri Jun 13 06:26:03 2008
@@ -55,19 +55,29 @@
     <snapshots-repo-id>apache.snapshots</snapshots-repo-id>
     <snapshots-repo-name>Apache Snapshots Repository</snapshots-repo-name>
     <snapshots-repo-url>http://people.apache.org/repo/m2-snapshot-repository</snapshots-repo-url>
+    
+    
     <servicemix-version>3.2.1</servicemix-version>
     <servicemix-legal-version>1.0</servicemix-legal-version>
+
+    <cxf-version>2.1.1-SNAPSHOT</cxf-version>
+    <activemq-version>5.1.0</activemq-version>
+
+    <jaxb.version>2.1</jaxb.version>
+    <jaxb.impl.version>2.1.6</jaxb.impl.version>
+    <jaxb.xjc.version>2.1.6</jaxb.xjc.version>
+    <xbean-version>3.4.1</xbean-version>
+    <spring-version>2.0.6</spring-version>
+    <jetty-version>6.1.6</jetty-version>
+
+    <!-- We should work on moving these dependencies down into the component poms -->
     <xfire-jsr181-api-version>1.0-M1</xfire-jsr181-api-version>
     <xfire-version>1.2.5</xfire-version>
     <mavenAssemblyPluginVersion>2.1</mavenAssemblyPluginVersion>
-    <xbean-version>3.4.1</xbean-version>
-    <spring-version>2.0.6</spring-version>
-    <activemq-version>5.1.0</activemq-version>
     <activeio-version>3.1.0</activeio-version>
     <backport-util-concurrent-version>2.2</backport-util-concurrent-version>
     <camel-version>1.3.0</camel-version>
     <jencks-version>2.1</jencks-version>
-    <jetty-version>6.1.6</jetty-version>
     <geronimo-version>2.0.1</geronimo-version>
     <wsdl4j-version>1.6.1</wsdl4j-version>
     <commons-beanutils-version>1.7.0</commons-beanutils-version>
@@ -77,16 +87,9 @@
     <oro-version>2.0.8</oro-version>
     <sitemesh-version>2.2.1</sitemesh-version>
     <woden-version>1.0.0M6</woden-version>
-    <cxf-version>2.1.1-SNAPSHOT</cxf-version>
-    <jaxb.version>2.1</jaxb.version>
-    <jaxb.impl.version>2.1.6</jaxb.impl.version>
-    <jaxb.xjc.version>2.1.6</jaxb.xjc.version>
     <derby-version>10.2.2.0</derby-version>
     <saxon-version>8.9</saxon-version>
-    <felix-plugin-version>1.4.1</felix-plugin-version>
 
-    <servicemix.osgi.export>org.apache.servicemix*</servicemix.osgi.export>
-    <servicemix.osgi.import>*</servicemix.osgi.import>
   </properties>
   
   <build>
@@ -182,8 +185,8 @@
       <!-- Is this plugin REALLY needed? the <goal>spring.schemas</goal> was
not released in the 3.2.1 version -->
       <plugin>
         <groupId>org.apache.servicemix</groupId>
-        <artifactId>build</artifactId>
-        <version>3.3-SNAPSHOT</version>
+        <artifactId>servicemix-build</artifactId>
+        <version>1.0</version>
         <executions>
           <execution>
             <goals>
@@ -232,8 +235,8 @@
         <dependencies>
           <dependency>
             <groupId>org.apache.servicemix</groupId>
-            <artifactId>build</artifactId>
-            <version>${servicemix-version}</version>
+            <artifactId>servicemix-build</artifactId>
+            <version>1.0</version>
           </dependency>
         </dependencies>
         <executions>
@@ -260,13 +263,13 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>${felix-plugin-version}</version>
+        <version>1.4.1</version>
         <configuration>
           <instructions>
             <Bundle-Name>${project.name}</Bundle-Name>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
-            <Export-Package>${servicemix.osgi.export}</Export-Package>
-            <Import-Package>${servicemix.osgi.import}</Import-Package>
+            <Export-Package>org.apache.servicemix*</Export-Package>
+            <Import-Package>*</Import-Package>
             <Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
           </instructions>
           <supportedProjectTypes>
@@ -437,8 +440,8 @@
             <dependencies>
               <dependency>
                 <groupId>org.apache.servicemix</groupId>
-                <artifactId>build</artifactId>
-                <version>${servicemix-version}</version>
+                <artifactId>servicemix-build</artifactId>
+                <version>1.0</version>
               </dependency>
             </dependencies>
             <executions>
@@ -467,8 +470,8 @@
             <dependencies>
               <dependency>
                 <groupId>org.apache.servicemix</groupId>
-                <artifactId>build</artifactId>
-                <version>${servicemix-version}</version>
+                <artifactId>servicemix-build</artifactId>
+                <version>1.0</version>
               </dependency>
             </dependencies>
             <configuration>
@@ -533,8 +536,8 @@
             <dependencies>
               <dependency>
                 <groupId>org.apache.servicemix</groupId>
-                <artifactId>build</artifactId>
-                <version>${project.version}</version>
+                <artifactId>servicemix-build</artifactId>
+                <version>1.0</version>
               </dependency>
             </dependencies>
             <executions>
@@ -619,102 +622,109 @@
       </pluginRepositories>
     </profile>
   </profiles>
+  
 <!-- 
-    Most components should build fine just using the central maven repo.. adding all the
possible 
-    repo location in this parent pom just slows down the dowloads for other components since

-    it's going to check all the repos listed.  Keep this section commented out, and only
enable
-    if a dependency does not download from the central repo. Use it to fine the repo that
has the 
-    dependency and add that repo to just that component so only that component pays the price
of checking
-    multiple repos. -->
-<!--
-    <repositories>
-        <repository>
-            <id>servicemix-m2-repo</id>
-            <name>Servicemix Maven2 Repository</name>
-            <url>http://svn.apache.org/repos/asf/servicemix/m2-repo/</url>
-        </repository>
-        <repository>
-            <id>apache-incubating</id>
-            <name>Apache Incubating Repository</name>
-            <url>http://people.apache.org/repo/m2-incubating-repository</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshot repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>codehaus</id>
-            <name>Codehaus repository</name>
-            <url>http://repository.codehaus.org</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>apache-releases</id>
-            <name>Apache Releases repository</name>
-            <url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>servicemix-m2-repo</id>
-            <name>Servicemix Maven2 Repository</name>
-            <url>http://svn.apache.org/repos/asf/servicemix/m2-repo/</url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>apache-incubating</id>
-            <name>Apache Incubating Repository</name>
-            <url>http://people.apache.org/repo/m2-incubating-repository</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshot repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
+  Most components should build fine just using the central maven repo.. adding all the possible

+  repo location in this parent pom just slows down the dowloads for other components since

+  it's going to check all the repos listed.  Keep this section commented out, and only enable
+  if a dependency does not download from the central repo. Use it to fine the repo that has
the 
+  dependency and add that repo to just that component so only that component pays the price
of checking
+  multiple repos. 
 -->
+  <repositories>
+      <repository>
+          <id>apache-snapshots</id>
+          <name>Apache Snapshot repository</name>
+          <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+          <releases>
+              <enabled>false</enabled>
+          </releases>
+          <snapshots>
+              <enabled>true</enabled>
+          </snapshots>
+      </repository>
+<!--      
+      <repository>
+          <id>servicemix-m2-repo</id>
+          <name>Servicemix Maven2 Repository</name>
+          <url>http://svn.apache.org/repos/asf/servicemix/m2-repo/</url>
+      </repository>
+      <repository>
+          <id>apache-incubating</id>
+          <name>Apache Incubating Repository</name>
+          <url>http://people.apache.org/repo/m2-incubating-repository</url>
+          <releases>
+              <enabled>true</enabled>
+          </releases>
+          <snapshots>
+              <enabled>false</enabled>
+          </snapshots>
+      </repository>
+      <repository>
+          <id>codehaus</id>
+          <name>Codehaus repository</name>
+          <url>http://repository.codehaus.org</url>
+          <releases>
+              <enabled>true</enabled>
+          </releases>
+          <snapshots>
+              <enabled>true</enabled>
+          </snapshots>
+      </repository>
+      <repository>
+          <id>java.net</id>
+          <url>http://download.java.net/maven/1</url>
+          <layout>legacy</layout>
+      </repository>
+-->        
+  </repositories>
+  <pluginRepositories>
+      <pluginRepository>
+          <id>apache-snapshots</id>
+          <name>Apache Snapshot repository</name>
+          <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+          <releases>
+              <enabled>false</enabled>
+          </releases>
+          <snapshots>
+              <enabled>true</enabled>
+          </snapshots>
+      </pluginRepository>
+<!--      
+      <pluginRepository>
+          <id>apache-releases</id>
+          <name>Apache Releases repository</name>
+          <url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+          <releases>
+              <enabled>true</enabled>
+          </releases>
+          <snapshots>
+              <enabled>false</enabled>
+          </snapshots>
+      </pluginRepository>
+      <pluginRepository>
+          <id>servicemix-m2-repo</id>
+          <name>Servicemix Maven2 Repository</name>
+          <url>http://svn.apache.org/repos/asf/servicemix/m2-repo/</url>
+      </pluginRepository>
+      <pluginRepository>
+          <id>apache-incubating</id>
+          <name>Apache Incubating Repository</name>
+          <url>http://people.apache.org/repo/m2-incubating-repository</url>
+          <releases>
+              <enabled>true</enabled>
+          </releases>
+          <snapshots>
+              <enabled>false</enabled>
+          </snapshots>
+      </pluginRepository>
+-->        
+  </pluginRepositories>
+  
   <dependencyManagement>
     <dependencies>
+      
+      <!-- The ServiceMix Dependencies, Only here so we can test against them? -->
       <dependency>
         <groupId>org.apache.servicemix</groupId>
         <artifactId>servicemix-jbi</artifactId>
@@ -722,12 +732,12 @@
       </dependency>
       <dependency>
         <groupId>org.apache.servicemix</groupId>
-        <artifactId>servicemix-services</artifactId>
+        <artifactId>servicemix-core</artifactId>
         <version>${servicemix-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.servicemix</groupId>
-        <artifactId>servicemix-core</artifactId>
+        <artifactId>servicemix-services</artifactId>
         <version>${servicemix-version}</version>
       </dependency>
       <dependency>
@@ -1983,6 +1993,8 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
+  
+  
   <!--
   <distributionManagement>
       <site>



Mime
View raw message