Re: [tomcat] branch 7.0.x updated: Use parametric replacement to ensure the proper version of wsdl4j is written to Eclipse's .classpath file.
On Fri, May 15, 2020 at 10:20 AM Christopher Schultz <
ch...@christopherschultz.net> wrote:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA256
>
> 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?
>
+1 from me :D
> - -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 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">
> >
> > + > value="${wsdl4j-lib.version}" /> > file="${tomcat.home}/res/ide-support/eclipse/eclipse.project"
> > tofile="${tomcat.home}/.project"/> - > file="${tomcat.home}/res/ide-support/eclipse/eclipse.classpath"
> > tofile="${tomcat.home}/.classpath"/> + > file="${tomcat.home}/res/ide-support/eclipse/eclipse.classpath"
> > tofile="${tomcat.home}/.classpath" filtering="true" />
> >
> > > 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 @@
> > > path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> > kind="var" path="ANT_HOME/lib/ant.jar"/> > path="TOMCAT_LIBS_BASE/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar
> "/>
> >
> >
> - - path="TOMCAT_LIBS_BASE/wsdl4j-1.6.2/wsdl4j-1.6.2.jar"/>
> > + > path="TOMCAT_LIBS_BASE/wsdl4j-@wsdl4j-lib.version@/wsdl4j-@wsdl4j-lib.
> version@.jar"/>
> >
> >
>
> > > path="TOMCAT_LIBS_BASE/easymock-3.2/easymock-3.2.jar"/>
> > > 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
> >
> -BEGIN PGP SIGNATURE-
> Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
>
> iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl6+pRAACgkQHPApP6U8
> pFhX5w/+O0dVTHL5UROhgJzTq74AmBrKHml57IkY1LVN+Wv9sWnw+X1s/QCFzamb
> fVZ+TZV4hg2xIkFDyzUTwCtPULVtqsBZChIyQDzW/rh9ClHKqTsOE2D6qOHMpcwa
> KMlOFb2wb/Z1GuxtHaH8cHZJnVtUjSv0STkKTZhewXGbNkMnXoacXO/1ezaY5vDY
> 5v4O8PRCDiTIXAMfncI1jORwDvbGBMqyQHl++QG6SiY5L5bp0xIyvtf+j/+8g6Ly
> BljCXZQC69ddm3dX5K88gdhsiXphzVZMaeyfGVk3AvCygwy3vAimTsuB8Dho6RUZ
> A+Wm2BmEYUpS3bdhhh8VpsD54rJ0q5L1BFLqrfot4+KLA78VLVWsam3IUqHZqIyu
> jl8TWHGl4NzRdsMFNm5Y4PnfkWBtMWtG7HyVea2uBLKmwFa9UQ3NA+/dwE8EKGAg
> ptz1e2GtgCAwUPWx8d/Z9+4hPOKLBgCuKVpm0YvVedrBCwHZCNKUbJiQspI2lSOF
> X4fqzFT5WrSBXpBOUk3FuwLQraDeXecEfalNVgfaJESeRM/KoohHULSWBLCfFQ2R
> kvueI0Kxi5WXFcdLFp2AvenL4fHPVYyt0MoAZ6gIArCSfvVZKNPFa1saVtr+yoKr
> 94A7aOoVjOLR6DygUNj7UFBlGz/uCbg9MkHxvBAxykH0zZg2oik=
> =VYFy
> -END PGP SIGNATURE-
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
Re: [tomcat] branch 7.0.x updated: Use parametric replacement to ensure the proper version of wsdl4j is written to Eclipse's .classpath file.
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 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">
>
>> +> value="${wsdl4j-lib.version}" /> > file="${tomcat.home}/res/ide-support/eclipse/eclipse.project"
>> tofile="${tomcat.home}/.project"/> -> file="${tomcat.home}/res/ide-support/eclipse/eclipse.classpath"
>> tofile="${tomcat.home}/.classpath"/> +> file="${tomcat.home}/res/ide-support/eclipse/eclipse.classpath"
>> tofile="${tomcat.home}/.classpath" filtering="true" />
>
>> > 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 @@
>> > path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> > kind="var" path="ANT_HOME/lib/ant.jar"/> > path="TOMCAT_LIBS_BASE/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar
> "/>
>
>
> - path="TOMCAT_LIBS_BASE/wsdl4j-1.6.2/wsdl4j-1.6.2.jar"/>
>> +> path="TOMCAT_LIBS_BASE/wsdl4j-@wsdl4j-lib.version@/wsdl4j-@wsdl4j-lib.
> version@.jar"/>
>
>
>
>> > path="TOMCAT_LIBS_BASE/easymock-3.2/easymock-3.2.jar"/>
>> > 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
Re: [tomcat] branch 7.0.x updated: Use parametric replacement to ensure the proper version of wsdl4j is written to Eclipse's .classpath file.
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
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?
- -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 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">
>
> + value="${wsdl4j-lib.version}" /> file="${tomcat.home}/res/ide-support/eclipse/eclipse.project"
> tofile="${tomcat.home}/.project"/> - file="${tomcat.home}/res/ide-support/eclipse/eclipse.classpath"
> tofile="${tomcat.home}/.classpath"/> + file="${tomcat.home}/res/ide-support/eclipse/eclipse.classpath"
> tofile="${tomcat.home}/.classpath" filtering="true" />
>
> 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 @@
> path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> kind="var" path="ANT_HOME/lib/ant.jar"/> path="TOMCAT_LIBS_BASE/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar
"/>
>
>
- -
> + path="TOMCAT_LIBS_BASE/wsdl4j-@wsdl4j-lib.version@/wsdl4j-@wsdl4j-lib.
version@.jar"/>
>
>
> path="TOMCAT_LIBS_BASE/easymock-3.2/easymock-3.2.jar"/>
> 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
>
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl6+pRAACgkQHPApP6U8
pFhX5w/+O0dVTHL5UROhgJzTq74AmBrKHml57IkY1LVN+Wv9sWnw+X1s/QCFzamb
fVZ+TZV4hg2xIkFDyzUTwCtPULVtqsBZChIyQDzW/rh9ClHKqTsOE2D6qOHMpcwa
KMlOFb2wb/Z1GuxtHaH8cHZJnVtUjSv0STkKTZhewXGbNkMnXoacXO/1ezaY5vDY
5v4O8PRCDiTIXAMfncI1jORwDvbGBMqyQHl++QG6SiY5L5bp0xIyvtf+j/+8g6Ly
BljCXZQC69ddm3dX5K88gdhsiXphzVZMaeyfGVk3AvCygwy3vAimTsuB8Dho6RUZ
A+Wm2BmEYUpS3bdhhh8VpsD54rJ0q5L1BFLqrfot4+KLA78VLVWsam3IUqHZqIyu
jl8TWHGl4NzRdsMFNm5Y4PnfkWBtMWtG7HyVea2uBLKmwFa9UQ3NA+/dwE8EKGAg
ptz1e2GtgCAwUPWx8d/Z9+4hPOKLBgCuKVpm0YvVedrBCwHZCNKUbJiQspI2lSOF
X4fqzFT5WrSBXpBOUk3FuwLQraDeXecEfalNVgfaJESeRM/KoohHULSWBLCfFQ2R
kvueI0Kxi5WXFcdLFp2AvenL4fHPVYyt0MoAZ6gIArCSfvVZKNPFa1saVtr+yoKr
94A7aOoVjOLR6DygUNj7UFBlGz/uCbg9MkHxvBAxykH0zZg2oik=
=VYFy
-END PGP SIGNATURE-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Use parametric replacement to ensure the proper version of wsdl4j is written to Eclipse's .classpath file.
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 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"> + - + 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 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
