On 15/05/2020 15:20, Christopher Schultz wrote: > All, > > I'd like to talk about this. > > First, this is a patch to Tomcat 7 where a single version number > (wsdl4j) wasn't updated in all the places it needed to be updated > (specifically, the Eclipse .classpath file). > > Rather than simply updating the version number, I replaced it with a > replaceable token which always uses the version set in > build.properties.default. > > This means that the version number is set in only one place: > build.properites(.default)? instead of having to be set in at least 2 > places. > > If everyone likes this strategy, I can extend it to the other > versioned libraries we use, and also push it to the other branches. > > WDYT?
Works for me. Mark > > -chris > > On 5/15/20 10:07, schu...@apache.org wrote: >> This is an automated email from the ASF dual-hosted git >> repository. > >> schultz pushed a commit to branch 7.0.x in repository >> https://gitbox.apache.org/repos/asf/tomcat.git > > >> The following commit(s) were added to refs/heads/7.0.x by this >> push: new afda9f0 Use parametric replacement to ensure the proper >> version of wsdl4j is written to Eclipse's .classpath file. afda9f0 >> is described below > >> commit afda9f0d2d2d0bc7b5a870f6df97603354655109 Author: Christopher >> Schultz <ch...@christopherschultz.net> AuthorDate: Fri May 15 >> 10:05:59 2020 -0400 > >> Use parametric replacement to ensure the proper version of wsdl4j >> is written to Eclipse's .classpath file. --- build.xml >> | 3 ++- res/ide-support/eclipse/eclipse.classpath | 2 +- 2 files >> changed, 3 insertions(+), 2 deletions(-) > >> diff --git a/build.xml b/build.xml index 866bad3..973646e 100644 >> --- a/build.xml +++ b/build.xml @@ -3297,9 +3297,10 @@ >> skip.installer property in build.properties" /> >> depends="download-compile, extras-webservices-prepare, >> download-test-compile" description="Prepares the source tree to be >> built in Eclipse"> > >> + <filter token="wsdl4j-lib.version" >> value="${wsdl4j-lib.version}" /> <!-- Copy the sample project files >> into the root directory --> <copy >> file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" >> tofile="${tomcat.home}/.project"/> - <copy >> file="${tomcat.home}/res/ide-support/eclipse/eclipse.classpath" >> tofile="${tomcat.home}/.classpath"/> + <copy >> file="${tomcat.home}/res/ide-support/eclipse/eclipse.classpath" >> tofile="${tomcat.home}/.classpath" filtering="true" /> > >> <!-- Copy compiler settings file --> <mkdir >> dir="${tomcat.home}/.settings" /> diff --git >> a/res/ide-support/eclipse/eclipse.classpath >> b/res/ide-support/eclipse/eclipse.classpath index afd1232..74c174b >> 100644 --- a/res/ide-support/eclipse/eclipse.classpath +++ >> b/res/ide-support/eclipse/eclipse.classpath @@ -23,7 +23,7 @@ >> <classpathentry kind="con" >> path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> <classpathentry >> kind="var" path="ANT_HOME/lib/ant.jar"/> <classpathentry kind="var" >> path="TOMCAT_LIBS_BASE/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar > "/> > > > - <classpathentry kind="var" > path="TOMCAT_LIBS_BASE/wsdl4j-1.6.2/wsdl4j-1.6.2.jar"/> >> + <classpathentry kind="var" >> path="TOMCAT_LIBS_BASE/wsdl4j-@wsdl4j-lib.version@/wsdl4j-@wsdl4j-lib. > version@.jar"/> > > > <classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-4.4.2/ecj-4.4.2.ja > r"/> >> <classpathentry kind="var" >> path="TOMCAT_LIBS_BASE/easymock-3.2/easymock-3.2.jar"/> >> <classpathentry kind="var" >> path="TOMCAT_LIBS_BASE/hamcrest-1.3/hamcrest-core-1.3.jar"/> > > >> --------------------------------------------------------------------- > > > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
