Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Most PRs merged and all conflicts fixed #44

Open
wants to merge 79 commits into
base: trunk
Choose a base branch
from

Conversation

aleferri
Copy link

  • Merged every PR i could
  • Fixed all conflicts
  • Updated deps to the last possibile version
  • Build successfully with Java 8

I need both Tomcat 7 and 9 because of some internal old apps (some are in 7 and some are in 9).
I am currently testing it.

olamy and others added 30 commits July 22, 2014 00:15
2. Fix: access_log.* files excluded from apache-rat-plugin configuration. These are generated during Tomcat run and should not be checked.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/maven-plugin/branches/tc8.x@1618789 13f79535-47bb-0310-9956-ffa450edef68
Signed-off-by: olivier lamy <[email protected]>

git-svn-id: https://svn.apache.org/repos/asf/tomcat/maven-plugin/branches/tc8.x@1730788 13f79535-47bb-0310-9956-ffa450edef68
Need to set to correct value (true | false) as it was implemented in version 2.0. Otherwise you would set always just an option "clientAuth"
karlvr and others added 30 commits April 24, 2020 19:04
Tomcat is headless. It’s a pain on macOS if this isn’t set.
This fixes a bug where conflicting files in jars would be loaded instead of the same file in the module’s build directory.
Improvements to Tomcat 9 support
Bumps [plexus-utils](https://github.com/sonatype/plexus-utils) from 3.0.15 to 3.0.16.
- [Release notes](https://github.com/sonatype/plexus-utils/releases)
- [Commits](sonatype/plexus-utils@plexus-utils-3.0.15...plexus-utils-3.0.16)

---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus-utils
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
This fixes either Temporary Directory Hijacking, or Temporary Directory Local Information Disclosure.

Weakness: CWE-379: Creation of Temporary File in Directory with Insecure Permissions
Severity: High
CVSSS: 7.3
Detection: CodeQL & OpenRewrite (https://public.moderne.io/recipes/org.openrewrite.java.security.UseFilesCreateTempDirectory)

Reported-by: Jonathan Leitschuh <[email protected]>
Signed-off-by: Jonathan Leitschuh <[email protected]>

Bug-tracker: JLLeitschuh/security-research#10


Co-authored-by: Moderne <[email protected]>
This fixes temporary file information disclosure vulnerability due to the use
of the vulnerable `File.createTempFile()` method. The vulnerability is fixed by
using the `Files.createTempFile()` method which sets the correct posix permissions.

Weakness: CWE-377: Insecure Temporary File
Severity: Medium
CVSSS: 5.5
Detection: CodeQL & OpenRewrite (https://public.moderne.io/recipes/org.openrewrite.java.security.SecureTempFileCreation)

Reported-by: Jonathan Leitschuh <[email protected]>
Signed-off-by: Jonathan Leitschuh <[email protected]>

Bug-tracker: JLLeitschuh/security-research#18


Co-authored-by: Moderne <[email protected]>
Bumps [org.codehaus.plexus:plexus-archiver](https://github.com/codehaus-plexus/plexus-archiver) from 2.1.1 to 4.8.0.
- [Release notes](https://github.com/codehaus-plexus/plexus-archiver/releases)
- [Changelog](https://github.com/codehaus-plexus/plexus-archiver/blob/master/ReleaseNotes.md)
- [Commits](https://github.com/codehaus-plexus/plexus-archiver/commits/plexus-archiver-4.8.0)

---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus-archiver
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Initial support for Tomact9 - tc9.x
Exit if Tomcat fails to start
Some aggregator or IT modules do not have any own class files but only tests. This did lead to a startup failure in later tc7 versions
Credits to struberg
…maven-plugin into trunk

# Conflicts:
#	common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorResult.java
#	pom.xml
#	tomcat-maven-archetype/src/main/resources/archetype-resources/__rootArtifactId__-webapp/pom.xml
#	tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/pom.xml
#	tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractCatalinaMojo.java
#	tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat8Mojo.java
#	tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractWarCatalinaMojo.java
#	tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/deploy/AbstractDeployMojo.java
#	tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/deploy/DeployMojo.java
#	tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java
#	tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
#	tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunWarMojo.java
#	tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
#	tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunWarMojo.java
#	tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/PasswordUtil.java
#	tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat8Runner.java
…maven-plugin into trunk

# Conflicts:
#	tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants