Author: sagara
Date: Wed Oct  7 18:43:18 2009
New Revision: 822838

URL: http://svn.apache.org/viewvc?rev=822838&view=rev
Log:
WODEN-224 remove dependencies and add Maven profile to handle M2 releases.

Modified:
    webservices/woden/trunk/java/pom.xml

Modified: webservices/woden/trunk/java/pom.xml
URL: 
http://svn.apache.org/viewvc/webservices/woden/trunk/java/pom.xml?rev=822838&r1=822837&r2=822838&view=diff
==============================================================================
--- webservices/woden/trunk/java/pom.xml (original)
+++ webservices/woden/trunk/java/pom.xml Wed Oct  7 18:43:18 2009
@@ -98,70 +98,19 @@
     <url>http://www.apache.org/</url>
   </organization>
   <dependencies>
-    <dependency>
-      <groupId>org.apache.ws.commons.schema</groupId>
-      <artifactId>XmlSchema</artifactId>
-      <version>1.4.6-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.ant</groupId>
-      <artifactId>ant</artifactId>
-      <version>1.7.0</version>
-    </dependency>
-    <dependency>
-      <groupId>wsdl4j</groupId>
-      <artifactId>wsdl4j</artifactId>
-      <version>1.6.2</version>
-    </dependency>
-       <!-- fixed WODEN-152 - Woden shouldn't be dependent on Xerces -->
-       <!--
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xmlParserAPIs</artifactId>
-      <version>2.6.0</version>
-         <scope>test</scope>
-    </dependency>
-       -->
-    <dependency>
-      <groupId>org.apache.ws.commons.axiom</groupId>
-      <artifactId>axiom-api</artifactId>
-      <version>1.2.9-SNAPSHOT</version>
-         <exclusions>
-                       <exclusion>
-                               <groupId>xerces</groupId>
-                               <artifactId>xercesImpl</artifactId>
-                       </exclusion>
-                       <exclusion>
-                               <groupId>xml-apis</groupId>
-                               <artifactId>xml-apis</artifactId>
-                       </exclusion>
-       </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.ws.commons.axiom</groupId>
-      <artifactId>axiom-impl</artifactId>
-      <version>1.2.9-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.woodstox</groupId>
-      <artifactId>wstx-asl</artifactId>
-      <version>3.2.4</version>
-      <scope>runtime</scope>
-    </dependency>
-       
-       
-       <!-- Logging dependencies -->  
-       <dependency>
-       <groupId>org.slf4j</groupId>
-       <artifactId>slf4j-api</artifactId>
-      <version>1.5.8</version>
-    </dependency>
-    <dependency>
+         
+         
+         <!-- Logger dependencies -->
+          <dependency>
+               <groupId>org.slf4j</groupId>
+               <artifactId>slf4j-api</artifactId>
+               <version>${slf4.version}</version>
+          </dependency>  
+          <dependency>
                <groupId>org.slf4j</groupId>
                <artifactId>slf4j-log4j12</artifactId>
-               <version>1.5.6</version>
+               <version>${slf4.version}</version>
+               <scope>runtime</scope>
                <exclusions>
              <exclusion>
                    <groupId>log4j</groupId>
@@ -172,7 +121,8 @@
        <dependency>
                <groupId>log4j</groupId>
                <artifactId>log4j</artifactId>
-               <version>1.2.15</version>
+               <version>${lof4j.version}</version>
+               <scope>runtime</scope>
                <exclusions>
                     <exclusion>
                         <groupId>javax.mail</groupId>
@@ -200,22 +150,19 @@
                     </exclusion>
              </exclusions>
        </dependency>
-
-    <dependency>
+         
+   
+         <!-- Test dependencies -->
+         <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.2</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.8.1</version>
-         <scope>test</scope>
-        </dependency>
        
   </dependencies>
   <build>
+  <!--
       <plugins>
           <plugin>
             <artifactId>maven-jar-plugin</artifactId>
@@ -244,7 +191,7 @@
               </execution>
             </executions>
           </plugin>
-      </plugins>
+      </plugins> -->
   </build>
   <distributionManagement>
     <snapshotRepository>
@@ -254,18 +201,54 @@
       <uniqueVersion>false</uniqueVersion>
     </snapshotRepository>
   </distributionManagement>
-  <modules>
-    <module>woden-qname</module>
-    <module>woden-api</module>
-    <module>woden-commons</module>
-    <module>woden-dom</module>
-    <module>woden-om</module>
-    <module>woden-tests</module>
-    <module>woden-ant</module>
-    <module>woden-tool</module>
-  </modules>
-    <properties>
-        <woden.osgi.version>1.0.0</woden.osgi.version>
-        <bundle.plugin.version>1.4.0</bundle.plugin.version>
-    </properties>
+ 
+       <profiles>
+               <!-- use for usual developer builds -->
+               <profile>
+                       <id>build</id>
+                       <activation>
+                               <activeByDefault>true</activeByDefault>
+                       </activation>
+                       <modules>
+                               <module>woden-qname</module>
+                               <module>woden-api</module>
+                               <module>woden-commons</module>
+                               <module>woden-dom</module>
+                               <module>woden-om</module>
+                               <module>woden-tests</module>
+                               <module>woden-tool</module>
+                               <module>woden-ant</module>
+                       </modules>
+               </profile>
+               
+               <!-- use for Maven2 releases -P m2_release
+                       
+                        -->
+               <profile>
+                       <id>m2_release</id>
+                       <modules>
+                               <module>woden-qname</module>
+                               <module>woden-api</module>
+                               <module>woden-commons</module>
+                               <module>woden-dom</module>
+                               <module>woden-om</module>
+                               <module>woden-tool</module>
+                               <module>woden-ant</module>
+                       </modules>
+                       
+               </profile>
+       </profiles>
+       
+
+ <properties>
+               <woden.version>1.0-SNAPSHOT</woden.version>
+               <woden.osgi.version>1.0.0</woden.osgi.version>
+               <bundle.plugin.version>1.4.0</bundle.plugin.version>
+               
<apache.xmlSchema.version>1.4.6-SNAPSHOT</apache.xmlSchema.version>
+               <apache.axiom.version>1.2.9-SNAPSHOT</apache.axiom.version>
+               <apache.ant.version>1.7.0</apache.ant.version>
+               <wsdl4j.version>1.6.2</wsdl4j.version>
+               <slf4.version>1.5.6</slf4.version>
+               <lof4j.version>1.2.15</lof4j.version>
+ </properties>
 </project>



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to