You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2006/09/08 18:57:08 UTC
svn commit: r441574 - in /incubator/cxf/trunk: common/pom.xml
docs/src/docs/styleguide/programming.xml etc/eclipse/codetemplates.xml
pom.xml
Author: dkulp
Date: Fri Sep 8 09:57:07 2006
New Revision: 441574
URL: http://svn.apache.org/viewvc?view=rev&rev=441574
Log:
* Move versions to top level depenedency management section
* Exclude log4j from commons-logging dependency
* Update some maven properties
* Fix bug in eclipse header template
Modified:
incubator/cxf/trunk/common/pom.xml
incubator/cxf/trunk/docs/src/docs/styleguide/programming.xml (props changed)
incubator/cxf/trunk/etc/eclipse/codetemplates.xml
incubator/cxf/trunk/pom.xml
Modified: incubator/cxf/trunk/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/pom.xml?view=diff&rev=441574&r1=441573&r2=441574
==============================================================================
--- incubator/cxf/trunk/common/pom.xml (original)
+++ incubator/cxf/trunk/common/pom.xml Fri Sep 8 09:57:07 2006
@@ -76,31 +76,23 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.9</version>
</dependency>
+
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
@@ -108,7 +100,7 @@
<dependency>
<groupId>javax.jws</groupId>
<artifactId>jsr181-api</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
@@ -118,13 +110,11 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>${jaxb.impl.version.test}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
- <version>${jaxb.impl.version.test}</version>
<scope>test</scope>
</dependency>
@@ -132,7 +122,7 @@
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>stax</groupId>
@@ -152,7 +142,6 @@
<dependency>
<groupId>jaxme</groupId>
<artifactId>jaxme2</artifactId>
- <version>0.5.1</version>
<scope>test</scope>
</dependency>
Propchange: incubator/cxf/trunk/docs/src/docs/styleguide/programming.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/docs/src/docs/styleguide/programming.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/docs/src/docs/styleguide/programming.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/cxf/trunk/etc/eclipse/codetemplates.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/etc/eclipse/codetemplates.xml?view=diff&rev=441574&r1=441573&r2=441574
==============================================================================
--- incubator/cxf/trunk/etc/eclipse/codetemplates.xml (original)
+++ incubator/cxf/trunk/etc/eclipse/codetemplates.xml Fri Sep 8 09:57:07 2006
@@ -24,7 +24,7 @@
* ${tags}
*/</template><template autoinsert="false" context="filecomment_context" deleted="false" description="Comment for created Java files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.filecomment" name="filecomment">/**
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * 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
Modified: incubator/cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=diff&rev=441574&r1=441573&r2=441574
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Fri Sep 8 09:57:07 2006
@@ -94,7 +94,7 @@
<post>cxf-notifications@incubator.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/incubator-cxf-notifications</archive>
</mailingList>
- </mailingLists>
+ </mailingLists>
<ciManagement>
<system>CruiseControl</system>
<url>http://pdceltix.boston.amer.iona.com:8080/cruisecontrol</url>
@@ -172,7 +172,7 @@
<module>api</module>
<module>rt</module>
<module>systests</module>
- <module>integration</module>
+ <module>integration</module>
</modules>
<build>
@@ -317,10 +317,6 @@
<value>${basedir}/target/test-classes/logging.properties</value>
</property>
<property>
- <name>log4j.configuration</name>
- <value>file:///c:/log4j.properties</value>
- </property>
- <property>
<name>activemq.store.dir</name>
<value>${basedir}/target/ActiveMQ</value>
</property>
@@ -451,6 +447,29 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
<version>${jsr250.version}</version>
@@ -507,6 +526,12 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>jaxme</groupId>
+ <artifactId>jaxme2</artifactId>
+ <version>0.5.1</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>