Re: Bootstrap and modules

[Mark Thomas]

On 11/06/2020 21:59, Mark Thomas wrote:
> On 11/06/2020 21:24, Raymond Auge wrote:
>> This can totally be fixed in configuration. There is no problem. I just
>> wanted to make sure that in doing so we wouldn't just be pushing some
>> dirt under the rug so to speak.
> 
> I'm concerned we might be doing exactly that now we are heading into a
> JPMS world and this seems like an opportunity to pause and see if there
> is a better way.
> 
> I've yet to get my head around JPMS and I might be mis-remembering some
> of the things I have read.
> 
> bootstrap.jar has everything it needs to start, create the class loader
> hierarchy, switch to the catalinaLoader (which can see all the JARs
> rather than just bootstrap.jar and tomcat-juli.jar) and then continue
> with start-up.
> 
> It does things this way because the class loader hierarchy and the
> configuration of the class loaders is configurable. So we can't just put
> everything on the class path before starting the JVM.
> 
> Any static analysis of bootstrap.jar is always going to show it having
> dependencies that won't be visible until Tomcat starts and the
> catalinaLoader is up and running. To what extent does this cause
> complications for JPMS and/or OSGi?
> 
> Is this completely manageable with configuration? If it is, I think I'd
> lean towards a configuration based solution primarily for backwards
> compatibility reasons. What are the arguments against this approach?
> 
> If this completely manageable with configuration are there any
> particular classes that are causing more than their fair share of pain
> where a small packaging change would provide a relatively large benefit?

Sorry. More thoughts occurred to me as I looked at the PRs again.

If we created o.a.c.startup.Constants, defined the constants required by
the bootstrap classes there and then referenced those from o.a.c.Globals
would that help?

Is it Tool's use of ExceptionUtils that is causing that class to be
needed? If so would making Bootstrap.handleThrowable() package private
and using that instead help?

Mark

> 
> Mark
> 
> 
>>
>> :)
>>
>> - Ray
>>
>> On Thu, Jun 11, 2020 at 3:25 PM Raymond Auge > > wrote:
>>
>> To be clear, it's not necessarily having _all of a package_. It's
>> more about all the reachable class references. For instance jdeps
>> looks at classes and finds any reachable references. So does bnd for
>> calculating OSGi metadata.
>>
>> So the issue is not really about packages, it's about having missing
>> class references and whether those should be elided in
>> configuration, or simple fixed in packaging (which again does not
>> necessarily mean full packages :)
>>
>> - Ray
>>
>> On Thu, Jun 11, 2020 at 3:20 PM Rémy Maucherat > > wrote:
>>
>> On Thu, Jun 11, 2020 at 9:01 PM Mark Thomas > > wrote:
>>
>> Hi,
>>
>> As discussed in PR#298 [1], properly/fully/correctly
>> supporting JPMS /
>> OSGi gets trickier than necessary with the bootstrap JAR
>> because of the
>> way we currently package it with the minimum that it needs
>> and duplicate
>> some classes.
>>
>> My simplistic understanding is that having all of a Java
>> package in a
>> single JAR makes JPMS and OSGi a lot simpler. Further, our
>> current
>> approach may not be 100% compatible with one or both of them.
>>
>> The trade-offs involved here are:
>> - having all of a package in a JAR simplifies JPMS and OSGi
>> - We want to keep the bootstrap JAR small (is this much of a
>> concern?)
>> - We don't want duplicate code (maintenance overhead)
>> - Bootstrap uses various utility functions from the Tomcat
>> code base
>>
>> I'm wondering if there is a better approach we could adopt
>> that makes
>> JPMS / OSGi simpler without compromising too much on the
>> other trade-offs.
>>
>> The sort of thing I have in mind is:
>> - move everything out of o.a.c.startup that doesn't need to
>> be there to
>>   either some new package (name TBD) or an existing package
>>
>>
>> That means way too many risky changes IMO, the listeners in the
>> startup package are often extended to add features so they need
>> to remain in the catalina.startup package.
>>  
>>
>> - create an o.a.c.startup.util package and, during the build
>> process,
>>   copy and package rename any utility classes the remaining
>> classes in
>>   o.a.c.startup depend on
>>
>>
>> Good idea, when I read your requirements, I thought about
>> package renaming. So I think we could use 

Re: Bootstrap and modules

[Mark Thomas]

On 11/06/2020 21:24, Raymond Auge wrote:
> This can totally be fixed in configuration. There is no problem. I just
> wanted to make sure that in doing so we wouldn't just be pushing some
> dirt under the rug so to speak.

I'm concerned we might be doing exactly that now we are heading into a
JPMS world and this seems like an opportunity to pause and see if there
is a better way.

I've yet to get my head around JPMS and I might be mis-remembering some
of the things I have read.

bootstrap.jar has everything it needs to start, create the class loader
hierarchy, switch to the catalinaLoader (which can see all the JARs
rather than just bootstrap.jar and tomcat-juli.jar) and then continue
with start-up.

It does things this way because the class loader hierarchy and the
configuration of the class loaders is configurable. So we can't just put
everything on the class path before starting the JVM.

Any static analysis of bootstrap.jar is always going to show it having
dependencies that won't be visible until Tomcat starts and the
catalinaLoader is up and running. To what extent does this cause
complications for JPMS and/or OSGi?

Is this completely manageable with configuration? If it is, I think I'd
lean towards a configuration based solution primarily for backwards
compatibility reasons. What are the arguments against this approach?

If this completely manageable with configuration are there any
particular classes that are causing more than their fair share of pain
where a small packaging change would provide a relatively large benefit?

Mark


> 
> :)
> 
> - Ray
> 
> On Thu, Jun 11, 2020 at 3:25 PM Raymond Auge  > wrote:
> 
> To be clear, it's not necessarily having _all of a package_. It's
> more about all the reachable class references. For instance jdeps
> looks at classes and finds any reachable references. So does bnd for
> calculating OSGi metadata.
> 
> So the issue is not really about packages, it's about having missing
> class references and whether those should be elided in
> configuration, or simple fixed in packaging (which again does not
> necessarily mean full packages :)
> 
> - Ray
> 
> On Thu, Jun 11, 2020 at 3:20 PM Rémy Maucherat  > wrote:
> 
> On Thu, Jun 11, 2020 at 9:01 PM Mark Thomas  > wrote:
> 
> Hi,
> 
> As discussed in PR#298 [1], properly/fully/correctly
> supporting JPMS /
> OSGi gets trickier than necessary with the bootstrap JAR
> because of the
> way we currently package it with the minimum that it needs
> and duplicate
> some classes.
> 
> My simplistic understanding is that having all of a Java
> package in a
> single JAR makes JPMS and OSGi a lot simpler. Further, our
> current
> approach may not be 100% compatible with one or both of them.
> 
> The trade-offs involved here are:
> - having all of a package in a JAR simplifies JPMS and OSGi
> - We want to keep the bootstrap JAR small (is this much of a
> concern?)
> - We don't want duplicate code (maintenance overhead)
> - Bootstrap uses various utility functions from the Tomcat
> code base
> 
> I'm wondering if there is a better approach we could adopt
> that makes
> JPMS / OSGi simpler without compromising too much on the
> other trade-offs.
> 
> The sort of thing I have in mind is:
> - move everything out of o.a.c.startup that doesn't need to
> be there to
>   either some new package (name TBD) or an existing package
> 
> 
> That means way too many risky changes IMO, the listeners in the
> startup package are often extended to add features so they need
> to remain in the catalina.startup package.
>  
> 
> - create an o.a.c.startup.util package and, during the build
> process,
>   copy and package rename any utility classes the remaining
> classes in
>   o.a.c.startup depend on
> 
> 
> Good idea, when I read your requirements, I thought about
> package renaming. So I think we could use package renaming for
> everything that bootstrap.jar has to a tomcat.bootstrap or
> catalina.bootstrap package.
> 
> Rémy
>  
> 
> 
> The end result should be a nice clean mapping of packages to
> JARs.
> 
> Thoughts?
> 
> Mark
> 
> 
> 
> [1] https://github.com/apache/tomcat/pull/298
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> 

Re: Bootstrap and modules

[Raymond Auge]

This can totally be fixed in configuration. There is no problem. I just
wanted to make sure that in doing so we wouldn't just be pushing some dirt
under the rug so to speak.

:)

- Ray

On Thu, Jun 11, 2020 at 3:25 PM Raymond Auge 
wrote:

> To be clear, it's not necessarily having _all of a package_. It's more
> about all the reachable class references. For instance jdeps looks at
> classes and finds any reachable references. So does bnd for calculating
> OSGi metadata.
>
> So the issue is not really about packages, it's about having missing class
> references and whether those should be elided in configuration, or simple
> fixed in packaging (which again does not necessarily mean full packages :)
>
> - Ray
>
> On Thu, Jun 11, 2020 at 3:20 PM Rémy Maucherat  wrote:
>
>> On Thu, Jun 11, 2020 at 9:01 PM Mark Thomas  wrote:
>>
>>> Hi,
>>>
>>> As discussed in PR#298 [1], properly/fully/correctly supporting JPMS /
>>> OSGi gets trickier than necessary with the bootstrap JAR because of the
>>> way we currently package it with the minimum that it needs and duplicate
>>> some classes.
>>>
>>> My simplistic understanding is that having all of a Java package in a
>>> single JAR makes JPMS and OSGi a lot simpler. Further, our current
>>> approach may not be 100% compatible with one or both of them.
>>>
>>> The trade-offs involved here are:
>>> - having all of a package in a JAR simplifies JPMS and OSGi
>>> - We want to keep the bootstrap JAR small (is this much of a concern?)
>>> - We don't want duplicate code (maintenance overhead)
>>> - Bootstrap uses various utility functions from the Tomcat code base
>>>
>>> I'm wondering if there is a better approach we could adopt that makes
>>> JPMS / OSGi simpler without compromising too much on the other
>>> trade-offs.
>>>
>>> The sort of thing I have in mind is:
>>> - move everything out of o.a.c.startup that doesn't need to be there to
>>>   either some new package (name TBD) or an existing package
>>>
>>
>> That means way too many risky changes IMO, the listeners in the startup
>> package are often extended to add features so they need to remain in the
>> catalina.startup package.
>>
>>
>>> - create an o.a.c.startup.util package and, during the build process,
>>>   copy and package rename any utility classes the remaining classes in
>>>   o.a.c.startup depend on
>>>
>>
>> Good idea, when I read your requirements, I thought about package
>> renaming. So I think we could use package renaming for everything that
>> bootstrap.jar has to a tomcat.bootstrap or catalina.bootstrap package.
>>
>> Rémy
>>
>>
>>>
>>> The end result should be a nice clean mapping of packages to JARs.
>>>
>>> Thoughts?
>>>
>>> Mark
>>>
>>>
>>>
>>> [1] https://github.com/apache/tomcat/pull/298
>>>
>>> -
>>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>>
>>>
>
> --
> *Raymond Augé* 
>  (@rotty3000)
> Senior Software Architect *Liferay, Inc.* 
>  (@Liferay)
>


-- 
*Raymond Augé* 
 (@rotty3000)
Senior Software Architect *Liferay, Inc.* 
 (@Liferay)

Re: Likely incorrect wiki redirect

[Konstantin Kolinko]

чт, 11 июн. 2020 г. в 20:02, Christopher Schultz :
>
> All,
>
> I'm not sure who can fix this, but when I go to
> wiki.apache.org/tomcat, I'm redirected to
> https://cwiki-test.apache.org/confluence/display/tomcat which returns
> a "Service Unavailable" error.
>
> Without the /tomcat, I get redirected to the new Apache cwiki site as
> expected.
>
> Looks like maybe there is still a Redirect configured for /tomcat that
> should either be removed, or updated to point to the new Tomcat wiki.

The correct path is expected to be
https://cwiki.apache.org/confluence/display/TOMCAT
though downcase "tomcat" apparently works as well.

The wrong URL has "cwiki-test" instead of "cwiki" in the host name.

I do not know where it is configured. It was working correctly several
months ago.


Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Bootstrap and modules

[Raymond Auge]

To be clear, it's not necessarily having _all of a package_. It's more
about all the reachable class references. For instance jdeps looks at
classes and finds any reachable references. So does bnd for calculating
OSGi metadata.

So the issue is not really about packages, it's about having missing class
references and whether those should be elided in configuration, or simple
fixed in packaging (which again does not necessarily mean full packages :)

- Ray

On Thu, Jun 11, 2020 at 3:20 PM Rémy Maucherat  wrote:

> On Thu, Jun 11, 2020 at 9:01 PM Mark Thomas  wrote:
>
>> Hi,
>>
>> As discussed in PR#298 [1], properly/fully/correctly supporting JPMS /
>> OSGi gets trickier than necessary with the bootstrap JAR because of the
>> way we currently package it with the minimum that it needs and duplicate
>> some classes.
>>
>> My simplistic understanding is that having all of a Java package in a
>> single JAR makes JPMS and OSGi a lot simpler. Further, our current
>> approach may not be 100% compatible with one or both of them.
>>
>> The trade-offs involved here are:
>> - having all of a package in a JAR simplifies JPMS and OSGi
>> - We want to keep the bootstrap JAR small (is this much of a concern?)
>> - We don't want duplicate code (maintenance overhead)
>> - Bootstrap uses various utility functions from the Tomcat code base
>>
>> I'm wondering if there is a better approach we could adopt that makes
>> JPMS / OSGi simpler without compromising too much on the other trade-offs.
>>
>> The sort of thing I have in mind is:
>> - move everything out of o.a.c.startup that doesn't need to be there to
>>   either some new package (name TBD) or an existing package
>>
>
> That means way too many risky changes IMO, the listeners in the startup
> package are often extended to add features so they need to remain in the
> catalina.startup package.
>
>
>> - create an o.a.c.startup.util package and, during the build process,
>>   copy and package rename any utility classes the remaining classes in
>>   o.a.c.startup depend on
>>
>
> Good idea, when I read your requirements, I thought about package
> renaming. So I think we could use package renaming for everything that
> bootstrap.jar has to a tomcat.bootstrap or catalina.bootstrap package.
>
> Rémy
>
>
>>
>> The end result should be a nice clean mapping of packages to JARs.
>>
>> Thoughts?
>>
>> Mark
>>
>>
>>
>> [1] https://github.com/apache/tomcat/pull/298
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>>

-- 
*Raymond Augé* 
 (@rotty3000)
Senior Software Architect *Liferay, Inc.* 
 (@Liferay)

Re: Bootstrap and modules

[Rémy Maucherat]

On Thu, Jun 11, 2020 at 9:01 PM Mark Thomas  wrote:

> Hi,
>
> As discussed in PR#298 [1], properly/fully/correctly supporting JPMS /
> OSGi gets trickier than necessary with the bootstrap JAR because of the
> way we currently package it with the minimum that it needs and duplicate
> some classes.
>
> My simplistic understanding is that having all of a Java package in a
> single JAR makes JPMS and OSGi a lot simpler. Further, our current
> approach may not be 100% compatible with one or both of them.
>
> The trade-offs involved here are:
> - having all of a package in a JAR simplifies JPMS and OSGi
> - We want to keep the bootstrap JAR small (is this much of a concern?)
> - We don't want duplicate code (maintenance overhead)
> - Bootstrap uses various utility functions from the Tomcat code base
>
> I'm wondering if there is a better approach we could adopt that makes
> JPMS / OSGi simpler without compromising too much on the other trade-offs.
>
> The sort of thing I have in mind is:
> - move everything out of o.a.c.startup that doesn't need to be there to
>   either some new package (name TBD) or an existing package
>

That means way too many risky changes IMO, the listeners in the startup
package are often extended to add features so they need to remain in the
catalina.startup package.


> - create an o.a.c.startup.util package and, during the build process,
>   copy and package rename any utility classes the remaining classes in
>   o.a.c.startup depend on
>

Good idea, when I read your requirements, I thought about package renaming.
So I think we could use package renaming for everything that bootstrap.jar
has to a tomcat.bootstrap or catalina.bootstrap package.

Rémy


>
> The end result should be a nice clean mapping of packages to JARs.
>
> Thoughts?
>
> Mark
>
>
>
> [1] https://github.com/apache/tomcat/pull/298
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

[GitHub] [tomcat] markt-asf commented on pull request #297: Fix BZ 64515 - no need to filter bnd files (bnd passes ant properties…

[GitBox]

markt-asf commented on pull request #297:
URL: https://github.com/apache/tomcat/pull/297#issuecomment-642879978


   Tx. From my point of view better to have the changelog entry than not.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 64518] Illegal reflective access by WebappClassLoaderBase$1 - embedded tomcat with resteasy

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64518

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |WONTFIX
 OS||All
 Status|NEW |RESOLVED

--- Comment #2 from Mark Thomas  ---
If you run Tomcat in embedded mode on Java 9 onwards then you need to start it
with the same options to avoid those warnings.

https://github.com/apache/tomcat/blob/7.0.x/bin/catalina.sh#L322

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Bootstrap and modules

[Mark Thomas]

Hi,

As discussed in PR#298 [1], properly/fully/correctly supporting JPMS /
OSGi gets trickier than necessary with the bootstrap JAR because of the
way we currently package it with the minimum that it needs and duplicate
some classes.

My simplistic understanding is that having all of a Java package in a
single JAR makes JPMS and OSGi a lot simpler. Further, our current
approach may not be 100% compatible with one or both of them.

The trade-offs involved here are:
- having all of a package in a JAR simplifies JPMS and OSGi
- We want to keep the bootstrap JAR small (is this much of a concern?)
- We don't want duplicate code (maintenance overhead)
- Bootstrap uses various utility functions from the Tomcat code base

I'm wondering if there is a better approach we could adopt that makes
JPMS / OSGi simpler without compromising too much on the other trade-offs.

The sort of thing I have in mind is:
- move everything out of o.a.c.startup that doesn't need to be there to
  either some new package (name TBD) or an existing package
- create an o.a.c.startup.util package and, during the build process,
  copy and package rename any utility classes the remaining classes in
  o.a.c.startup depend on

The end result should be a nice clean mapping of packages to JARs.

Thoughts?

Mark



[1] https://github.com/apache/tomcat/pull/298

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 64518] Illegal reflective access by WebappClassLoaderBase$1 - embedded tomcat with resteasy

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64518

Michael Enke  changed:

   What|Removed |Added

 CC||michael.enke@wincor-nixdorf
   ||.com

--- Comment #1 from Michael Enke  ---
Created attachment 37310
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=37310=edit
the missing resteasy jar file from test.zip

Since the sile size is limited to 1000 KB I couldn't add this jar file into
test.zip

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] markt-asf commented on pull request #298: Fix BZ 64514 - classes missing from bootstrap.jar

[GitBox]

markt-asf commented on pull request #298:
URL: https://github.com/apache/tomcat/pull/298#issuecomment-642864883


   There are trade-offs here.
   Modules require "clean packages" with all code from one package in one JAR.
   Bootstrap uses utility code from elsewhere in the Tomcat code base.
   We want to keep the bootstrap JAR small.
   We don't want to duplicate code.
   
   Hmm...
   
   This feels more like a discussion for the dev list. I'll move this 
discussion there.
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 64518] New: Illegal reflective access by WebappClassLoaderBase$1 - embedded tomcat with resteasy

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64518

Bug ID: 64518
   Summary: Illegal reflective access by WebappClassLoaderBase$1 -
embedded tomcat with resteasy
   Product: Tomcat 7
   Version: 7.0.104
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: michael.e...@wincor-nixdorf.com
  Target Milestone: ---

Created attachment 37309
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=37309=edit
source+compiled class files and some jars to reproduce the problem

There is a bug report with title "Illegal reflective access by
WebappClassLoaderBase$1 in Java 13":
https://bz.apache.org/bugzilla/show_bug.cgi?id=63838;>63838 which
is fixed.
I found the same warning when using embedded tomcat 7 with resteasy servlet.
Attached source and run.bat to reproduce the problem.
Due to file size limitation of attachmed file I did not include the embedded
tomcat 7 release 104 jar files (which has to  be put into tomcat7 dir)
as well as resteasy-jaxrs-3.5.0.Final.jar (which has to be put int rest dir).

Output of starting run.bat:

C:\Temp\test>run
Juni 11, 2020 8:32:06 NACHM. org.apache.coyote.AbstractProtocol init
INFORMATION: Initializing ProtocolHandler ["http-bio-8080"]
Juni 11, 2020 8:32:06 NACHM. org.apache.catalina.core.StandardService
startInternal
INFORMATION: Starting service [Tomcat]
Juni 11, 2020 8:32:06 NACHM. org.apache.catalina.core.StandardEngine
startInternal
INFORMATION: Starting Servlet Engine: Apache Tomcat/7.0.104
WARNING: An illegal reflective access operation has occurred
WARNING: Illegal reflective access by
org.apache.catalina.loader.WebappClassLoaderBase$1
(file:/C:/Temp/test/tomcat7/tomcat-embed-core.jar) to method
java.lang.ClassLoader.registerAsParallelCapable()
WARNING: Please consider reporting this to the maintainers of
org.apache.catalina.loader.WebappClassLoaderBase$1
WARNING: Use --illegal-access=warn to enable warnings of further illegal
reflective access operations
WARNING: All illegal access operations will be denied in a future release
...

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] markt-asf commented on pull request #299: Fix BZ 64515 - no need to filter bnd files (bnd passes ant properties…

[GitBox]

markt-asf commented on pull request #299:
URL: https://github.com/apache/tomcat/pull/299#issuecomment-642862890


   I back-ported this from 10.0.x



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] markt-asf closed pull request #299: Fix BZ 64515 - no need to filter bnd files (bnd passes ant properties…

[GitBox]

markt-asf closed pull request #299:
URL: https://github.com/apache/tomcat/pull/299


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 64515] no need to filter bnd files (bnd passes ant properties in)

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64515

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #2 from Mark Thomas  ---
Fixed in:
- master for 10.0.0-M7 onwards
- 9.0.x for 9.0.37 onwards

8.5.x and 7.0.x are not affected.

Thanks for the PR.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] rotty3000 commented on pull request #297: Fix BZ 64515 - no need to filter bnd files (bnd passes ant properties…

[GitBox]

rotty3000 commented on pull request #297:
URL: https://github.com/apache/tomcat/pull/297#issuecomment-642862668


   Understood, if it's better to let you deal with the changelog I can do that. 
I just want to avoid more work for you if I could.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 9.0.x updated (a2410bb -> b894ac3)

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from a2410bb  Add and use constants
 new 44e8d71  Fix BZ 64515 - no need to filter bnd files (bnd passes ant 
properties in)
 new b894ac3  Clean-up changelog

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build.xml  | 32 --
 res/bnd/annotations-api.jar.tmp.bnd|  2 +-
 res/bnd/catalina-ha.jar.tmp.bnd|  2 +-
 res/bnd/catalina-ssi.jar.tmp.bnd   |  2 +-
 res/bnd/catalina-storeconfig.jar.tmp.bnd   |  2 +-
 res/bnd/catalina-tribes.jar.tmp.bnd|  2 +-
 res/bnd/catalina.jar.tmp.bnd   |  2 +-
 res/bnd/el-api.jar.tmp.bnd |  4 ++--
 res/bnd/jasper-el.jar.tmp.bnd  |  2 +-
 res/bnd/jasper.jar.tmp.bnd |  2 +-
 res/bnd/jaspic-api.jar.tmp.bnd |  2 +-
 res/bnd/jsp-api.jar.tmp.bnd|  2 +-
 res/bnd/servlet-api.jar.tmp.bnd|  2 +-
 res/bnd/tomcat-api.jar.tmp.bnd |  2 +-
 res/bnd/tomcat-coyote.jar.tmp.bnd  |  2 +-
 res/bnd/tomcat-dbcp.jar.tmp.bnd|  2 +-
 res/bnd/tomcat-embed-core.jar.tmp.bnd  |  2 +-
 res/bnd/tomcat-embed-el.jar.tmp.bnd|  2 +-
 res/bnd/tomcat-embed-jasper.jar.tmp.bnd|  2 +-
 res/bnd/tomcat-embed-websocket.jar.tmp.bnd |  2 +-
 res/bnd/tomcat-jni.jar.tmp.bnd |  2 +-
 res/bnd/tomcat-juli.jar.tmp.bnd|  2 +-
 res/bnd/tomcat-util-scan.jar.tmp.bnd   |  2 +-
 res/bnd/tomcat-util.jar.tmp.bnd|  2 +-
 res/bnd/tomcat-websocket.jar.tmp.bnd   |  2 +-
 res/bnd/websocket-api.jar.tmp.bnd  |  2 +-
 webapps/docs/changelog.xml |  8 ++--
 27 files changed, 36 insertions(+), 56 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/02: Clean-up changelog

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit b894ac363aec45be80c279323db4960a898ecd7f
Author: Mark Thomas 
AuthorDate: Thu Jun 11 19:33:00 2020 +0100

Clean-up changelog
---
 webapps/docs/changelog.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a3c1f3c..888f540 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -90,12 +90,12 @@
 shell feature that is not available by default on Solaris 10. (markt)
   
   
-Remove bndlib from dependencies as it is not required. Pull request
-provided by Raymond Augé. (markt)
+64513: Remove bndlib from dependencies as it is not 
required.
+Pull request provided by Raymond Augé. (markt)
   
   
-Bnd files don't need to be filtered (save some work). Pull request
-provided by Raymond Augé. (rotty3000)
+64515: Bnd files don't need to be filtered (save some work).
+Pull request provided by Raymond Augé. (markt)
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 01/02: Fix BZ 64515 - no need to filter bnd files (bnd passes ant properties in)

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 44e8d71c018bd39f32a1384544eefa1d8325595a
Author: Raymond Augé 
AuthorDate: Thu Jun 11 00:21:46 2020 -0400

Fix BZ 64515 - no need to filter bnd files (bnd passes ant properties
in)

Signed-off-by: Raymond Augé 
---
 build.xml  | 32 --
 res/bnd/annotations-api.jar.tmp.bnd|  2 +-
 res/bnd/catalina-ha.jar.tmp.bnd|  2 +-
 res/bnd/catalina-ssi.jar.tmp.bnd   |  2 +-
 res/bnd/catalina-storeconfig.jar.tmp.bnd   |  2 +-
 res/bnd/catalina-tribes.jar.tmp.bnd|  2 +-
 res/bnd/catalina.jar.tmp.bnd   |  2 +-
 res/bnd/el-api.jar.tmp.bnd |  4 ++--
 res/bnd/jasper-el.jar.tmp.bnd  |  2 +-
 res/bnd/jasper.jar.tmp.bnd |  2 +-
 res/bnd/jaspic-api.jar.tmp.bnd |  2 +-
 res/bnd/jsp-api.jar.tmp.bnd|  2 +-
 res/bnd/servlet-api.jar.tmp.bnd|  2 +-
 res/bnd/tomcat-api.jar.tmp.bnd |  2 +-
 res/bnd/tomcat-coyote.jar.tmp.bnd  |  2 +-
 res/bnd/tomcat-dbcp.jar.tmp.bnd|  2 +-
 res/bnd/tomcat-embed-core.jar.tmp.bnd  |  2 +-
 res/bnd/tomcat-embed-el.jar.tmp.bnd|  2 +-
 res/bnd/tomcat-embed-jasper.jar.tmp.bnd|  2 +-
 res/bnd/tomcat-embed-websocket.jar.tmp.bnd |  2 +-
 res/bnd/tomcat-jni.jar.tmp.bnd |  2 +-
 res/bnd/tomcat-juli.jar.tmp.bnd|  2 +-
 res/bnd/tomcat-util-scan.jar.tmp.bnd   |  2 +-
 res/bnd/tomcat-util.jar.tmp.bnd|  2 +-
 res/bnd/tomcat-websocket.jar.tmp.bnd   |  2 +-
 res/bnd/websocket-api.jar.tmp.bnd  |  2 +-
 webapps/docs/changelog.xml |  4 
 27 files changed, 34 insertions(+), 54 deletions(-)

diff --git a/build.xml b/build.xml
index c7ea21b..56c157b 100644
--- a/build.xml
+++ b/build.xml
@@ -69,7 +69,7 @@
   
   
   
-  
+  
   
   
   
@@ -554,18 +554,6 @@
   
 
 
-
-
-  
-  
-  
-  
-  
-
-  
-
-
   
 
   
 
-  
-
-
-
-  
-  
-
-
-  
-
-  
-
+  
+
 
   
   
+depends="build-manifests,setup-bnd,compile" >
 
 
 
diff --git a/res/bnd/annotations-api.jar.tmp.bnd 
b/res/bnd/annotations-api.jar.tmp.bnd
index c4fc5e6..c153fef 100644
--- a/res/bnd/annotations-api.jar.tmp.bnd
+++ b/res/bnd/annotations-api.jar.tmp.bnd
@@ -14,7 +14,7 @@
 # limitations under the License.
 Bundle-Name: tomcat-annotations-api
 Bundle-SymbolicName: org.apache.tomcat-annotations-api
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
 Export-Package: \
 javax.annotation,\
 javax.annotation.security,\
diff --git a/res/bnd/catalina-ha.jar.tmp.bnd b/res/bnd/catalina-ha.jar.tmp.bnd
index 3a39141..1e88476 100644
--- a/res/bnd/catalina-ha.jar.tmp.bnd
+++ b/res/bnd/catalina-ha.jar.tmp.bnd
@@ -14,7 +14,7 @@
 # limitations under the License.
 Bundle-Name: tomcat-catalina-ha
 Bundle-SymbolicName: org.apache.tomcat-catalina-ha
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
 Export-Package: \
 org.apache.catalina.ha,\
 org.apache.catalina.ha.authenticator,\
diff --git a/res/bnd/catalina-ssi.jar.tmp.bnd b/res/bnd/catalina-ssi.jar.tmp.bnd
index cd40151..ba9fd41 100644
--- a/res/bnd/catalina-ssi.jar.tmp.bnd
+++ b/res/bnd/catalina-ssi.jar.tmp.bnd
@@ -14,6 +14,6 @@
 # limitations under the License.
 Bundle-Name: tomcat-ssi
 Bundle-SymbolicName: org.apache.tomcat-ssi
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
 Export-Package: \
 org.apache.catalina.ssi
diff --git a/res/bnd/catalina-storeconfig.jar.tmp.bnd 
b/res/bnd/catalina-storeconfig.jar.tmp.bnd
index bfd44db..0443331 100644
--- a/res/bnd/catalina-storeconfig.jar.tmp.bnd
+++ b/res/bnd/catalina-storeconfig.jar.tmp.bnd
@@ -14,5 +14,5 @@
 # limitations under the License.
 Bundle-Name: tomcat-storeconfig
 Bundle-SymbolicName: org.apache.tomcat-storeconfig
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
 Export-Package: org.apache.catalina.storeconfig
\ No newline at end of file
diff --git a/res/bnd/catalina-tribes.jar.tmp.bnd 
b/res/bnd/catalina-tribes.jar.tmp.bnd
index 23ac6dd..a4b8754 100644
--- a/res/bnd/catalina-tribes.jar.tmp.bnd
+++ b/res/bnd/catalina-tribes.jar.tmp.bnd
@@ -14,7 +14,7 @@
 # limitations under the License.
 Bundle-Name: tomcat-tribes
 Bundle-SymbolicName: org.apache.tomcat-tribes
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
 Export-Package: \
 org.apache.catalina.tribes,\
 org.apache.catalina.tribes.group,\
diff --git a/res/bnd/catalina.jar.tmp.bnd b/res/bnd/catalina.jar.tmp.bnd
index 185b968..ce296f2 100644
--- a/res/bnd/catalina.jar.tmp.bnd
+++ 

[GitHub] [tomcat] markt-asf commented on pull request #297: Fix BZ 64515 - no need to filter bnd files (bnd passes ant properties…

[GitBox]

markt-asf commented on pull request #297:
URL: https://github.com/apache/tomcat/pull/297#issuecomment-642859410


   I added the bug number of the changelog entry (I had missed in in the 
example you copied). The Tomcat committer id is always going to be tricky as 
you don't know which committer is going to review and merge the request. We 
need to figure out a way to handle that.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Clean-up changelog

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 026ee2a  Clean-up changelog
026ee2a is described below

commit 026ee2a21d8364c35578cddfd70c6ba44e4c22e1
Author: Mark Thomas 
AuthorDate: Thu Jun 11 19:33:00 2020 +0100

Clean-up changelog
---
 webapps/docs/changelog.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f86e799..61c628c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -96,12 +96,12 @@
 Raymond Augé. (markt)
   
   
-Remove bndlib from dependencies as it is not required. Pull request
-provided by Raymond Augé. (markt)
+64513: Remove bndlib from dependencies as it is not 
required.
+Pull request provided by Raymond Augé. (markt)
   
   
-Bnd files don't need to be filtered (save some work). Pull request
-provided by Raymond Augé. (rotty3000)
+64515: Bnd files don't need to be filtered (save some work).
+Pull request provided by Raymond Augé. (markt)
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Fix BZ 64515 - no need to filter bnd files (bnd passes ant properties in)

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new a546953  Fix BZ 64515 - no need to filter bnd files (bnd passes ant 
properties in)
a546953 is described below

commit a546953a6bc62f28e9e4f6612b2c8dcfb110bc6d
Author: Raymond Augé 
AuthorDate: Thu Jun 11 00:21:46 2020 -0400

Fix BZ 64515 - no need to filter bnd files (bnd passes ant properties in)

Signed-off-by: Raymond Augé 
---
 build.xml  | 30 +++---
 res/bnd/annotations-api.jar.tmp.bnd|  2 +-
 res/bnd/catalina-ha.jar.tmp.bnd|  2 +-
 res/bnd/catalina-ssi.jar.tmp.bnd   |  2 +-
 res/bnd/catalina-storeconfig.jar.tmp.bnd   |  2 +-
 res/bnd/catalina-tribes.jar.tmp.bnd|  2 +-
 res/bnd/catalina.jar.tmp.bnd   |  2 +-
 res/bnd/el-api.jar.tmp.bnd |  2 +-
 res/bnd/jasper-el.jar.tmp.bnd  |  2 +-
 res/bnd/jasper.jar.tmp.bnd |  2 +-
 res/bnd/jaspic-api.jar.tmp.bnd |  2 +-
 res/bnd/jsp-api.jar.tmp.bnd|  2 +-
 res/bnd/servlet-api.jar.tmp.bnd|  2 +-
 res/bnd/tomcat-api.jar.tmp.bnd |  2 +-
 res/bnd/tomcat-coyote.jar.tmp.bnd  |  2 +-
 res/bnd/tomcat-dbcp.jar.tmp.bnd|  2 +-
 res/bnd/tomcat-embed-core.jar.tmp.bnd  |  2 +-
 res/bnd/tomcat-embed-el.jar.tmp.bnd|  2 +-
 res/bnd/tomcat-embed-jasper.jar.tmp.bnd|  2 +-
 res/bnd/tomcat-embed-websocket.jar.tmp.bnd |  2 +-
 res/bnd/tomcat-jni.jar.tmp.bnd |  2 +-
 res/bnd/tomcat-juli.jar.tmp.bnd|  2 +-
 res/bnd/tomcat-util-scan.jar.tmp.bnd   |  2 +-
 res/bnd/tomcat-util.jar.tmp.bnd|  2 +-
 res/bnd/tomcat-websocket.jar.tmp.bnd   |  2 +-
 res/bnd/websocket-api.jar.tmp.bnd  |  2 +-
 webapps/docs/changelog.xml |  4 
 27 files changed, 32 insertions(+), 52 deletions(-)

diff --git a/build.xml b/build.xml
index 09099d9..931524c 100644
--- a/build.xml
+++ b/build.xml
@@ -73,7 +73,7 @@
   
   
   
-  
+  
   
   
   
@@ -558,18 +558,6 @@
   
 
 
-
-
-  
-  
-  
-  
-  
-
-  
-
-
   
 
   
 
-  
-
-
-
-  
-  
-
-
-  
-
-  
+  
 
 
   
   
+depends="build-manifests,setup-bnd,compile" >
 
 
 
diff --git a/res/bnd/annotations-api.jar.tmp.bnd 
b/res/bnd/annotations-api.jar.tmp.bnd
index 67c7c5f..702a5ad 100644
--- a/res/bnd/annotations-api.jar.tmp.bnd
+++ b/res/bnd/annotations-api.jar.tmp.bnd
@@ -14,7 +14,7 @@
 # limitations under the License.
 Bundle-Name: tomcat-annotations-api
 Bundle-SymbolicName: org.apache.tomcat-annotations-api
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
 Export-Package: \
 jakarta.annotation,\
 jakarta.annotation.security,\
diff --git a/res/bnd/catalina-ha.jar.tmp.bnd b/res/bnd/catalina-ha.jar.tmp.bnd
index 3a39141..1e88476 100644
--- a/res/bnd/catalina-ha.jar.tmp.bnd
+++ b/res/bnd/catalina-ha.jar.tmp.bnd
@@ -14,7 +14,7 @@
 # limitations under the License.
 Bundle-Name: tomcat-catalina-ha
 Bundle-SymbolicName: org.apache.tomcat-catalina-ha
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
 Export-Package: \
 org.apache.catalina.ha,\
 org.apache.catalina.ha.authenticator,\
diff --git a/res/bnd/catalina-ssi.jar.tmp.bnd b/res/bnd/catalina-ssi.jar.tmp.bnd
index cd40151..ba9fd41 100644
--- a/res/bnd/catalina-ssi.jar.tmp.bnd
+++ b/res/bnd/catalina-ssi.jar.tmp.bnd
@@ -14,6 +14,6 @@
 # limitations under the License.
 Bundle-Name: tomcat-ssi
 Bundle-SymbolicName: org.apache.tomcat-ssi
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
 Export-Package: \
 org.apache.catalina.ssi
diff --git a/res/bnd/catalina-storeconfig.jar.tmp.bnd 
b/res/bnd/catalina-storeconfig.jar.tmp.bnd
index bfd44db..0443331 100644
--- a/res/bnd/catalina-storeconfig.jar.tmp.bnd
+++ b/res/bnd/catalina-storeconfig.jar.tmp.bnd
@@ -14,5 +14,5 @@
 # limitations under the License.
 Bundle-Name: tomcat-storeconfig
 Bundle-SymbolicName: org.apache.tomcat-storeconfig
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
 Export-Package: org.apache.catalina.storeconfig
\ No newline at end of file
diff --git a/res/bnd/catalina-tribes.jar.tmp.bnd 
b/res/bnd/catalina-tribes.jar.tmp.bnd
index 23ac6dd..a4b8754 100644
--- a/res/bnd/catalina-tribes.jar.tmp.bnd
+++ b/res/bnd/catalina-tribes.jar.tmp.bnd
@@ -14,7 +14,7 @@
 # limitations under the License.
 Bundle-Name: tomcat-tribes
 Bundle-SymbolicName: org.apache.tomcat-tribes
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
 Export-Package: \
 org.apache.catalina.tribes,\
 

[GitHub] [tomcat] markt-asf merged pull request #297: Fix BZ 64515 - no need to filter bnd files (bnd passes ant properties…

[GitBox]

markt-asf merged pull request #297:
URL: https://github.com/apache/tomcat/pull/297


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Support for LetsEncrypt certs, and update process, in Tomcat without restart.

[Romain Manni-Bucau]

This one was more intended to System.exit but it got aligned with mw impl
so it is quite close.

Le jeu. 11 juin 2020 à 19:40, Christopher Schultz <
ch...@christopherschultz.net> a écrit :

> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA256
>
> Romain,
>
> On 6/11/20 13:34, Romain Manni-Bucau wrote:
> > @Chris:
> https://github.com/rmannibucau/letsencrypt-manager/blob/master/src/main/
> java/com/github/rmannibucau/letsencrypt/manager/LetsEncryptManager.java
> 
> ?
>
> Thanks!
>
> Stupid GitHub. I searched all your repositories for "encrypt" and it
> didn't find "letsencrypt". I guess "search" means "prefix match".
> *facepalm*
>
> > it is more or less what we have in meecrowave except meecrowave
> > can hotreload whereas this (pre reloadSslHostConfig method) impl
> > does not.
>
> Your LetsEncryptManager seems to call reloadSslHostConfigs. What does
> Meecrowave do differently?
>
> - -chris
>
> > Le jeu. 11 juin 2020 à 19:20, Christopher Schultz
> >  > > a écrit :
> >
> > Merlin,
> >
> > On 6/10/20 12:32, Merlin Beedell wrote:
> >> Well thanks Christopher - that presentation link was just what I
> >> needed (well - it was your presentation after all!). Really
> >> good. Ideally this could be written into the Tomcat standard
> >> Documentation, as it will crop up quite a bit.
> >
> >> In summary, 3 steps:
> >
> >> 1. Fetch cert update (requires port 80).
> >
> >> – certbot-auto renew
> >
> >> 2. Reformat for Tomcat usage [might be natively handled in later
> >> Tomcat releases?]
> >
> >> – openssl pkcs12 -export -in [cert] -inkey [key] -certfile
> >> [chain] -out [p12file]
> >
> >> 3. Use JMX to flush/reload the SSH Host config (including cipher
> >> list & protocol level) at runtime.
> >
> >> https://localhost/manager/jmxproxy?invoke=Catalina:type=ProtocolHandl
> e
> >
> >>
> r,port=8443,address=
> >  er,port=8443,address=
> 
> >"127.0.0.1"=reloadSslHostConfigs
> >
> >  While
> >
> > "[documentation] patches are always welcome", I don't think I'd
> > want to put this into the Tomcat user's manual. If we add
> > information about Let's Encrypt, why not DigiCert? VeriSign?
> > GoDaddy? WhoeeverElseCA ?
> >
> > I could see this being something useful in the Tomcat Wiki.
> >
> > At least one person who has seen my presentation has said "we, I
> > was hoping there was just a letsencrypt='true' configuration flag".
> > I like the outside-in approach certbot takes with their Apache
> > plugins, rather than an inside-out approach where the server
> > actually has a plug-in for let's encrypt (or similar).
> >
> > Romain @ TomEE has written a WAR file that implements this
> > inside-out approach as a generic ACME servlet (context listener?),
> > but I can't seem to find his code anywhere...
> >
> > -chris
> >
> >> -Original Message-
> >
> >> From: Christopher Schultz  > >
> >
> >> Sent: 08 June 2020 9:14 PM
> >
> >> To: Tomcat Developers List  > >; Merlin Beedell
> >> mailto:mbeed...@cryoserver.com>>
> >
> >> Subject: Re: Support for LetsEncrypt certs, and update process,
> >> in Tomcat without restart.
> >
> >
> >
> >> Hash: SHA256
> >
> >
> >
> >> Merlin,
> >
> >
> >
> >> On 6/8/20 10:17, Merlin Beedell wrote:
> >
> >>> I am getting a lot of flack from some senior devs who insist
> >>> that
> >
> >>> Tomcat must be put behind a Proxy – HA Proxy or Nginx, which
> >>> will
> >
> >>> handle the SSL offloading etc.
> >
> >
> >
> >>> While this seems sensible for multi-server environments, they
> >>> want it
> >
> >>> for single server too.  But Tomcat can do all the things that
> >>> are
> >
> >>> required:
> >
> >
> >
> >>> * Certificate handling. * TLS level and Cipher restrictions *
> >>> CORS
> >
> >>> handling (though this could be simpler!)
> >
> >
> >
> >>> But now with the requirement for LetsEncrypt certificates, we
> >>> find
> >
> >>> that Tomcat has to be restarted every 3 months.  Indeed – any
> >>> changes
> >
> >>> to the above require tomcat restarts – and that is found to be
> >
> >>> unacceptable.
> >
> >
> >
> >> Nonsense.
> >
> >
> >
> >> http://tomcat.apache.org/presentations.html#latest-lets-encrypt
> >
> >
> >
> >> Updating CORS configuration may require a redeployment of your
> >> web application, but it does not require Tomcat to be shut-down.
> >
> >
> >
> >> There are other reasons to use a reverse proxy in front of
> >> Tomcat, but none of the above are good reasons.
> >
> >
> >
> >>> So what I really want to understand is if Tomcat has any plans
> >>> to
> >
> >>> include the ability to restart an https connector WITHOUT
> >>> needing to
> >
> >>> restart the whole of 

Re: Support for LetsEncrypt certs, and update process, in Tomcat without restart.

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Romain,

On 6/11/20 13:34, Romain Manni-Bucau wrote:
> @Chris:
https://github.com/rmannibucau/letsencrypt-manager/blob/master/src/main/
java/com/github/rmannibucau/letsencrypt/manager/LetsEncryptManager.java
?

Thanks!

Stupid GitHub. I searched all your repositories for "encrypt" and it
didn't find "letsencrypt". I guess "search" means "prefix match".
*facepalm*

> it is more or less what we have in meecrowave except meecrowave
> can hotreload whereas this (pre reloadSslHostConfig method) impl
> does not.

Your LetsEncryptManager seems to call reloadSslHostConfigs. What does
Meecrowave do differently?

- -chris

> Le jeu. 11 juin 2020 à 19:20, Christopher Schultz
>  > a écrit :
>
> Merlin,
>
> On 6/10/20 12:32, Merlin Beedell wrote:
>> Well thanks Christopher - that presentation link was just what I
>> needed (well - it was your presentation after all!). Really
>> good. Ideally this could be written into the Tomcat standard
>> Documentation, as it will crop up quite a bit.
>
>> In summary, 3 steps:
>
>> 1. Fetch cert update (requires port 80).
>
>> – certbot-auto renew
>
>> 2. Reformat for Tomcat usage [might be natively handled in later
>> Tomcat releases?]
>
>> – openssl pkcs12 -export -in [cert] -inkey [key] -certfile
>> [chain] -out [p12file]
>
>> 3. Use JMX to flush/reload the SSH Host config (including cipher
>> list & protocol level) at runtime.
>
>> https://localhost/manager/jmxproxy?invoke=Catalina:type=ProtocolHandl
e
>
>>
r,port=8443,address=
> "127.0.0.1"=reloadSslHostConfigs
>
>  While
>
> "[documentation] patches are always welcome", I don't think I'd
> want to put this into the Tomcat user's manual. If we add
> information about Let's Encrypt, why not DigiCert? VeriSign?
> GoDaddy? WhoeeverElseCA ?
>
> I could see this being something useful in the Tomcat Wiki.
>
> At least one person who has seen my presentation has said "we, I
> was hoping there was just a letsencrypt='true' configuration flag".
> I like the outside-in approach certbot takes with their Apache
> plugins, rather than an inside-out approach where the server
> actually has a plug-in for let's encrypt (or similar).
>
> Romain @ TomEE has written a WAR file that implements this
> inside-out approach as a generic ACME servlet (context listener?),
> but I can't seem to find his code anywhere...
>
> -chris
>
>> -Original Message-
>
>> From: Christopher Schultz  >
>
>> Sent: 08 June 2020 9:14 PM
>
>> To: Tomcat Developers List  >; Merlin Beedell
>> mailto:mbeed...@cryoserver.com>>
>
>> Subject: Re: Support for LetsEncrypt certs, and update process,
>> in Tomcat without restart.
>
>
>
>> Hash: SHA256
>
>
>
>> Merlin,
>
>
>
>> On 6/8/20 10:17, Merlin Beedell wrote:
>
>>> I am getting a lot of flack from some senior devs who insist
>>> that
>
>>> Tomcat must be put behind a Proxy – HA Proxy or Nginx, which
>>> will
>
>>> handle the SSL offloading etc.
>
>
>
>>> While this seems sensible for multi-server environments, they
>>> want it
>
>>> for single server too.  But Tomcat can do all the things that
>>> are
>
>>> required:
>
>
>
>>> * Certificate handling. * TLS level and Cipher restrictions *
>>> CORS
>
>>> handling (though this could be simpler!)
>
>
>
>>> But now with the requirement for LetsEncrypt certificates, we
>>> find
>
>>> that Tomcat has to be restarted every 3 months.  Indeed – any
>>> changes
>
>>> to the above require tomcat restarts – and that is found to be
>
>>> unacceptable.
>
>
>
>> Nonsense.
>
>
>
>> http://tomcat.apache.org/presentations.html#latest-lets-encrypt
>
>
>
>> Updating CORS configuration may require a redeployment of your
>> web application, but it does not require Tomcat to be shut-down.
>
>
>
>> There are other reasons to use a reverse proxy in front of
>> Tomcat, but none of the above are good reasons.
>
>
>
>>> So what I really want to understand is if Tomcat has any plans
>>> to
>
>>> include the ability to restart an https connector WITHOUT
>>> needing to
>
>>> restart the whole of Tomcat.  Better still, a hook that would
>>> help
>
>>> refresh certificates – like LetsEncrypt.
>
>
>
>
>> https://stackoverflow.com/questions/43571572/programmatically-update-
c
>
>>
ertificates-in-tomcat-8-without-server-restart
> 
>
>
>
>
>
>
>
>> There
>
>
>
>> are no currently-correct answers to that question.
>
>
>
>> I can fix that.
>
>
>
>> -chris
>
>
>
>
- -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>  For additional commands,
> e-mail: dev-h...@tomcat.apache.org
> 
>
-BEGIN 

Re: Support for LetsEncrypt certs, and update process, in Tomcat without restart.

[Romain Manni-Bucau]

@Chris:
https://github.com/rmannibucau/letsencrypt-manager/blob/master/src/main/java/com/github/rmannibucau/letsencrypt/manager/LetsEncryptManager.java
?
it is more or less what we have in meecrowave except meecrowave can
hotreload whereas this (pre reloadSslHostConfig method) impl does not.

Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | Book



Le jeu. 11 juin 2020 à 19:20, Christopher Schultz <
ch...@christopherschultz.net> a écrit :

> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA256
>
> Merlin,
>
> On 6/10/20 12:32, Merlin Beedell wrote:
> > Well thanks Christopher - that presentation link was just what I
> > needed (well - it was your presentation after all!). Really good.
> > Ideally this could be written into the Tomcat standard
> > Documentation, as it will crop up quite a bit.
> >
> > In summary, 3 steps:
> >
> > 1. Fetch cert update (requires port 80).
> >
> > – certbot-auto renew
> >
> > 2. Reformat for Tomcat usage [might be natively handled in later
> > Tomcat releases?]
> >
> > – openssl pkcs12 -export -in [cert] -inkey [key] -certfile [chain]
> >  -out [p12file]
> >
> > 3. Use JMX to flush/reload the SSH Host config (including cipher
> > list & protocol level) at runtime.
> >
> > https://localhost/manager/jmxproxy?invoke=Catalina:type=ProtocolHandle
> r,port=8443,address=
> 
> "127.0.0.1"=reloadSslHostConfigs
>
> While
> >
> "[documentation] patches are always welcome", I don't think I'd
> want to put this into the Tomcat user's manual. If we add information
> about Let's Encrypt, why not DigiCert? VeriSign? GoDaddy? WhoeeverElseCA
> ?
>
> I could see this being something useful in the Tomcat Wiki.
>
> At least one person who has seen my presentation has said "we, I was
> hoping there was just a letsencrypt='true' configuration flag". I like
> the outside-in approach certbot takes with their Apache plugins,
> rather than an inside-out approach where the server actually has a
> plug-in for let's encrypt (or similar).
>
> Romain @ TomEE has written a WAR file that implements this inside-out
> approach as a generic ACME servlet (context listener?), but I can't
> seem to find his code anywhere...
>
> - -chris
>
> > -Original Message-
> >
> > From: Christopher Schultz 
> >
> > Sent: 08 June 2020 9:14 PM
> >
> > To: Tomcat Developers List ; Merlin Beedell
> >  
> >
> > Subject: Re: Support for LetsEncrypt certs, and update process, in
> >  Tomcat without restart.
> >
> >
> >
> > Hash: SHA256
> >
> >
> >
> > Merlin,
> >
> >
> >
> > On 6/8/20 10:17, Merlin Beedell wrote:
> >
> >> I am getting a lot of flack from some senior devs who insist
> >> that
> >
> >> Tomcat must be put behind a Proxy – HA Proxy or Nginx, which
> >> will
> >
> >> handle the SSL offloading etc.
> >
> >
> >
> >> While this seems sensible for multi-server environments, they
> >> want it
> >
> >> for single server too.  But Tomcat can do all the things that
> >> are
> >
> >> required:
> >
> >
> >
> >> * Certificate handling. * TLS level and Cipher restrictions *
> >> CORS
> >
> >> handling (though this could be simpler!)
> >
> >
> >
> >> But now with the requirement for LetsEncrypt certificates, we
> >> find
> >
> >> that Tomcat has to be restarted every 3 months.  Indeed – any
> >> changes
> >
> >> to the above require tomcat restarts – and that is found to be
> >
> >> unacceptable.
> >
> >
> >
> > Nonsense.
> >
> >
> >
> > http://tomcat.apache.org/presentations.html#latest-lets-encrypt
> >
> >
> >
> > Updating CORS configuration may require a redeployment of your web
> >  application, but it does not require Tomcat to be shut-down.
> >
> >
> >
> > There are other reasons to use a reverse proxy in front of Tomcat,
> >  but none of the above are good reasons.
> >
> >
> >
> >> So what I really want to understand is if Tomcat has any plans
> >> to
> >
> >> include the ability to restart an https connector WITHOUT needing
> >>  to
> >
> >> restart the whole of Tomcat.  Better still, a hook that would
> >> help
> >
> >> refresh certificates – like LetsEncrypt.
> >
> >
> >
> >
> > https://stackoverflow.com/questions/43571572/programmatically-update-c
> ertificates-in-tomcat-8-without-server-restart
> 
> >
> >
> >
> >
> >
> >
> > There
> >
> >
> >
> > are no currently-correct answers to that question.
> >
> >
> >
> > I can fix that.
> >
> >
> >
> > -chris
> >
> >
> -BEGIN PGP SIGNATURE-
> Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
>
> iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl7iZ88ACgkQHPApP6U8
> 

Re: Support for LetsEncrypt certs, and update process, in Tomcat without restart.

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Merlin,

On 6/10/20 12:32, Merlin Beedell wrote:
> Well thanks Christopher - that presentation link was just what I
> needed (well - it was your presentation after all!). Really good.
> Ideally this could be written into the Tomcat standard
> Documentation, as it will crop up quite a bit.
>
> In summary, 3 steps:
>
> 1. Fetch cert update (requires port 80).
>
> – certbot-auto renew
>
> 2. Reformat for Tomcat usage [might be natively handled in later
> Tomcat releases?]
>
> – openssl pkcs12 -export -in [cert] -inkey [key] -certfile [chain]
>  -out [p12file]
>
> 3. Use JMX to flush/reload the SSH Host config (including cipher
> list & protocol level) at runtime.
>
> https://localhost/manager/jmxproxy?invoke=Catalina:type=ProtocolHandle
r,port=8443,address="127.0.0.1"=reloadSslHostConfigs

While
>
"[documentation] patches are always welcome", I don't think I'd
want to put this into the Tomcat user's manual. If we add information
about Let's Encrypt, why not DigiCert? VeriSign? GoDaddy? WhoeeverElseCA
?

I could see this being something useful in the Tomcat Wiki.

At least one person who has seen my presentation has said "we, I was
hoping there was just a letsencrypt='true' configuration flag". I like
the outside-in approach certbot takes with their Apache plugins,
rather than an inside-out approach where the server actually has a
plug-in for let's encrypt (or similar).

Romain @ TomEE has written a WAR file that implements this inside-out
approach as a generic ACME servlet (context listener?), but I can't
seem to find his code anywhere...

- -chris

> -Original Message-
>
> From: Christopher Schultz 
>
> Sent: 08 June 2020 9:14 PM
>
> To: Tomcat Developers List ; Merlin Beedell
>  
>
> Subject: Re: Support for LetsEncrypt certs, and update process, in
>  Tomcat without restart.
>
>
>
> Hash: SHA256
>
>
>
> Merlin,
>
>
>
> On 6/8/20 10:17, Merlin Beedell wrote:
>
>> I am getting a lot of flack from some senior devs who insist
>> that
>
>> Tomcat must be put behind a Proxy – HA Proxy or Nginx, which
>> will
>
>> handle the SSL offloading etc.
>
>
>
>> While this seems sensible for multi-server environments, they
>> want it
>
>> for single server too.  But Tomcat can do all the things that
>> are
>
>> required:
>
>
>
>> * Certificate handling. * TLS level and Cipher restrictions *
>> CORS
>
>> handling (though this could be simpler!)
>
>
>
>> But now with the requirement for LetsEncrypt certificates, we
>> find
>
>> that Tomcat has to be restarted every 3 months.  Indeed – any
>> changes
>
>> to the above require tomcat restarts – and that is found to be
>
>> unacceptable.
>
>
>
> Nonsense.
>
>
>
> http://tomcat.apache.org/presentations.html#latest-lets-encrypt
>
>
>
> Updating CORS configuration may require a redeployment of your web
>  application, but it does not require Tomcat to be shut-down.
>
>
>
> There are other reasons to use a reverse proxy in front of Tomcat,
>  but none of the above are good reasons.
>
>
>
>> So what I really want to understand is if Tomcat has any plans
>> to
>
>> include the ability to restart an https connector WITHOUT needing
>>  to
>
>> restart the whole of Tomcat.  Better still, a hook that would
>> help
>
>> refresh certificates – like LetsEncrypt.
>
>
>
>
> https://stackoverflow.com/questions/43571572/programmatically-update-c
ertificates-in-tomcat-8-without-server-restart
>
>
>
>
>
>
> There
>
>
>
> are no currently-correct answers to that question.
>
>
>
> I can fix that.
>
>
>
> -chris
>
>
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl7iZ88ACgkQHPApP6U8
pFiMOQ//XsUcdESt//fApST4TGad+KpkTX964+jhgqaC0uprpTpd/GRpo81yxupI
oRbQ/UVwZHOWglClZCQoL8fbFYSCcizAIWhJqmMiTMshx6sYXIINC478zcO/B7VY
V8i+DpT0mdi3jYwc59lZD4e/P/v9jJJjGAuS6YrlrHjdAt5IcEJ5+2JG3HaGnhzp
ALYbq0OaQfM0jTnDymIHuXmuoAZbhon0+4tYAO/hHIbMJE+xvgeud3qRJXNhjpIv
YjWfQ06zNAuuOMvUtYjN8ONAUAl8FR5rOcC0lT6nMK1EpIglmtqcu3CIuXxtEu3M
zEkOSWDVqziN00lmcaoZ2GqYYOPS0+GH+OfcM489X731bZDJR9VUlepFBaYM21X6
BAsdmT2U6yvpEw/wOyuRMbo50toMLc1eULeAPgsCudNaWWA2T7AUaxpYbzw8jt4t
oIZhIGsEEHySWzxO7e17Puq/Z9zWC0T9+vFIfL19n1EDC+8UuhPOBnZ7Vvgu1GHn
wdHG26+Rc9NPUnkY5L2AG33itBD/lvo53HRryFHxzgbw1n0KdxethczsBarzdKGl
7W0GUkYZi4aSxcdcOHcs0Brcnv7RwWEU2FcI96BHoVn80TW8qUuE83Dfr6py2gzR
EP2dqd7JiGpTrDZZdIBkcoQ5B4/z/39KuyZkeYPNPp85gcPdayI=
=5mUH
-END PGP SIGNATURE-

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Likely incorrect wiki redirect

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

All,

I'm not sure who can fix this, but when I go to
wiki.apache.org/tomcat, I'm redirected to
https://cwiki-test.apache.org/confluence/display/tomcat which returns
a "Service Unavailable" error.

Without the /tomcat, I get redirected to the new Apache cwiki site as
expected.

Looks like maybe there is still a Redirect configured for /tomcat that
should either be removed, or updated to point to the new Tomcat wiki.

Thanks!
- -chris

-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl7iY7MACgkQHPApP6U8
pFgcMA//VTK2HpVJsUUDOIdmwCVZLKu5cUtAF7fIR6QeR/MGWXkivSOgwPM0n2lO
QMeV2KW4FTWX2ZJjtGrKGTozaHL8TjZmrHLolChQLoKeYbLMPrBPTxJ/Fu2V/wVU
J7+Vy/d9tQBqupWkdu7YNbj1nsnlfaPuoDAe7lPhCwsGkHg0gZf/B/pk4Wu5nNao
2wyRW06t516VhAk2mntsDjAcwOxTUCkOmS+dyC5/1CEQwHnOQnpfl7mhsk5Po1Gf
y0YyiCS89ZxDjmQ9LYP3k15Kb1kFcQ8dgGK6eafLucA1uUrirQ6GN7HvhGgqbu2f
+fBxaKLHJ9PTQx3hglD5R6qwqZna1Ayd1f9LOpfrEp6K2MHY6fwcACwXB3PgF+QE
RSymHa8VVP3sHi30ryPgxXYHSmjsOQvhddGlxgWQ9iBOlir84Q3B2zX0SpCsdOcf
F9pFr+Y4NSdlOvlFLP6LCL/k4qvnH2Mq9zcLpFsm2k6d1C7K9wQ0bLc0f4WPXc5G
dqHvSkOwLA2CgII9te1TkvGhavs+y72NIczv81I2BHE+/qwp6QG2BVX9y+5oljqe
DLAoSkPzhVyVK7N4/rHXbKyyhvSXB1kzA8jM8bTIij2/aluQIyEb3uj+J2G9MMSh
eVALrMPro4900eSaTOsOZGOvqDfG6Bs8xF7BioeAilPUDKOQPNM=
=y6Hc
-END PGP SIGNATURE-

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 8.5.x updated: Add and use constants

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 5b794bb  Add and use constants
5b794bb is described below

commit 5b794bb68f720ec0cc37465a49fc9431f90136b7
Author: remm 
AuthorDate: Thu Jun 11 17:22:06 2020 +0200

Add and use constants
---
 java/org/apache/tomcat/util/net/jsse/PEMFile.java | 27 +++
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/jsse/PEMFile.java 
b/java/org/apache/tomcat/util/net/jsse/PEMFile.java
index cccf8f4..ee62c25 100644
--- a/java/org/apache/tomcat/util/net/jsse/PEMFile.java
+++ b/java/org/apache/tomcat/util/net/jsse/PEMFile.java
@@ -62,11 +62,11 @@ public class PEMFile {
 
 public static String toPEM(X509Certificate certificate) throws 
CertificateEncodingException {
 StringBuilder result = new StringBuilder();
-result.append("-BEGIN CERTIFICATE-");
+result.append(Part.BEGIN_BOUNDARY + Part.CERTIFICATE + 
Part.FINISH_BOUNDARY);
 result.append(System.lineSeparator());
 Base64 b64 = new Base64(64);
 result.append(b64.encodeAsString(certificate.getEncoded()));
-result.append("-END CERTIFICATE-");
+result.append(Part.END_BOUNDARY + Part.CERTIFICATE + 
Part.FINISH_BOUNDARY);
 return result.toString();
 }
 
@@ -103,7 +103,8 @@ public class PEMFile {
 while ((line = reader.readLine()) != null) {
 if (line.startsWith(Part.BEGIN_BOUNDARY)) {
 part = new Part();
-part.type = line.substring(Part.BEGIN_BOUNDARY.length(), 
line.length() - 5).trim();
+part.type = line.substring(Part.BEGIN_BOUNDARY.length(),
+line.length() - 
Part.FINISH_BOUNDARY.length()).trim();
 } else if (line.startsWith(Part.END_BOUNDARY)) {
 parts.add(part);
 part = null;
@@ -115,20 +116,20 @@ public class PEMFile {
 
 for (Part part : parts) {
 switch (part.type) {
-case "PRIVATE KEY":
+case Part.PRIVATE_KEY:
 privateKey = part.toPrivateKey(null, keyAlgorithm, 
Format.PKCS8);
 break;
-case "EC PRIVATE KEY":
+case Part.EC_PRIVATE_KEY:
 privateKey = part.toPrivateKey(null, "EC", Format.RFC5915);
 break;
-case "ENCRYPTED PRIVATE KEY":
+case Part.ENCRYPTED_PRIVATE_KEY:
 privateKey = part.toPrivateKey(password, keyAlgorithm, 
Format.PKCS8);
 break;
-case "RSA PRIVATE KEY":
+case Part.RSA_PRIVATE_KEY:
 privateKey = part.toPrivateKey(null, keyAlgorithm, 
Format.PKCS1);
 break;
-case "CERTIFICATE":
-case "X509 CERTIFICATE":
+case Part.CERTIFICATE:
+case Part.X509_CERTIFICATE:
 certificates.add(part.toCertificate());
 break;
 }
@@ -138,6 +139,14 @@ public class PEMFile {
 private class Part {
 public static final String BEGIN_BOUNDARY = "-BEGIN ";
 public static final String END_BOUNDARY   = "-END ";
+public static final String FINISH_BOUNDARY = "-";
+
+public static final String PRIVATE_KEY = "PRIVATE KEY";
+public static final String EC_PRIVATE_KEY = "EC PRIVATE KEY";
+public static final String ENCRYPTED_PRIVATE_KEY = "ENCRYPTED PRIVATE 
KEY";
+public static final String RSA_PRIVATE_KEY = "RSA PRIVATE KEY";
+public static final String CERTIFICATE = "CERTIFICATE";
+public static final String X509_CERTIFICATE = "X509 CERTIFICATE";
 
 public String type;
 public String content = "";


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 8.5.x updated: Add and use constants

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 5b794bb  Add and use constants
5b794bb is described below

commit 5b794bb68f720ec0cc37465a49fc9431f90136b7
Author: remm 
AuthorDate: Thu Jun 11 17:22:06 2020 +0200

Add and use constants
---
 java/org/apache/tomcat/util/net/jsse/PEMFile.java | 27 +++
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/jsse/PEMFile.java 
b/java/org/apache/tomcat/util/net/jsse/PEMFile.java
index cccf8f4..ee62c25 100644
--- a/java/org/apache/tomcat/util/net/jsse/PEMFile.java
+++ b/java/org/apache/tomcat/util/net/jsse/PEMFile.java
@@ -62,11 +62,11 @@ public class PEMFile {
 
 public static String toPEM(X509Certificate certificate) throws 
CertificateEncodingException {
 StringBuilder result = new StringBuilder();
-result.append("-BEGIN CERTIFICATE-");
+result.append(Part.BEGIN_BOUNDARY + Part.CERTIFICATE + 
Part.FINISH_BOUNDARY);
 result.append(System.lineSeparator());
 Base64 b64 = new Base64(64);
 result.append(b64.encodeAsString(certificate.getEncoded()));
-result.append("-END CERTIFICATE-");
+result.append(Part.END_BOUNDARY + Part.CERTIFICATE + 
Part.FINISH_BOUNDARY);
 return result.toString();
 }
 
@@ -103,7 +103,8 @@ public class PEMFile {
 while ((line = reader.readLine()) != null) {
 if (line.startsWith(Part.BEGIN_BOUNDARY)) {
 part = new Part();
-part.type = line.substring(Part.BEGIN_BOUNDARY.length(), 
line.length() - 5).trim();
+part.type = line.substring(Part.BEGIN_BOUNDARY.length(),
+line.length() - 
Part.FINISH_BOUNDARY.length()).trim();
 } else if (line.startsWith(Part.END_BOUNDARY)) {
 parts.add(part);
 part = null;
@@ -115,20 +116,20 @@ public class PEMFile {
 
 for (Part part : parts) {
 switch (part.type) {
-case "PRIVATE KEY":
+case Part.PRIVATE_KEY:
 privateKey = part.toPrivateKey(null, keyAlgorithm, 
Format.PKCS8);
 break;
-case "EC PRIVATE KEY":
+case Part.EC_PRIVATE_KEY:
 privateKey = part.toPrivateKey(null, "EC", Format.RFC5915);
 break;
-case "ENCRYPTED PRIVATE KEY":
+case Part.ENCRYPTED_PRIVATE_KEY:
 privateKey = part.toPrivateKey(password, keyAlgorithm, 
Format.PKCS8);
 break;
-case "RSA PRIVATE KEY":
+case Part.RSA_PRIVATE_KEY:
 privateKey = part.toPrivateKey(null, keyAlgorithm, 
Format.PKCS1);
 break;
-case "CERTIFICATE":
-case "X509 CERTIFICATE":
+case Part.CERTIFICATE:
+case Part.X509_CERTIFICATE:
 certificates.add(part.toCertificate());
 break;
 }
@@ -138,6 +139,14 @@ public class PEMFile {
 private class Part {
 public static final String BEGIN_BOUNDARY = "-BEGIN ";
 public static final String END_BOUNDARY   = "-END ";
+public static final String FINISH_BOUNDARY = "-";
+
+public static final String PRIVATE_KEY = "PRIVATE KEY";
+public static final String EC_PRIVATE_KEY = "EC PRIVATE KEY";
+public static final String ENCRYPTED_PRIVATE_KEY = "ENCRYPTED PRIVATE 
KEY";
+public static final String RSA_PRIVATE_KEY = "RSA PRIVATE KEY";
+public static final String CERTIFICATE = "CERTIFICATE";
+public static final String X509_CERTIFICATE = "X509 CERTIFICATE";
 
 public String type;
 public String content = "";


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 8.5.x updated: Add and use constants

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 5b794bb  Add and use constants
5b794bb is described below

commit 5b794bb68f720ec0cc37465a49fc9431f90136b7
Author: remm 
AuthorDate: Thu Jun 11 17:22:06 2020 +0200

Add and use constants
---
 java/org/apache/tomcat/util/net/jsse/PEMFile.java | 27 +++
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/jsse/PEMFile.java 
b/java/org/apache/tomcat/util/net/jsse/PEMFile.java
index cccf8f4..ee62c25 100644
--- a/java/org/apache/tomcat/util/net/jsse/PEMFile.java
+++ b/java/org/apache/tomcat/util/net/jsse/PEMFile.java
@@ -62,11 +62,11 @@ public class PEMFile {
 
 public static String toPEM(X509Certificate certificate) throws 
CertificateEncodingException {
 StringBuilder result = new StringBuilder();
-result.append("-BEGIN CERTIFICATE-");
+result.append(Part.BEGIN_BOUNDARY + Part.CERTIFICATE + 
Part.FINISH_BOUNDARY);
 result.append(System.lineSeparator());
 Base64 b64 = new Base64(64);
 result.append(b64.encodeAsString(certificate.getEncoded()));
-result.append("-END CERTIFICATE-");
+result.append(Part.END_BOUNDARY + Part.CERTIFICATE + 
Part.FINISH_BOUNDARY);
 return result.toString();
 }
 
@@ -103,7 +103,8 @@ public class PEMFile {
 while ((line = reader.readLine()) != null) {
 if (line.startsWith(Part.BEGIN_BOUNDARY)) {
 part = new Part();
-part.type = line.substring(Part.BEGIN_BOUNDARY.length(), 
line.length() - 5).trim();
+part.type = line.substring(Part.BEGIN_BOUNDARY.length(),
+line.length() - 
Part.FINISH_BOUNDARY.length()).trim();
 } else if (line.startsWith(Part.END_BOUNDARY)) {
 parts.add(part);
 part = null;
@@ -115,20 +116,20 @@ public class PEMFile {
 
 for (Part part : parts) {
 switch (part.type) {
-case "PRIVATE KEY":
+case Part.PRIVATE_KEY:
 privateKey = part.toPrivateKey(null, keyAlgorithm, 
Format.PKCS8);
 break;
-case "EC PRIVATE KEY":
+case Part.EC_PRIVATE_KEY:
 privateKey = part.toPrivateKey(null, "EC", Format.RFC5915);
 break;
-case "ENCRYPTED PRIVATE KEY":
+case Part.ENCRYPTED_PRIVATE_KEY:
 privateKey = part.toPrivateKey(password, keyAlgorithm, 
Format.PKCS8);
 break;
-case "RSA PRIVATE KEY":
+case Part.RSA_PRIVATE_KEY:
 privateKey = part.toPrivateKey(null, keyAlgorithm, 
Format.PKCS1);
 break;
-case "CERTIFICATE":
-case "X509 CERTIFICATE":
+case Part.CERTIFICATE:
+case Part.X509_CERTIFICATE:
 certificates.add(part.toCertificate());
 break;
 }
@@ -138,6 +139,14 @@ public class PEMFile {
 private class Part {
 public static final String BEGIN_BOUNDARY = "-BEGIN ";
 public static final String END_BOUNDARY   = "-END ";
+public static final String FINISH_BOUNDARY = "-";
+
+public static final String PRIVATE_KEY = "PRIVATE KEY";
+public static final String EC_PRIVATE_KEY = "EC PRIVATE KEY";
+public static final String ENCRYPTED_PRIVATE_KEY = "ENCRYPTED PRIVATE 
KEY";
+public static final String RSA_PRIVATE_KEY = "RSA PRIVATE KEY";
+public static final String CERTIFICATE = "CERTIFICATE";
+public static final String X509_CERTIFICATE = "X509 CERTIFICATE";
 
 public String type;
 public String content = "";


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 8.5.x updated: Add and use constants

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 5b794bb  Add and use constants
5b794bb is described below

commit 5b794bb68f720ec0cc37465a49fc9431f90136b7
Author: remm 
AuthorDate: Thu Jun 11 17:22:06 2020 +0200

Add and use constants
---
 java/org/apache/tomcat/util/net/jsse/PEMFile.java | 27 +++
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/jsse/PEMFile.java 
b/java/org/apache/tomcat/util/net/jsse/PEMFile.java
index cccf8f4..ee62c25 100644
--- a/java/org/apache/tomcat/util/net/jsse/PEMFile.java
+++ b/java/org/apache/tomcat/util/net/jsse/PEMFile.java
@@ -62,11 +62,11 @@ public class PEMFile {
 
 public static String toPEM(X509Certificate certificate) throws 
CertificateEncodingException {
 StringBuilder result = new StringBuilder();
-result.append("-BEGIN CERTIFICATE-");
+result.append(Part.BEGIN_BOUNDARY + Part.CERTIFICATE + 
Part.FINISH_BOUNDARY);
 result.append(System.lineSeparator());
 Base64 b64 = new Base64(64);
 result.append(b64.encodeAsString(certificate.getEncoded()));
-result.append("-END CERTIFICATE-");
+result.append(Part.END_BOUNDARY + Part.CERTIFICATE + 
Part.FINISH_BOUNDARY);
 return result.toString();
 }
 
@@ -103,7 +103,8 @@ public class PEMFile {
 while ((line = reader.readLine()) != null) {
 if (line.startsWith(Part.BEGIN_BOUNDARY)) {
 part = new Part();
-part.type = line.substring(Part.BEGIN_BOUNDARY.length(), 
line.length() - 5).trim();
+part.type = line.substring(Part.BEGIN_BOUNDARY.length(),
+line.length() - 
Part.FINISH_BOUNDARY.length()).trim();
 } else if (line.startsWith(Part.END_BOUNDARY)) {
 parts.add(part);
 part = null;
@@ -115,20 +116,20 @@ public class PEMFile {
 
 for (Part part : parts) {
 switch (part.type) {
-case "PRIVATE KEY":
+case Part.PRIVATE_KEY:
 privateKey = part.toPrivateKey(null, keyAlgorithm, 
Format.PKCS8);
 break;
-case "EC PRIVATE KEY":
+case Part.EC_PRIVATE_KEY:
 privateKey = part.toPrivateKey(null, "EC", Format.RFC5915);
 break;
-case "ENCRYPTED PRIVATE KEY":
+case Part.ENCRYPTED_PRIVATE_KEY:
 privateKey = part.toPrivateKey(password, keyAlgorithm, 
Format.PKCS8);
 break;
-case "RSA PRIVATE KEY":
+case Part.RSA_PRIVATE_KEY:
 privateKey = part.toPrivateKey(null, keyAlgorithm, 
Format.PKCS1);
 break;
-case "CERTIFICATE":
-case "X509 CERTIFICATE":
+case Part.CERTIFICATE:
+case Part.X509_CERTIFICATE:
 certificates.add(part.toCertificate());
 break;
 }
@@ -138,6 +139,14 @@ public class PEMFile {
 private class Part {
 public static final String BEGIN_BOUNDARY = "-BEGIN ";
 public static final String END_BOUNDARY   = "-END ";
+public static final String FINISH_BOUNDARY = "-";
+
+public static final String PRIVATE_KEY = "PRIVATE KEY";
+public static final String EC_PRIVATE_KEY = "EC PRIVATE KEY";
+public static final String ENCRYPTED_PRIVATE_KEY = "ENCRYPTED PRIVATE 
KEY";
+public static final String RSA_PRIVATE_KEY = "RSA PRIVATE KEY";
+public static final String CERTIFICATE = "CERTIFICATE";
+public static final String X509_CERTIFICATE = "X509 CERTIFICATE";
 
 public String type;
 public String content = "";


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 9.0.x updated: Add and use constants

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new a2410bb  Add and use constants
a2410bb is described below

commit a2410bb2076ac657f5afa4e924e60182129e5990
Author: remm 
AuthorDate: Thu Jun 11 17:22:06 2020 +0200

Add and use constants
---
 java/org/apache/tomcat/util/net/jsse/PEMFile.java | 27 +++
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/jsse/PEMFile.java 
b/java/org/apache/tomcat/util/net/jsse/PEMFile.java
index 02f54ca..900bb91 100644
--- a/java/org/apache/tomcat/util/net/jsse/PEMFile.java
+++ b/java/org/apache/tomcat/util/net/jsse/PEMFile.java
@@ -62,11 +62,11 @@ public class PEMFile {
 
 public static String toPEM(X509Certificate certificate) throws 
CertificateEncodingException {
 StringBuilder result = new StringBuilder();
-result.append("-BEGIN CERTIFICATE-");
+result.append(Part.BEGIN_BOUNDARY + Part.CERTIFICATE + 
Part.FINISH_BOUNDARY);
 result.append(System.lineSeparator());
 Base64 b64 = new Base64(64);
 result.append(b64.encodeAsString(certificate.getEncoded()));
-result.append("-END CERTIFICATE-");
+result.append(Part.END_BOUNDARY + Part.CERTIFICATE + 
Part.FINISH_BOUNDARY);
 return result.toString();
 }
 
@@ -103,7 +103,8 @@ public class PEMFile {
 while ((line = reader.readLine()) != null) {
 if (line.startsWith(Part.BEGIN_BOUNDARY)) {
 part = new Part();
-part.type = line.substring(Part.BEGIN_BOUNDARY.length(), 
line.length() - 5).trim();
+part.type = line.substring(Part.BEGIN_BOUNDARY.length(),
+line.length() - 
Part.FINISH_BOUNDARY.length()).trim();
 } else if (line.startsWith(Part.END_BOUNDARY)) {
 parts.add(part);
 part = null;
@@ -115,20 +116,20 @@ public class PEMFile {
 
 for (Part part : parts) {
 switch (part.type) {
-case "PRIVATE KEY":
+case Part.PRIVATE_KEY:
 privateKey = part.toPrivateKey(null, keyAlgorithm, 
Format.PKCS8);
 break;
-case "EC PRIVATE KEY":
+case Part.EC_PRIVATE_KEY:
 privateKey = part.toPrivateKey(null, "EC", Format.RFC5915);
 break;
-case "ENCRYPTED PRIVATE KEY":
+case Part.ENCRYPTED_PRIVATE_KEY:
 privateKey = part.toPrivateKey(password, keyAlgorithm, 
Format.PKCS8);
 break;
-case "RSA PRIVATE KEY":
+case Part.RSA_PRIVATE_KEY:
 privateKey = part.toPrivateKey(null, keyAlgorithm, 
Format.PKCS1);
 break;
-case "CERTIFICATE":
-case "X509 CERTIFICATE":
+case Part.CERTIFICATE:
+case Part.X509_CERTIFICATE:
 certificates.add(part.toCertificate());
 break;
 }
@@ -138,6 +139,14 @@ public class PEMFile {
 private class Part {
 public static final String BEGIN_BOUNDARY = "-BEGIN ";
 public static final String END_BOUNDARY   = "-END ";
+public static final String FINISH_BOUNDARY = "-";
+
+public static final String PRIVATE_KEY = "PRIVATE KEY";
+public static final String EC_PRIVATE_KEY = "EC PRIVATE KEY";
+public static final String ENCRYPTED_PRIVATE_KEY = "ENCRYPTED PRIVATE 
KEY";
+public static final String RSA_PRIVATE_KEY = "RSA PRIVATE KEY";
+public static final String CERTIFICATE = "CERTIFICATE";
+public static final String X509_CERTIFICATE = "X509 CERTIFICATE";
 
 public String type;
 public String content = "";


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Add and use constants

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new dd558b6  Add and use constants
dd558b6 is described below

commit dd558b67e5830244fca87675389a182a6acfab2c
Author: remm 
AuthorDate: Thu Jun 11 17:22:06 2020 +0200

Add and use constants
---
 java/org/apache/tomcat/util/net/jsse/PEMFile.java | 27 +++
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/jsse/PEMFile.java 
b/java/org/apache/tomcat/util/net/jsse/PEMFile.java
index 02f54ca..900bb91 100644
--- a/java/org/apache/tomcat/util/net/jsse/PEMFile.java
+++ b/java/org/apache/tomcat/util/net/jsse/PEMFile.java
@@ -62,11 +62,11 @@ public class PEMFile {
 
 public static String toPEM(X509Certificate certificate) throws 
CertificateEncodingException {
 StringBuilder result = new StringBuilder();
-result.append("-BEGIN CERTIFICATE-");
+result.append(Part.BEGIN_BOUNDARY + Part.CERTIFICATE + 
Part.FINISH_BOUNDARY);
 result.append(System.lineSeparator());
 Base64 b64 = new Base64(64);
 result.append(b64.encodeAsString(certificate.getEncoded()));
-result.append("-END CERTIFICATE-");
+result.append(Part.END_BOUNDARY + Part.CERTIFICATE + 
Part.FINISH_BOUNDARY);
 return result.toString();
 }
 
@@ -103,7 +103,8 @@ public class PEMFile {
 while ((line = reader.readLine()) != null) {
 if (line.startsWith(Part.BEGIN_BOUNDARY)) {
 part = new Part();
-part.type = line.substring(Part.BEGIN_BOUNDARY.length(), 
line.length() - 5).trim();
+part.type = line.substring(Part.BEGIN_BOUNDARY.length(),
+line.length() - 
Part.FINISH_BOUNDARY.length()).trim();
 } else if (line.startsWith(Part.END_BOUNDARY)) {
 parts.add(part);
 part = null;
@@ -115,20 +116,20 @@ public class PEMFile {
 
 for (Part part : parts) {
 switch (part.type) {
-case "PRIVATE KEY":
+case Part.PRIVATE_KEY:
 privateKey = part.toPrivateKey(null, keyAlgorithm, 
Format.PKCS8);
 break;
-case "EC PRIVATE KEY":
+case Part.EC_PRIVATE_KEY:
 privateKey = part.toPrivateKey(null, "EC", Format.RFC5915);
 break;
-case "ENCRYPTED PRIVATE KEY":
+case Part.ENCRYPTED_PRIVATE_KEY:
 privateKey = part.toPrivateKey(password, keyAlgorithm, 
Format.PKCS8);
 break;
-case "RSA PRIVATE KEY":
+case Part.RSA_PRIVATE_KEY:
 privateKey = part.toPrivateKey(null, keyAlgorithm, 
Format.PKCS1);
 break;
-case "CERTIFICATE":
-case "X509 CERTIFICATE":
+case Part.CERTIFICATE:
+case Part.X509_CERTIFICATE:
 certificates.add(part.toCertificate());
 break;
 }
@@ -138,6 +139,14 @@ public class PEMFile {
 private class Part {
 public static final String BEGIN_BOUNDARY = "-BEGIN ";
 public static final String END_BOUNDARY   = "-END ";
+public static final String FINISH_BOUNDARY = "-";
+
+public static final String PRIVATE_KEY = "PRIVATE KEY";
+public static final String EC_PRIVATE_KEY = "EC PRIVATE KEY";
+public static final String ENCRYPTED_PRIVATE_KEY = "ENCRYPTED PRIVATE 
KEY";
+public static final String RSA_PRIVATE_KEY = "RSA PRIVATE KEY";
+public static final String CERTIFICATE = "CERTIFICATE";
+public static final String X509_CERTIFICATE = "X509 CERTIFICATE";
 
 public String type;
 public String content = "";


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] rotty3000 commented on pull request #298: Fix BZ 64514 - classes missing from bootstrap.jar

[GitBox]

rotty3000 commented on pull request #298:
URL: https://github.com/apache/tomcat/pull/298#issuecomment-642690642


   For the record I'm more interested in establishing a baseline for how to 
handle these types of cases with the tomcat project. I will obviously follow 
your direction :)



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] rotty3000 commented on pull request #298: Fix BZ 64514 - classes missing from bootstrap.jar

[GitBox]

rotty3000 commented on pull request #298:
URL: https://github.com/apache/tomcat/pull/298#issuecomment-642689875


   From a JPMS point of view the goal is always that jdeps results match up 
with the module-info.class (i.e. that the jar is completely resolvable from the 
module path) and if you don't clear that you will always have to add a 
workaround to get the module-info you want (like adding a static module 
requires for the missing packages or forcing a manual ignore of the required 
module).



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] rotty3000 commented on pull request #298: Fix BZ 64514 - classes missing from bootstrap.jar

[GitBox]

rotty3000 commented on pull request #298:
URL: https://github.com/apache/tomcat/pull/298#issuecomment-642684919


   So would you rather make the work around in the metadata calculation once/if 
we get that far? Personally I rather make a valid jar than work around the 
metadata but that's just personal preference.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] markt-asf commented on pull request #298: Fix BZ 64514 - classes missing from bootstrap.jar

[GitBox]

markt-asf commented on pull request #298:
URL: https://github.com/apache/tomcat/pull/298#issuecomment-642679912


   I don't think this is correct. Only those classes required during the 
bootstrap process need to be in the bootstrap JAR. If this was not correct, I'd 
expect to see reports of ClassNotFoundException on Tomcat start and there 
aren't any.
   
   Those classes may well have additional dependencies that are not used during 
the bootstrap process. Those dependencies do not belong in bootstrap.jar.
   
   Taking ExceptionUtils as an example, there is an explicit workaround in 
Bootstrap to account for that class not being accessible.
   
   For Globals, most (all?) of those will be constants which will be compiled 
into the class meaning there should be no runtime dependency on Globals.
   
   And so on.
   
   Unless you can provide a configuration that triggers a 
ClassNotFoundException on Tomcat start, I'm minded to resolve this as invalid.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] rotty3000 opened a new pull request #299: Fix BZ 64515 - no need to filter bnd files (bnd passes ant properties…

[GitBox]

rotty3000 opened a new pull request #299:
URL: https://github.com/apache/tomcat/pull/299


   … in)
   
   Signed-off-by: Raymond Augé 



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] rotty3000 opened a new pull request #298: Fix BZ 64514 - classes missing from bootstrap.jar

[GitBox]

rotty3000 opened a new pull request #298:
URL: https://github.com/apache/tomcat/pull/298


   Signed-off-by: Raymond Augé 

[GitHub] [tomcat] rotty3000 commented on pull request #295: Fix BZ 64513 - bndlib is not needed, normalize the name to bnd everyw…

[GitBox]

rotty3000 commented on pull request #295:
URL: https://github.com/apache/tomcat/pull/295#issuecomment-642638105


   ah never mind, I found the changelog. I will update that from now on.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] rotty3000 commented on pull request #295: Fix BZ 64513 - bndlib is not needed, normalize the name to bnd everyw…

[GitBox]

rotty3000 commented on pull request #295:
URL: https://github.com/apache/tomcat/pull/295#issuecomment-642635727


   @markt-asf if there is some way for me to include the changelog update let 
me know and I will include that in the future :)



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] rotty3000 commented on a change in pull request #296: Fix BZ 64514 - classes missing from bootstrap.jar

[GitBox]

rotty3000 commented on a change in pull request #296:
URL: https://github.com/apache/tomcat/pull/296#discussion_r438764896



##
File path: build.xml
##
@@ -375,6 +376,8 @@
 
 
 
+

Review comment:
   it is transitively required by `Globals.java`





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 8.5.x updated: Move toPEM to PEMFile

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 375f588  Move toPEM to PEMFile
375f588 is described below

commit 375f5887029759cb88ee44c4600835f6035e3573
Author: remm 
AuthorDate: Thu Jun 11 14:40:34 2020 +0200

Move toPEM to PEMFile

Also remove obsolete class comment since it now supports more formats.
---
 .../org/apache/catalina/valves/rewrite/ResolverImpl.java | 16 +++-
 java/org/apache/tomcat/util/net/jsse/PEMFile.java| 15 ---
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java 
b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
index 3b443c7..f4c38e1 100644
--- a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
+++ b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
@@ -33,9 +33,9 @@ import java.util.concurrent.TimeUnit;
 import org.apache.catalina.WebResource;
 import org.apache.catalina.WebResourceRoot;
 import org.apache.catalina.connector.Request;
-import org.apache.tomcat.util.codec.binary.Base64;
 import org.apache.tomcat.util.http.FastHttpDateFormat;
 import org.apache.tomcat.util.net.SSLSupport;
+import org.apache.tomcat.util.net.jsse.PEMFile;
 import org.apache.tomcat.util.net.openssl.ciphers.Cipher;
 import org.apache.tomcat.util.net.openssl.ciphers.EncryptionLevel;
 import 
org.apache.tomcat.util.net.openssl.ciphers.OpenSSLCipherConfigurationParser;
@@ -256,13 +256,13 @@ public class ResolverImpl extends Resolver {
 return certificates[0].getPublicKey().getAlgorithm();
 } else if (key.equals("CERT")) {
 try {
-return toPEM(certificates[0]);
+return PEMFile.toPEM(certificates[0]);
 } catch (CertificateEncodingException e) {
 }
 } else if (key.startsWith("CERT_CHAIN_")) {
 key = key.substring("CERT_CHAIN_".length());
 try {
-return toPEM(certificates[Integer.parseInt(key)]);
+return PEMFile.toPEM(certificates[Integer.parseInt(key)]);
 } catch (NumberFormatException | ArrayIndexOutOfBoundsException
 | CertificateEncodingException e) {
 // Ignore
@@ -306,16 +306,6 @@ public class ResolverImpl extends Resolver {
 return null;
 }
 
-private String toPEM(X509Certificate certificate) throws 
CertificateEncodingException {
-StringBuilder result = new StringBuilder();
-result.append("-BEGIN CERTIFICATE-");
-result.append(System.lineSeparator());
-Base64 b64 = new Base64(64);
-result.append(b64.encodeAsString(certificate.getEncoded()));
-result.append("-END CERTIFICATE-");
-return result.toString();
-}
-
 @Override
 public String resolveHttp(String key) {
 String header = request.getHeader(key);
diff --git a/java/org/apache/tomcat/util/net/jsse/PEMFile.java 
b/java/org/apache/tomcat/util/net/jsse/PEMFile.java
index a6d1164..cccf8f4 100644
--- a/java/org/apache/tomcat/util/net/jsse/PEMFile.java
+++ b/java/org/apache/tomcat/util/net/jsse/PEMFile.java
@@ -27,6 +27,7 @@ import java.security.GeneralSecurityException;
 import java.security.InvalidKeyException;
 import java.security.KeyFactory;
 import java.security.PrivateKey;
+import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
@@ -50,9 +51,7 @@ import org.apache.tomcat.util.file.ConfigFileLoader;
 import org.apache.tomcat.util.res.StringManager;
 
 /**
- * RFC 1421 PEM file containing X509 certificates or private keys (PKCS#8 only,
- * i.e. with boundaries containing "BEGIN PRIVATE KEY" or "BEGIN ENCRYPTED 
PRIVATE KEY",
- * not "BEGIN RSA PRIVATE KEY" or other variations).
+ * RFC 1421 PEM file containing X509 certificates or private keys.
  */
 public class PEMFile {
 
@@ -61,6 +60,16 @@ public class PEMFile {
 private static final byte[] OID_EC_PUBLIC_KEY =
 new byte[] { 0x06, 0x07, 0x2A, (byte) 0x86, 0x48, (byte) 0xCE, 
0x3D, 0x02, 0x01 };
 
+public static String toPEM(X509Certificate certificate) throws 
CertificateEncodingException {
+StringBuilder result = new StringBuilder();
+result.append("-BEGIN CERTIFICATE-");
+result.append(System.lineSeparator());
+Base64 b64 = new Base64(64);
+result.append(b64.encodeAsString(certificate.getEncoded()));
+result.append("-END CERTIFICATE-");
+return result.toString();
+}
+
 private String filename;
 private List certificates = new ArrayList<>();
 private PrivateKey privateKey;

[tomcat] branch 9.0.x updated: Move toPEM to PEMFile

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 886f96d  Move toPEM to PEMFile
886f96d is described below

commit 886f96de122b5692e949f76047d37d70f175ae64
Author: remm 
AuthorDate: Thu Jun 11 14:40:34 2020 +0200

Move toPEM to PEMFile

Also remove obsolete class comment since it now supports more formats.
---
 .../org/apache/catalina/valves/rewrite/ResolverImpl.java | 16 +++-
 java/org/apache/tomcat/util/net/jsse/PEMFile.java| 15 ---
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java 
b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
index 7b30227..01afcff 100644
--- a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
+++ b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
@@ -33,9 +33,9 @@ import java.util.concurrent.TimeUnit;
 import org.apache.catalina.WebResource;
 import org.apache.catalina.WebResourceRoot;
 import org.apache.catalina.connector.Request;
-import org.apache.tomcat.util.codec.binary.Base64;
 import org.apache.tomcat.util.http.FastHttpDateFormat;
 import org.apache.tomcat.util.net.SSLSupport;
+import org.apache.tomcat.util.net.jsse.PEMFile;
 import org.apache.tomcat.util.net.openssl.ciphers.Cipher;
 import org.apache.tomcat.util.net.openssl.ciphers.EncryptionLevel;
 import 
org.apache.tomcat.util.net.openssl.ciphers.OpenSSLCipherConfigurationParser;
@@ -267,13 +267,13 @@ public class ResolverImpl extends Resolver {
 return certificates[0].getPublicKey().getAlgorithm();
 } else if (key.equals("CERT")) {
 try {
-return toPEM(certificates[0]);
+return PEMFile.toPEM(certificates[0]);
 } catch (CertificateEncodingException e) {
 }
 } else if (key.startsWith("CERT_CHAIN_")) {
 key = key.substring("CERT_CHAIN_".length());
 try {
-return toPEM(certificates[Integer.parseInt(key)]);
+return PEMFile.toPEM(certificates[Integer.parseInt(key)]);
 } catch (NumberFormatException | ArrayIndexOutOfBoundsException
 | CertificateEncodingException e) {
 // Ignore
@@ -317,16 +317,6 @@ public class ResolverImpl extends Resolver {
 return null;
 }
 
-private String toPEM(X509Certificate certificate) throws 
CertificateEncodingException {
-StringBuilder result = new StringBuilder();
-result.append("-BEGIN CERTIFICATE-");
-result.append(System.lineSeparator());
-Base64 b64 = new Base64(64);
-result.append(b64.encodeAsString(certificate.getEncoded()));
-result.append("-END CERTIFICATE-");
-return result.toString();
-}
-
 @Override
 public String resolveHttp(String key) {
 String header = request.getHeader(key);
diff --git a/java/org/apache/tomcat/util/net/jsse/PEMFile.java 
b/java/org/apache/tomcat/util/net/jsse/PEMFile.java
index 0dd4aef..02f54ca 100644
--- a/java/org/apache/tomcat/util/net/jsse/PEMFile.java
+++ b/java/org/apache/tomcat/util/net/jsse/PEMFile.java
@@ -27,6 +27,7 @@ import java.security.GeneralSecurityException;
 import java.security.InvalidKeyException;
 import java.security.KeyFactory;
 import java.security.PrivateKey;
+import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
@@ -50,9 +51,7 @@ import org.apache.tomcat.util.file.ConfigFileLoader;
 import org.apache.tomcat.util.res.StringManager;
 
 /**
- * RFC 1421 PEM file containing X509 certificates or private keys (PKCS#8 only,
- * i.e. with boundaries containing "BEGIN PRIVATE KEY" or "BEGIN ENCRYPTED 
PRIVATE KEY",
- * not "BEGIN RSA PRIVATE KEY" or other variations).
+ * RFC 1421 PEM file containing X509 certificates or private keys.
  */
 public class PEMFile {
 
@@ -61,6 +60,16 @@ public class PEMFile {
 private static final byte[] OID_EC_PUBLIC_KEY =
 new byte[] { 0x06, 0x07, 0x2A, (byte) 0x86, 0x48, (byte) 0xCE, 
0x3D, 0x02, 0x01 };
 
+public static String toPEM(X509Certificate certificate) throws 
CertificateEncodingException {
+StringBuilder result = new StringBuilder();
+result.append("-BEGIN CERTIFICATE-");
+result.append(System.lineSeparator());
+Base64 b64 = new Base64(64);
+result.append(b64.encodeAsString(certificate.getEncoded()));
+result.append("-END CERTIFICATE-");
+return result.toString();
+}
+
 private String filename;
 private List certificates = new ArrayList<>();
 private PrivateKey privateKey;

[tomcat] branch master updated: Move toPEM to PEMFile

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 3075a2b  Move toPEM to PEMFile
3075a2b is described below

commit 3075a2b8bf061acf6dbaa35519814994f71778ba
Author: remm 
AuthorDate: Thu Jun 11 14:40:34 2020 +0200

Move toPEM to PEMFile

Also remove obsolete class comment since it now supports more formats.
---
 .../org/apache/catalina/valves/rewrite/ResolverImpl.java | 16 +++-
 java/org/apache/tomcat/util/net/jsse/PEMFile.java| 15 ---
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java 
b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
index 7b30227..01afcff 100644
--- a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
+++ b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
@@ -33,9 +33,9 @@ import java.util.concurrent.TimeUnit;
 import org.apache.catalina.WebResource;
 import org.apache.catalina.WebResourceRoot;
 import org.apache.catalina.connector.Request;
-import org.apache.tomcat.util.codec.binary.Base64;
 import org.apache.tomcat.util.http.FastHttpDateFormat;
 import org.apache.tomcat.util.net.SSLSupport;
+import org.apache.tomcat.util.net.jsse.PEMFile;
 import org.apache.tomcat.util.net.openssl.ciphers.Cipher;
 import org.apache.tomcat.util.net.openssl.ciphers.EncryptionLevel;
 import 
org.apache.tomcat.util.net.openssl.ciphers.OpenSSLCipherConfigurationParser;
@@ -267,13 +267,13 @@ public class ResolverImpl extends Resolver {
 return certificates[0].getPublicKey().getAlgorithm();
 } else if (key.equals("CERT")) {
 try {
-return toPEM(certificates[0]);
+return PEMFile.toPEM(certificates[0]);
 } catch (CertificateEncodingException e) {
 }
 } else if (key.startsWith("CERT_CHAIN_")) {
 key = key.substring("CERT_CHAIN_".length());
 try {
-return toPEM(certificates[Integer.parseInt(key)]);
+return PEMFile.toPEM(certificates[Integer.parseInt(key)]);
 } catch (NumberFormatException | ArrayIndexOutOfBoundsException
 | CertificateEncodingException e) {
 // Ignore
@@ -317,16 +317,6 @@ public class ResolverImpl extends Resolver {
 return null;
 }
 
-private String toPEM(X509Certificate certificate) throws 
CertificateEncodingException {
-StringBuilder result = new StringBuilder();
-result.append("-BEGIN CERTIFICATE-");
-result.append(System.lineSeparator());
-Base64 b64 = new Base64(64);
-result.append(b64.encodeAsString(certificate.getEncoded()));
-result.append("-END CERTIFICATE-");
-return result.toString();
-}
-
 @Override
 public String resolveHttp(String key) {
 String header = request.getHeader(key);
diff --git a/java/org/apache/tomcat/util/net/jsse/PEMFile.java 
b/java/org/apache/tomcat/util/net/jsse/PEMFile.java
index 0dd4aef..02f54ca 100644
--- a/java/org/apache/tomcat/util/net/jsse/PEMFile.java
+++ b/java/org/apache/tomcat/util/net/jsse/PEMFile.java
@@ -27,6 +27,7 @@ import java.security.GeneralSecurityException;
 import java.security.InvalidKeyException;
 import java.security.KeyFactory;
 import java.security.PrivateKey;
+import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
@@ -50,9 +51,7 @@ import org.apache.tomcat.util.file.ConfigFileLoader;
 import org.apache.tomcat.util.res.StringManager;
 
 /**
- * RFC 1421 PEM file containing X509 certificates or private keys (PKCS#8 only,
- * i.e. with boundaries containing "BEGIN PRIVATE KEY" or "BEGIN ENCRYPTED 
PRIVATE KEY",
- * not "BEGIN RSA PRIVATE KEY" or other variations).
+ * RFC 1421 PEM file containing X509 certificates or private keys.
  */
 public class PEMFile {
 
@@ -61,6 +60,16 @@ public class PEMFile {
 private static final byte[] OID_EC_PUBLIC_KEY =
 new byte[] { 0x06, 0x07, 0x2A, (byte) 0x86, 0x48, (byte) 0xCE, 
0x3D, 0x02, 0x01 };
 
+public static String toPEM(X509Certificate certificate) throws 
CertificateEncodingException {
+StringBuilder result = new StringBuilder();
+result.append("-BEGIN CERTIFICATE-");
+result.append(System.lineSeparator());
+Base64 b64 = new Base64(64);
+result.append(b64.encodeAsString(certificate.getEncoded()));
+result.append("-END CERTIFICATE-");
+return result.toString();
+}
+
 private String filename;
 private List certificates = new ArrayList<>();
 private PrivateKey privateKey;

[Bug 64513] bndlib is not needed

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64513

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #2 from Mark Thomas  ---
Thanks for the PR.

Fixed in:
- master for 10.0.0-M7 onwards
- 9.0.x for 9.0.37 onwards

8.5.x and 7.0.x do not use bnd.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 9.0.x updated: Fix BZ 64513 - bndlib is not needed, normalize the name to bnd everywhere

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new ba42096  Fix BZ 64513 - bndlib is not needed, normalize the name to 
bnd everywhere
ba42096 is described below

commit ba4209647fb2a741291dde5c7693deee551000de
Author: Raymond Augé 
AuthorDate: Tue Jun 9 11:44:41 2020 -0400

Fix BZ 64513 - bndlib is not needed, normalize the name to bnd everywhere

Signed-off-by: Raymond Augé 
---
 build.properties.default   |  9 -
 build.xml  | 15 ++-
 webapps/docs/changelog.xml |  4 
 3 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index d1183fb..2d9be9c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -295,15 +295,6 @@ bnd.checksum.enabled=true
 bnd.checksum.algorithm=MD5|SHA-1
 
bnd.checksum.value=477684fd83707666cc84a766b147ed0c|9069bc1afad9201e3dc2efe62c0d5193777d16ae
 
-# checksums for biz.aQute.bndlib-5.1.0.jar
-bndlib.checksum.enabled=true
-bndlib.checksum.algorithm=MD5|SHA-1
-bndlib.checksum.value=59dfe87f09e3f03be891327a91430182|30e119e5b3ae63dbb86532490855707b009e1b2e
-
 bnd.home=${base.path}/bnd-${bnd.version}
 bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
 
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
-
-bndlib.home=${base.path}/bndlib-${bnd.version}
-bndlib.jar=${bndlib.home}/biz.aQute.bndlib-${bnd.version}.jar
-bndlib.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bndlib/${bnd.version}/biz.aQute.bndlib-${bnd.version}.jar
diff --git a/build.xml b/build.xml
index b008b2d..c7ea21b 100644
--- a/build.xml
+++ b/build.xml
@@ -3311,26 +3311,15 @@ Read the Building page on the Apache Tomcat 
documentation site for details on ho
   
   
 
-
-
-
-  
-  
-  
-  
-  
-  
-
   
 
   
 
-
+
   
-  
 
 
-
+
   
 
   
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fcd0a44..48975a0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -89,6 +89,10 @@
 LOGGING_CONFIG environment variable to avoid using a POSIX
 shell feature that is not available by default on Solaris 10. (markt)
   
+  
+Remove bndlib from dependencies as it is not required. Pull request
+provided by Raymond Augé. (markt)
+  
 
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] markt-asf closed pull request #295: Fix BZ 64513 - bndlib is not needed, normalize the name to bnd everyw…

[GitBox]

markt-asf closed pull request #295:
URL: https://github.com/apache/tomcat/pull/295


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] markt-asf commented on pull request #295: Fix BZ 64513 - bndlib is not needed, normalize the name to bnd everyw…

[GitBox]

markt-asf commented on pull request #295:
URL: https://github.com/apache/tomcat/pull/295#issuecomment-642593455


   Applied manually so I could add a change log entry.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated (640b789 -> 83a6b36)

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 640b789  Fix BZ 64509 - Correctly parse RFC 2109
 add 83a6b36  Fix BZ 64513 - bndlib is not needed, normalize the name to 
bnd everywhere

No new revisions were added by this update.

Summary of changes:
 build.properties.default   |  9 -
 build.xml  | 15 ++-
 webapps/docs/changelog.xml |  4 
 3 files changed, 6 insertions(+), 22 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] rmaucher commented on a change in pull request #296: Fix BZ 64514 - classes missing from bootstrap.jar

[GitBox]

rmaucher commented on a change in pull request #296:
URL: https://github.com/apache/tomcat/pull/296#discussion_r438616279



##
File path: build.xml
##
@@ -375,6 +376,8 @@
 
 
 
+

Review comment:
   Your BZ doesn't show use of this, so where is this used ?





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org