This is an automated email from the ASF dual-hosted git repository. ntimofeev pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 0280cd257dbdd42a637ccf8f7c2fe0d2d25b9028 Author: Nikita Timofeev <[email protected]> AuthorDate: Thu Jul 7 18:39:20 2022 +0300 CAY-2744 Remove ROP support - drop unused dependencies --- assembly/src/main/resources/assemblies/generic/assembly-generic.xml | 6 ------ assembly/src/main/resources/assemblies/mac/assembly-mac.xml | 6 ------ assembly/src/main/resources/assemblies/windows/assembly-windows.xml | 6 ------ docs/doc/pom.xml | 5 ----- pom.xml | 6 ------ 5 files changed, 29 deletions(-) diff --git a/assembly/src/main/resources/assemblies/generic/assembly-generic.xml b/assembly/src/main/resources/assemblies/generic/assembly-generic.xml index a041e8fc6..5d9b2b7e8 100644 --- a/assembly/src/main/resources/assemblies/generic/assembly-generic.xml +++ b/assembly/src/main/resources/assemblies/generic/assembly-generic.xml @@ -33,8 +33,6 @@ <outputDirectory>tutorials</outputDirectory> <includes> <include>tutorial/**</include> - <include>tutorial-rop-server/**</include> - <include>tutorial-rop-client/**</include> </includes> <excludes> <exclude>**/.gradle/**</exclude> @@ -72,8 +70,6 @@ <include>org.apache.cayenne:cayenne-ant</include> <include>org.apache.cayenne:cayenne-cache-invalidation</include> <include>org.apache.cayenne:cayenne-cgen</include> - <include>org.apache.cayenne:cayenne-client</include> - <include>org.apache.cayenne:cayenne-client-jetty</include> <include>org.apache.cayenne:cayenne-commitlog</include> <include>org.apache.cayenne:cayenne-crypto</include> <include>org.apache.cayenne:cayenne-dbsync</include> @@ -83,8 +79,6 @@ <include>org.apache.cayenne:cayenne-osgi</include> <include>org.apache.cayenne:cayenne-project</include> <include>org.apache.cayenne:cayenne-project-compatibility</include> - <include>org.apache.cayenne:cayenne-protostuff</include> - <include>org.apache.cayenne:cayenne-rop-server</include> <include>org.apache.cayenne:cayenne-server</include> <include>org.apache.cayenne:cayenne-velocity</include> <include>org.apache.cayenne:cayenne-web</include> diff --git a/assembly/src/main/resources/assemblies/mac/assembly-mac.xml b/assembly/src/main/resources/assemblies/mac/assembly-mac.xml index 55d3de1fd..149d2d09b 100644 --- a/assembly/src/main/resources/assemblies/mac/assembly-mac.xml +++ b/assembly/src/main/resources/assemblies/mac/assembly-mac.xml @@ -33,8 +33,6 @@ <outputDirectory>${content.dir}/tutorials/</outputDirectory> <includes> <include>tutorial/**</include> - <include>tutorial-rop-server/**</include> - <include>tutorial-rop-client/**</include> </includes> <excludes> <exclude>**/target/**</exclude> @@ -70,8 +68,6 @@ <include>org.apache.cayenne:cayenne-ant</include> <include>org.apache.cayenne:cayenne-cache-invalidation</include> <include>org.apache.cayenne:cayenne-cgen</include> - <include>org.apache.cayenne:cayenne-client</include> - <include>org.apache.cayenne:cayenne-client-jetty</include> <include>org.apache.cayenne:cayenne-commitlog</include> <include>org.apache.cayenne:cayenne-crypto</include> <include>org.apache.cayenne:cayenne-dbsync</include> @@ -81,8 +77,6 @@ <include>org.apache.cayenne:cayenne-osgi</include> <include>org.apache.cayenne:cayenne-project</include> <include>org.apache.cayenne:cayenne-project-compatibility</include> - <include>org.apache.cayenne:cayenne-protostuff</include> - <include>org.apache.cayenne:cayenne-rop-server</include> <include>org.apache.cayenne:cayenne-server</include> <include>org.apache.cayenne:cayenne-velocity</include> <include>org.apache.cayenne:cayenne-web</include> diff --git a/assembly/src/main/resources/assemblies/windows/assembly-windows.xml b/assembly/src/main/resources/assemblies/windows/assembly-windows.xml index 47cee20c6..f175c370b 100644 --- a/assembly/src/main/resources/assemblies/windows/assembly-windows.xml +++ b/assembly/src/main/resources/assemblies/windows/assembly-windows.xml @@ -33,8 +33,6 @@ <outputDirectory>tutorials</outputDirectory> <includes> <include>tutorial/**</include> - <include>tutorial-rop-server/**</include> - <include>tutorial-rop-client/**</include> </includes> <excludes> <exclude>**/target/**</exclude> @@ -70,8 +68,6 @@ <include>org.apache.cayenne:cayenne-ant</include> <include>org.apache.cayenne:cayenne-cache-invalidation</include> <include>org.apache.cayenne:cayenne-cgen</include> - <include>org.apache.cayenne:cayenne-client</include> - <include>org.apache.cayenne:cayenne-client-jetty</include> <include>org.apache.cayenne:cayenne-commitlog</include> <include>org.apache.cayenne:cayenne-crypto</include> <include>org.apache.cayenne:cayenne-dbsync</include> @@ -81,8 +77,6 @@ <include>org.apache.cayenne:cayenne-osgi</include> <include>org.apache.cayenne:cayenne-project</include> <include>org.apache.cayenne:cayenne-project-compatibility</include> - <include>org.apache.cayenne:cayenne-protostuff</include> - <include>org.apache.cayenne:cayenne-rop-server</include> <include>org.apache.cayenne:cayenne-server</include> <include>org.apache.cayenne:cayenne-velocity</include> <include>org.apache.cayenne:cayenne-web</include> diff --git a/docs/doc/pom.xml b/docs/doc/pom.xml index 199987a6b..551690549 100644 --- a/docs/doc/pom.xml +++ b/docs/doc/pom.xml @@ -53,11 +53,6 @@ <version>${project.version}</version> </dependency> - <dependency> - <groupId>com.caucho</groupId> - <artifactId>hessian</artifactId> - </dependency> - <dependency> <groupId>foundrylogic.vpp</groupId> <artifactId>vpp</artifactId> diff --git a/pom.xml b/pom.xml index f74911ac0..860d48776 100644 --- a/pom.xml +++ b/pom.xml @@ -336,12 +336,6 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-dbcp2</artifactId> <version>2.2.0</version> - </dependency> - <dependency> - <groupId>com.caucho</groupId> - <artifactId>hessian</artifactId> - <version>4.0.63</version> - <scope>provided</scope> </dependency> <dependency> <groupId>com.jgoodies</groupId>
