You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2017/07/03 09:48:01 UTC
svn commit: r1800614 - in /tomcat/trunk: build.xml java/javax/xml/
res/checkstyle/javax-import-control.xml webapps/docs/changelog.xml
Author: markt
Date: Mon Jul 3 09:48:01 2017
New Revision: 1800614
URL: http://svn.apache.org/viewvc?rev=1800614&view=rev
Log:
Restore the local definition of the web service annotations since the JRE provided versions are deprecated and Java 9 does not provide them by default.
Added:
tomcat/trunk/java/javax/xml/
- copied from r1783190, tomcat/trunk/java/javax/xml/
Modified:
tomcat/trunk/build.xml
tomcat/trunk/res/checkstyle/javax-import-control.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1800614&r1=1800613&r2=1800614&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Jul 3 09:48:01 2017
@@ -293,6 +293,7 @@
<include name="javax/annotation/**" />
<include name="javax/ejb/**" />
<include name="javax/persistence/**" />
+ <include name="javax/xml/ws/**" />
</patternset>
<patternset id="files.servlet-api">
Modified: tomcat/trunk/res/checkstyle/javax-import-control.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/javax-import-control.xml?rev=1800614&r1=1800613&r2=1800614&view=diff
==============================================================================
--- tomcat/trunk/res/checkstyle/javax-import-control.xml (original)
+++ tomcat/trunk/res/checkstyle/javax-import-control.xml Mon Jul 3 09:48:01 2017
@@ -68,4 +68,7 @@
<subpackage name="websocket">
<allow pkg="javax.websocket"/>
</subpackage>
+ <subpackage name="xml.ws">
+ <allow pkg="javax.xwl.ws"/>
+ </subpackage>
</import-control>
\ No newline at end of file
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1800614&r1=1800613&r2=1800614&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jul 3 09:48:01 2017
@@ -143,6 +143,15 @@
</add>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <scode>
+ Restore the local definition of the web service annotations since the
+ JRE provided versions are deprecated and Java 9 does not provide them by
+ default. (markt)
+ </scode>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.0.M22 (markt)" rtext="2017-06-26">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1800614 - in /tomcat/trunk: build.xml
java/javax/xml/ res/checkstyle/javax-import-control.xml webapps/docs/changelog.xml
Posted by Rémy Maucherat <re...@apache.org>.
On Mon, Jul 3, 2017 at 9:45 AM, Mark Thomas <ma...@apache.org> wrote:
> On 03/07/17 15:26, Rémy Maucherat wrote:
> > On Mon, Jul 3, 2017 at 4:48 AM, <ma...@apache.org> wrote:
> >
> >> Author: markt
> >> Date: Mon Jul 3 09:48:01 2017
> >> New Revision: 1800614
> >>
> >> URL: http://svn.apache.org/viewvc?rev=1800614&view=rev
> >> Log:
> >> Restore the local definition of the web service annotations since the
> JRE
> >> provided versions are deprecated and Java 9 does not provide them by
> >> default.
> >>
> >
> > Ok, so I suppose you like this solution better than conditionally adding
> > the command line option then ?
>
> Yes.
>
> Given that:
> - they were added in Java 8;
> - Java 9 disables them by default; and
> - they will be removed from some (TBD) future Java version.
>
> We are going to have to add them back at some point and doing it now
> looked to be the simple, future proof solution.
>
> Hmm, ok, that's better.
Rémy
Re: svn commit: r1800614 - in /tomcat/trunk: build.xml
java/javax/xml/ res/checkstyle/javax-import-control.xml
webapps/docs/changelog.xml
Posted by Mark Thomas <ma...@apache.org>.
On 03/07/17 15:26, Rémy Maucherat wrote:
> On Mon, Jul 3, 2017 at 4:48 AM, <ma...@apache.org> wrote:
>
>> Author: markt
>> Date: Mon Jul 3 09:48:01 2017
>> New Revision: 1800614
>>
>> URL: http://svn.apache.org/viewvc?rev=1800614&view=rev
>> Log:
>> Restore the local definition of the web service annotations since the JRE
>> provided versions are deprecated and Java 9 does not provide them by
>> default.
>>
>
> Ok, so I suppose you like this solution better than conditionally adding
> the command line option then ?
Yes.
Given that:
- they were added in Java 8;
- Java 9 disables them by default; and
- they will be removed from some (TBD) future Java version.
We are going to have to add them back at some point and doing it now
looked to be the simple, future proof solution.
Mark
>
> Rémy
>
>>
>> Added:
>> tomcat/trunk/java/javax/xml/
>> - copied from r1783190, tomcat/trunk/java/javax/xml/
>> Modified:
>> tomcat/trunk/build.xml
>> tomcat/trunk/res/checkstyle/javax-import-control.xml
>> tomcat/trunk/webapps/docs/changelog.xml
>>
>> Modified: tomcat/trunk/build.xml
>> URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=
>> 1800614&r1=1800613&r2=1800614&view=diff
>> ============================================================
>> ==================
>> --- tomcat/trunk/build.xml (original)
>> +++ tomcat/trunk/build.xml Mon Jul 3 09:48:01 2017
>> @@ -293,6 +293,7 @@
>> <include name="javax/annotation/**" />
>> <include name="javax/ejb/**" />
>> <include name="javax/persistence/**" />
>> + <include name="javax/xml/ws/**" />
>> </patternset>
>>
>> <patternset id="files.servlet-api">
>>
>> Modified: tomcat/trunk/res/checkstyle/javax-import-control.xml
>> URL: http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/
>> javax-import-control.xml?rev=1800614&r1=1800613&r2=1800614&view=diff
>> ============================================================
>> ==================
>> --- tomcat/trunk/res/checkstyle/javax-import-control.xml (original)
>> +++ tomcat/trunk/res/checkstyle/javax-import-control.xml Mon Jul 3
>> 09:48:01 2017
>> @@ -68,4 +68,7 @@
>> <subpackage name="websocket">
>> <allow pkg="javax.websocket"/>
>> </subpackage>
>> + <subpackage name="xml.ws">
>> + <allow pkg="javax.xwl.ws"/>
>> + </subpackage>
>> </import-control>
>> \ No newline at end of file
>>
>> Modified: tomcat/trunk/webapps/docs/changelog.xml
>> URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/
>> changelog.xml?rev=1800614&r1=1800613&r2=1800614&view=diff
>> ============================================================
>> ==================
>> --- tomcat/trunk/webapps/docs/changelog.xml (original)
>> +++ tomcat/trunk/webapps/docs/changelog.xml Mon Jul 3 09:48:01 2017
>> @@ -143,6 +143,15 @@
>> </add>
>> </changelog>
>> </subsection>
>> + <subsection name="Other">
>> + <changelog>
>> + <scode>
>> + Restore the local definition of the web service annotations since
>> the
>> + JRE provided versions are deprecated and Java 9 does not provide
>> them by
>> + default. (markt)
>> + </scode>
>> + </changelog>
>> + </subsection>
>> </section>
>> <section name="Tomcat 9.0.0.M22 (markt)" rtext="2017-06-26">
>> <subsection name="Catalina">
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>
>>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1800614 - in /tomcat/trunk: build.xml
java/javax/xml/ res/checkstyle/javax-import-control.xml webapps/docs/changelog.xml
Posted by Rémy Maucherat <re...@apache.org>.
On Mon, Jul 3, 2017 at 4:48 AM, <ma...@apache.org> wrote:
> Author: markt
> Date: Mon Jul 3 09:48:01 2017
> New Revision: 1800614
>
> URL: http://svn.apache.org/viewvc?rev=1800614&view=rev
> Log:
> Restore the local definition of the web service annotations since the JRE
> provided versions are deprecated and Java 9 does not provide them by
> default.
>
Ok, so I suppose you like this solution better than conditionally adding
the command line option then ?
Rémy
>
> Added:
> tomcat/trunk/java/javax/xml/
> - copied from r1783190, tomcat/trunk/java/javax/xml/
> Modified:
> tomcat/trunk/build.xml
> tomcat/trunk/res/checkstyle/javax-import-control.xml
> tomcat/trunk/webapps/docs/changelog.xml
>
> Modified: tomcat/trunk/build.xml
> URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=
> 1800614&r1=1800613&r2=1800614&view=diff
> ============================================================
> ==================
> --- tomcat/trunk/build.xml (original)
> +++ tomcat/trunk/build.xml Mon Jul 3 09:48:01 2017
> @@ -293,6 +293,7 @@
> <include name="javax/annotation/**" />
> <include name="javax/ejb/**" />
> <include name="javax/persistence/**" />
> + <include name="javax/xml/ws/**" />
> </patternset>
>
> <patternset id="files.servlet-api">
>
> Modified: tomcat/trunk/res/checkstyle/javax-import-control.xml
> URL: http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/
> javax-import-control.xml?rev=1800614&r1=1800613&r2=1800614&view=diff
> ============================================================
> ==================
> --- tomcat/trunk/res/checkstyle/javax-import-control.xml (original)
> +++ tomcat/trunk/res/checkstyle/javax-import-control.xml Mon Jul 3
> 09:48:01 2017
> @@ -68,4 +68,7 @@
> <subpackage name="websocket">
> <allow pkg="javax.websocket"/>
> </subpackage>
> + <subpackage name="xml.ws">
> + <allow pkg="javax.xwl.ws"/>
> + </subpackage>
> </import-control>
> \ No newline at end of file
>
> Modified: tomcat/trunk/webapps/docs/changelog.xml
> URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/
> changelog.xml?rev=1800614&r1=1800613&r2=1800614&view=diff
> ============================================================
> ==================
> --- tomcat/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/trunk/webapps/docs/changelog.xml Mon Jul 3 09:48:01 2017
> @@ -143,6 +143,15 @@
> </add>
> </changelog>
> </subsection>
> + <subsection name="Other">
> + <changelog>
> + <scode>
> + Restore the local definition of the web service annotations since
> the
> + JRE provided versions are deprecated and Java 9 does not provide
> them by
> + default. (markt)
> + </scode>
> + </changelog>
> + </subsection>
> </section>
> <section name="Tomcat 9.0.0.M22 (markt)" rtext="2017-06-26">
> <subsection name="Catalina">
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>