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.

Sign up for GitHub

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

Jump to bottom

[7.67.x-blue] RHPAM-3709: upgrade maven dependencies to address CVE-2021-26291 #3824

Merged
merged 7 commits into from
Apr 3, 2024
Merged

[7.67.x-blue] RHPAM-3709: upgrade maven dependencies to address CVE-2021-26291 #3824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
09b478d
RHPAM-3709: upgrade maven dependencies to address CVE-2021-26291
porcelli Mar 12, 2024
796019d
Fix duplicate classes problem in kie-wb-common-server-ui-backend.
baldimir Mar 22, 2024
88e1604
Fix duplicate classes problem in kie-wb-common-compiler-distribution.
baldimir Mar 22, 2024
a7c7abd
Fix duplicate classes problem in kie-wb-common-ala-wildfly-provider.
baldimir Mar 22, 2024
48a7bfd
Update maven-dependency-plugin.
baldimir Mar 27, 2024
82e7455
load kie version for plugin reference string from properties
Mar 28, 2024
99b3e6b
Merge pull request #1 from jstastny-cz/RHPAM-3709
baldimir Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions kie-wb-common-ala/kie-wb-common-ala-build-maven/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,16 @@

<!-- dependencies to enable maven downloads -->
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-connector-basic</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-transport-wagon</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-wagon</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
Expand Down
8 changes: 8 additions & 0 deletions kie-wb-common-ala/kie-wb-common-ala-wildfly/kie-wb-common-ala-wildfly-provider/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,14 @@
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
</exclusion>
<exclusion>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-cipher</artifactId>
</exclusion>
<exclusion>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
30 changes: 15 additions & 15 deletions ...ommon-screens/kie-wb-common-datasource-mgmt/kie-wb-common-datasource-mgmt-backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,41 +188,41 @@

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-aether-provider</artifactId>
<artifactId>maven-resolver-provider</artifactId>
</dependency>

<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-util</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-util</artifactId>
</dependency>

<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-connector-basic</artifactId>
</dependency>

<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-transport-file</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-file</artifactId>
</dependency>

<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-transport-http</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-http</artifactId>
</dependency>

<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-spi</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-spi</artifactId>
</dependency>

<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-impl</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-impl</artifactId>
</dependency>

<dependency>
Expand Down
8 changes: 8 additions & 0 deletions kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,14 @@
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
<exclusion>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-cipher</artifactId>
</exclusion>
<exclusion>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down
18 changes: 9 additions & 9 deletions kie-wb-common-services/kie-wb-common-compiler/kie-wb-common-compiler-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,8 @@
<artifactId>kie-soup-maven-integration</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-util</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-util</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down Expand Up @@ -395,8 +395,8 @@
<artifactId>maven-core</artifactId>
<exclusions>
<exclusion>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-util</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-util</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down Expand Up @@ -457,7 +457,7 @@
</dependency>

<dependency>
<groupId>org.sonatype.plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId>
</dependency>

Expand Down Expand Up @@ -494,13 +494,13 @@
</dependency>

<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
</dependency>

<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-impl</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-impl</artifactId>
<scope>runtime</scope>
</dependency>

Expand Down
0 ...iler/configuration/ConfigurationUtil.java → ...iler/configuration/ConfigurationUtil.java
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion ...in/java/org/kie/workbench/common/services/backend/compiler/configuration/MavenConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
*/
public class MavenConfig {

public static final String DEPS_IN_MEMORY_BUILD_CLASSPATH = "org.kie.workbench.services:kie-wb-common-compiler-maven-plugins:build-classpath";
public static final String DEPS_IN_MEMORY_BUILD_CLASSPATH = "org.kie.workbench.services:kie-wb-common-compiler-maven-plugins:"
+ new ConfigurationUtil().loadKieVersionProperties().getProperty("KIE_VERSION") + ":build-classpath";

public static final String MAVEN_DEP_PLUGING_LOCAL_REPOSITORY = "-Dmdep.localRepoProperty=";

Expand Down
4 changes: 2 additions & 2 deletions .../java/org/kie/workbench/common/services/backend/compiler/impl/external339/AFMavenCli.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1184,7 +1184,7 @@ protected MavenExecutionRequest populateRequest(AFCliRequest cliRequest,
final String threadConfiguration = commandLine.hasOption(CLIManager.THREADS)
? commandLine.getOptionValue(CLIManager.THREADS)
: request.getSystemProperties().getProperty(
MavenCli.THREADS_DEPRECATED); // TODO: Remove this setting. Note that the int-tests use it
"maven.threads.experimental"); // TODO: Remove this setting. Note that the int-tests use it

if (threadConfiguration != null) {
//
Expand Down Expand Up @@ -1216,7 +1216,7 @@ protected int calculateDegreeOfConcurrencyWithCoreMultiplier(String threadConfig
}

protected TransferListener getConsoleTransferListener() {
return new ConsoleMavenTransferListener(output);
return new ConsoleMavenTransferListener(output, true);
}

//
Expand Down
4 changes: 2 additions & 2 deletions ...g/kie/workbench/common/services/backend/compiler/impl/external339/ReusableAFMavenCli.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,7 +1227,7 @@ protected MavenExecutionRequest populateRequest(AFCliRequest cliRequest,
final String threadConfiguration = commandLine.hasOption(CLIManager.THREADS)
? commandLine.getOptionValue(CLIManager.THREADS)
: request.getSystemProperties().getProperty(
MavenCli.THREADS_DEPRECATED); // TODO: Remove this setting. Note that the int-tests use it
"maven.threads.experimental"); // TODO: Remove this setting. Note that the int-tests use it

if (threadConfiguration != null) {
//
Expand Down Expand Up @@ -1259,7 +1259,7 @@ protected int calculateDegreeOfConcurrencyWithCoreMultiplier(String threadConfig
}

protected TransferListener getConsoleTransferListener() {
return new ConsoleMavenTransferListener(output);
return new ConsoleMavenTransferListener(output, true);
}

//
Expand Down
8 changes: 8 additions & 0 deletions kie-wb-common-services/kie-wb-common-compiler/kie-wb-common-compiler-distribution/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,14 @@
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-cipher</artifactId>
</exclusion>
<exclusion>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions ...mmon-services/kie-wb-common-compiler/kie-wb-common-compiler-maven-plugins-testing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@
</dependency>

<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-impl</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-impl</artifactId>
<scope>test</scope>
</dependency>

Expand Down
5 changes: 5 additions & 0 deletions kie-wb-common-services/kie-wb-common-compiler/kie-wb-common-compiler-maven-plugins/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

<properties>
<java.module.name>org.kie.wb.common.services.backend.compiler.maven.plugins</java.module.name>
<version.org.apache.maven.plugins.dependency>3.6.1</version.org.apache.maven.plugins.dependency>
</properties>

<build>
Expand Down Expand Up @@ -134,6 +135,10 @@
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
</exclusion>
<exclusion>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down
6 changes: 3 additions & 3 deletions ...ommon-services/kie-wb-common-compiler/kie-wb-common-compiler-offprocess-classpath/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@
</dependency>

<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
</dependency>

<dependency>
Expand Down Expand Up @@ -471,7 +471,7 @@
</dependency>

<dependency>
<groupId>org.sonatype.plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId>
</dependency>

Expand Down
6 changes: 3 additions & 3 deletions kie-wb-common-services/kie-wb-common-compiler/kie-wb-common-compiler-offprocess-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
</dependency>
<dependency>
<groupId>org.uberfire</groupId>
Expand Down Expand Up @@ -215,7 +215,7 @@
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
<groupId>org.sonatype.plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ...-common-services/kie-wb-common-compiler/kie-wb-common-compiler-offprocess-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
</dependency>
<dependency>
<groupId>org.uberfire</groupId>
Expand Down Expand Up @@ -224,7 +224,7 @@
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
<groupId>org.sonatype.plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions kie-wb-common-services/kie-wb-common-services-backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
</dependency>

<dependency>
Expand Down Expand Up @@ -390,7 +390,7 @@
</dependency>

<dependency>
<groupId>org.sonatype.plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId>
</dependency>

Expand Down
Loading