You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2010/05/12 19:10:39 UTC
svn commit: r943585 - in /webservices/juddi/trunk: juddi-tomcat/README
juddi-tomcat/assembly.xml juddi-tomcat/build.xml
juddi-tomcat/package.properties juddi-tomcat/pom.xml pom.xml
Author: kstam
Date: Wed May 12 17:10:39 2010
New Revision: 943585
URL: http://svn.apache.org/viewvc?rev=943585&view=rev
Log:
JUDDI-394, upgrading to use tomcat-6.0.26.
Modified:
webservices/juddi/trunk/juddi-tomcat/README
webservices/juddi/trunk/juddi-tomcat/assembly.xml
webservices/juddi/trunk/juddi-tomcat/build.xml
webservices/juddi/trunk/juddi-tomcat/package.properties
webservices/juddi/trunk/juddi-tomcat/pom.xml
webservices/juddi/trunk/pom.xml
Modified: webservices/juddi/trunk/juddi-tomcat/README
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-tomcat/README?rev=943585&r1=943584&r2=943585&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-tomcat/README (original)
+++ webservices/juddi/trunk/juddi-tomcat/README Wed May 12 17:10:39 2010
@@ -1,4 +1,5 @@
-Please use maven-2.0.6 (2.0.8 also seems to work) when building,
+Please use maven-2.2.1 or newer when building,
+
juddi-tomcat uses dependency properties which are broken in recent versions of maven.
You will see an error like:
Modified: webservices/juddi/trunk/juddi-tomcat/assembly.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-tomcat/assembly.xml?rev=943585&r1=943584&r2=943585&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-tomcat/assembly.xml (original)
+++ webservices/juddi/trunk/juddi-tomcat/assembly.xml Wed May 12 17:10:39 2010
@@ -5,7 +5,7 @@
</formats>
<fileSets>
<fileSet>
- <directory>${project.build.directory}/tomcat/apache-tomcat-6.0.20</directory>
+ <directory>${project.build.directory}/tomcat/apache-tomcat-6.0.26</directory>
<outputDirectory></outputDirectory>
</fileSet>
</fileSets>
Modified: webservices/juddi/trunk/juddi-tomcat/build.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-tomcat/build.xml?rev=943585&r1=943584&r2=943585&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-tomcat/build.xml (original)
+++ webservices/juddi/trunk/juddi-tomcat/build.xml Wed May 12 17:10:39 2010
@@ -17,11 +17,11 @@
<target name="copy-resources" depends="unzip-tomcat">
<copy file="${basedir}/catalina.sh" todir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/>
- <copy file="${basedir}/context.xml" todir="${webapps.dir}/juddiv3/META-INF"/>
+ <copy file="${basedir}/context.xml" todir="${webapps.dir}/juddiv3/META-INF" overwrite="true"/>
<!--
<copy file="${basedir}/context.xml" todir="${webapps.dir}/juddiv3-samples/META-INF"/>
-->
- <copy file="${basedir}/server.xml" todir="${conf.dir}"/>
+ <copy file="${basedir}/server.xml" todir="${conf.dir}" overwrite="true"/>
<copy file="${dependency.mysql.jar}" todir="${lib.dir}"/>
<copy file="${dependency.log4j.jar}" todir="${lib.dir}"/>
<copy file="${dependency.derby.jar}" todir="${lib.dir}"/>
Modified: webservices/juddi/trunk/juddi-tomcat/package.properties
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-tomcat/package.properties?rev=943585&r1=943584&r2=943585&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-tomcat/package.properties (original)
+++ webservices/juddi/trunk/juddi-tomcat/package.properties Wed May 12 17:10:39 2010
@@ -1 +1 @@
-apache.tomcat.version=6.0.20
+apache.tomcat.version=6.0.26
Modified: webservices/juddi/trunk/juddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-tomcat/pom.xml?rev=943585&r1=943584&r2=943585&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-tomcat/pom.xml (original)
+++ webservices/juddi/trunk/juddi-tomcat/pom.xml Wed May 12 17:10:39 2010
@@ -38,7 +38,7 @@
<dependency>
<artifactId>apache-tomcat</artifactId>
<groupId>org.apache.juddi.bootstrap</groupId>
- <version>6.0.20</version>
+ <version>6.0.26</version>
<type>zip</type>
</dependency>
<dependency>
Modified: webservices/juddi/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/pom.xml?rev=943585&r1=943584&r2=943585&view=diff
==============================================================================
--- webservices/juddi/trunk/pom.xml (original)
+++ webservices/juddi/trunk/pom.xml Wed May 12 17:10:39 2010
@@ -252,10 +252,10 @@
<repository>
<id>apache.nexus</id>
<name>Apache NEXUS Maven 2 Repository</name>
- <url>https://repository.apache.org/content/repositories/snapshots/</url>
+ <url>https://repository.apache.org/content/repositories/releases/</url>
<layout>default</layout>
<snapshots>
- <enabled>true</enabled>
+ <enabled>false</enabled>
</snapshots>
</repository>
<repository>
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org