This is an automated email from the ASF dual-hosted git repository. joshtynjala pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/flex-blazeds.git
commit ac6dbfa0a9f5da61d5c234c0f5f6737c2adb014f Author: Josh Tynjala <[email protected]> AuthorDate: Wed Jan 18 15:20:28 2023 -0800 make proxy optional (use -P with-proxy) --- README | 10 ---------- distribution/pom.xml | 18 +++++++++++++----- opt/blazeds-spring-boot-starter/pom.xml | 5 ----- pom.xml | 20 ++++++-------------- proxy/pom.xml | 8 +++++++- 5 files changed, 26 insertions(+), 35 deletions(-) diff --git a/README b/README index 29dc057..44c7730 100644 --- a/README +++ b/README @@ -107,16 +107,6 @@ Using the Binary Distribution <artifactId>flex-messaging-core</artifactId> <version>4.7.3</version> </dependency> - <dependency> - <groupId>org.apache.flex.blazeds</groupId> - <artifactId>flex-messaging-opt</artifactId> - <version>4.7.3</version> - </dependency> - <dependency> - <groupId>org.apache.flex.blazeds</groupId> - <artifactId>flex-messaging-proxy</artifactId> - <version>4.7.3</version> - </dependency> <dependency> <groupId>org.apache.flex.blazeds</groupId> <artifactId>flex-messaging-remoting</artifactId> diff --git a/distribution/pom.xml b/distribution/pom.xml index 6b87cd1..98ce432 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -89,15 +89,23 @@ <artifactId>flex-messaging-opt-tomcat-base</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.flex.blazeds</groupId> - <artifactId>flex-messaging-proxy</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.flex.blazeds</groupId> <artifactId>flex-messaging-remoting</artifactId> <version>${project.version}</version> </dependency> </dependencies> + + <profiles> + <profile> + <id>with-proxy</id> + <dependencies> + <dependency> + <groupId>org.apache.flex.blazeds</groupId> + <artifactId>flex-messaging-proxy</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </profile> + </profiles> </project> \ No newline at end of file diff --git a/opt/blazeds-spring-boot-starter/pom.xml b/opt/blazeds-spring-boot-starter/pom.xml index 1a56953..6d31328 100644 --- a/opt/blazeds-spring-boot-starter/pom.xml +++ b/opt/blazeds-spring-boot-starter/pom.xml @@ -80,11 +80,6 @@ limitations under the License. <artifactId>flex-messaging-common</artifactId> <version>4.8.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.flex.blazeds</groupId> - <artifactId>flex-messaging-proxy</artifactId> - <version>4.8.0-SNAPSHOT</version> - </dependency> <dependency> <groupId>org.apache.flex.blazeds</groupId> <artifactId>flex-messaging-remoting</artifactId> diff --git a/pom.xml b/pom.xml index a3cb040..9377ef6 100755 --- a/pom.xml +++ b/pom.xml @@ -296,18 +296,6 @@ <dependencyManagement> <dependencies> - <!-- TODO: This is the latest version of commons-httpclient, however there are CVEs reported for this, the replacement is org.apache.httpcomponents:httpclient however changing to this requires quite some refactoring of the code --> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - </dependency> - <!--dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>4.5.13</version> - </dependency--> - <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> @@ -352,6 +340,12 @@ <module>distribution</module> </modules> </profile> + <profile> + <id>with-proxy</id> + <modules> + <module>proxy</module> + </modules> + </profile> <profile> <id>with-owasp</id> <build> @@ -382,8 +376,6 @@ <exclude>org.apache.flex.blazeds:flex-messaging-remoting</exclude> <exclude>org.apache.flex.blazeds:blazeds-spring-boot-starter</exclude> <exclude>org.apache.flex.blazeds:flex-messaging-opt-tomcat-base</exclude> - <!-- TODO: Excluding this dependency, for which there's CVEs reported as it requires refactoring quite a bit. However this should be addressed before the next release --> - <exclude>commons-httpclient:commons-httpclient</exclude> </excludes> </configuration> </plugin> diff --git a/proxy/pom.xml b/proxy/pom.xml index a145748..92b0c1b 100755 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -35,11 +35,17 @@ limitations under the License. <version>${project.version}</version> </dependency> - <!-- TODO: This should be updated to org.apache.httpcomponents:httpclient --> + <!-- TODO: This is the latest version of commons-httpclient, however there are CVEs reported for this, the replacement is org.apache.httpcomponents:httpclient however changing to this requires quite some refactoring of the code --> <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> + <version>3.1</version> </dependency> + <!--dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.5.13</version> + </dependency--> <dependency> <groupId>javax.servlet</groupId>
