You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by st...@apache.org on 2006/03/17 22:57:12 UTC
svn commit: r386736 - in /webservices/axis2/trunk/java: build.xml
etc/project.properties
Author: stevel
Date: Fri Mar 17 13:57:11 2006
New Revision: 386736
URL: http://svn.apache.org/viewcvs?rev=386736&view=rev
Log:
-updating to later libraries where it is probably harmless.
-fixing ant build on linux
-modifying m2-install target to not rebuild everything; just install what was last there.
--updating to later libraries where it is probably harmless.
-fixing ant build on linux
-modifying m2-install target to not rebuild everything; just install what was last there.
-fixing the m2 pom to work, which it does, but only if the cvs snapshot repository is also there. The m2 dependency graph has switched to XmlSchema-1.0; this is not in the maven1 repo.
Modified:
webservices/axis2/trunk/java/build.xml
webservices/axis2/trunk/java/etc/project.properties
Modified: webservices/axis2/trunk/java/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/build.xml?rev=386736&r1=386735&r2=386736&view=diff
==============================================================================
--- webservices/axis2/trunk/java/build.xml (original)
+++ webservices/axis2/trunk/java/build.xml Fri Mar 17 13:57:11 2006
@@ -24,6 +24,8 @@
<!--read in project properties, including library versions-->
<property file="etc/project.properties"/>
+
+
<target name="default">
</target>
@@ -39,11 +41,11 @@
<condition property="maven.executable" value="maven.bat">
<os family="windows" />
</condition>
- <property name="maven.executable" value="maven.sh" />
+ <property name="maven.executable" value="maven" />
<property name="maven.line" value="${maven.commoncmd}" />
<presetdef name="maven">
- <exec failonerror="true" executable="maven.bat">
+ <exec failonerror="true" executable="${maven.executable}">
<arg line="${maven.line}" />
</exec>
</presetdef>
@@ -56,14 +58,17 @@
<property name="project.xml" location="etc/project.xml" />
<!-- pull out the value of the project version from the maven1 file-->
<xmlproperty file="${project.xml}"
- keeproot="true" />
+ keeproot="true" semanticAttributes="true" />
<property name="target.dir" location="target"/>
<property name="project.version" value="${axis2_version}" />
<property name="artifact.title" value="${project.id}-${project.version}" />
<property name="target.jar" location="${target.dir}/${artifact.title}.jar"/>
<property name="target.pom" location="${target.dir}/${artifact.title}.pom"/>
- <available file="${basedir}/target/lib/axis-wsdl4j-1.2.jar" property="jars.present"/>
+ <!-- use a proper m2 hierarchy -->
+ <property name="maven2.groupId" value="org.apache.ws.${project.groupId}"/>
+
+ <available file="${basedir}/target/lib/axis-wsdl4j-${axis.wsdl4j.version}.jar" property="jars.present"/>
</target>
@@ -105,12 +110,32 @@
<echo file="${target.pom}"><![CDATA[<project>
<modelVersion>4.0.0</modelVersion>
- <groupId>${project.id}</groupId>
+ <groupId>${maven2.groupId}</groupId>
<artifactId>${project.id}</artifactId>
<packaging>jar</packaging>
<version>${project.version}</version>
<dependencies>
<dependency>
+ <groupId>annogen</groupId>
+ <artifactId>annogen</artifactId>
+ <version>${annogen.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-wsdl4j</artifactId>
+ <version>${axis.wsdl4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>${backport_util_concurrent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
@@ -121,21 +146,15 @@
<version>${policy.version}</version>
</dependency>
<dependency>
- <groupId>axis</groupId>
- <artifactId>axis-wsdl4j</artifactId>
- <version>${axis-wsdl4j.version}</version>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
+ <groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
- <version>${XmlSchema.version}</version>
+ <version>${XmlSchema.m2.version}</version>
</dependency>
<dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- <version>${annogen.version}</version>
+ <groupId>ws-commons</groupId>
+ <artifactId>axiom</artifactId>
+ <version>${axiom.version}</version>
</dependency>
-
</dependencies>
</project>
]]></echo>
@@ -156,7 +175,7 @@
version="${wagon.version}"/>
</target>
- <target name="ready-to-deploy" depends="m2-pom,dist-lite" />
+ <target name="ready-to-deploy" depends="m2-pom" />
<target name="m2-install" depends="ready-to-deploy"
description="install the libray into the local m2 repository"
@@ -180,7 +199,7 @@
<target name="installed"
description="locally installed"
- depends="m2-install" />
+ depends="dist-lite,m2-install" />
<target name="quick" depends="create-lib"
description="make a distribution">
@@ -242,5 +261,10 @@
</copy>
</target>
+ <target name="diag" depends="init">
+ <!-- probably ant 1.7+ only -->
+ <diagnostics/>
+ <echoproperties/>
+ </target>
</project>
Modified: webservices/axis2/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/etc/project.properties?rev=386736&r1=386735&r2=386736&view=diff
==============================================================================
--- webservices/axis2/trunk/java/etc/project.properties (original)
+++ webservices/axis2/trunk/java/etc/project.properties Fri Mar 17 13:57:11 2006
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# Copyright 2001-2004 The Apache Software Foundation.
+# Copyright 2001-2006 The Apache Software Foundation.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -97,7 +97,7 @@
jaxen.version=1.1-beta-7
jaxme.version=0.5.1
junit.version=3.8.1
-log4j.version=1.2.12
+log4j.version=1.2.13
maven.itest.plugin.version=1.0
opensaml.version=1.0.1
policy.version=0.92-SNAPSHOT
@@ -111,6 +111,9 @@
xerces.version=2.7.1
xml_apis.version=1.3.02
XmlSchema.version=1.0-SNAPSHOT
+#once there is a version of XmlSchema-1.0 in the maven1 repository,
+#there's no need for a different version in m2-land
+XmlSchema.m2.version=1.0
xmlsec.version=1.2.1
xmlunit.version=1.0