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
The following commit(s) were added to refs/heads/master by this push:
new b3c45f22e CAY-2737 Cayenne 4.3: cleanup deprecated code - cleanup
unused dependencies - fix javadoc build
b3c45f22e is described below
commit b3c45f22eb339bbd211d9c01627120f145482452
Author: Nikita Timofeev <stari...@gmail.com>
AuthorDate: Tue Jul 12 11:10:54 2022 +0300
CAY-2737 Cayenne 4.3: cleanup deprecated code
- cleanup unused dependencies
- fix javadoc build
---
docs/doc/pom.xml | 11 -----------
pom.xml | 43 ++-----------------------------------------
tutorials/tutorial/pom.xml | 13 +------------
3 files changed, 3 insertions(+), 64 deletions(-)
diff --git a/docs/doc/pom.xml b/docs/doc/pom.xml
index b2676906d..ed140a1b4 100644
--- a/docs/doc/pom.xml
+++ b/docs/doc/pom.xml
@@ -41,12 +41,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.cayenne</groupId>
- <artifactId>cayenne-rop-server</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.cayenne.modeler</groupId>
<artifactId>cayenne-modeler</artifactId>
@@ -73,11 +67,6 @@
<artifactId>ognl</artifactId>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-
</dependencies>
<profiles>
diff --git a/pom.xml b/pom.xml
index 9d60a361c..bdcf583a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -328,11 +328,6 @@
<version>${ant.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-dbcp2</artifactId>
- <version>2.2.0</version>
- </dependency>
<dependency>
<groupId>com.jgoodies</groupId>
<artifactId>forms</artifactId>
@@ -349,23 +344,11 @@
<version>1.1.2</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.mockrunner</groupId>
- <artifactId>mockrunner-servlet</artifactId>
- <version>1.1.2</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>ognl</groupId>
<artifactId>ognl</artifactId>
<version>2.6.7</version>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
@@ -460,30 +443,6 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups-all</artifactId>
- <version>2.2.7</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jivesoftware</groupId>
- <artifactId>smack</artifactId>
- <version>2.2.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jivesoftware</groupId>
- <artifactId>smackx</artifactId>
- <version>2.2.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1.1</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
@@ -848,6 +807,8 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<configuration>
+ <!-- Suppress errors in the
JavaDocs (it should be cleaned one day...) -->
+ <doclint>none</doclint>
<additionalOptions>${javadoc.additionalOptions}</additionalOptions>
<source>11</source>
</configuration>
diff --git a/tutorials/tutorial/pom.xml b/tutorials/tutorial/pom.xml
index f865dbb57..96245ff6d 100644
--- a/tutorials/tutorial/pom.xml
+++ b/tutorials/tutorial/pom.xml
@@ -23,7 +23,7 @@
<artifactId>tutorial</artifactId>
<name>tutorial: Cayenne Tutorial</name>
- <packaging>war</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
@@ -31,12 +31,6 @@
<artifactId>cayenne-server</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
@@ -51,11 +45,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>${jetty.version}</version>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
