This is an automated email from the ASF dual-hosted git repository.
doebele pushed a commit to branch version3
in repository https://gitbox.apache.org/repos/asf/empire-db.git
The following commit(s) were added to refs/heads/version3 by this push:
new 67fc9a6 EMPIREDB-362 dependency update
67fc9a6 is described below
commit 67fc9a6501443f6da191484f4b9311da120052b0
Author: Rainer Döbele <[email protected]>
AuthorDate: Sun Jan 23 03:12:23 2022 +0100
EMPIREDB-362 dependency update
---
.../src/assemble/empire-assembly-all.xml | 6 ---
empire-db-examples/empire-db-example-jsf2/pom.xml | 6 +--
empire-db-examples/empire-db-example-vue/pom.xml | 6 +--
empire-db-jsf2/pom.xml | 6 +--
pom.xml | 56 ++--------------------
5 files changed, 11 insertions(+), 69 deletions(-)
diff --git a/empire-db-dist/src/assemble/empire-assembly-all.xml
b/empire-db-dist/src/assemble/empire-assembly-all.xml
index f3c44d2..4403707 100644
--- a/empire-db-dist/src/assemble/empire-assembly-all.xml
+++ b/empire-db-dist/src/assemble/empire-assembly-all.xml
@@ -37,8 +37,6 @@
<include>empire-db-jsf2/**</include>
<include>empire-db-maven-plugin/**</include>
<include>empire-db-codegen/**</include>
- <include>empire-db-spring/**</include>
- <include>empire-db-struts2/**</include>
<include>empire-db-examples/**</include>
</includes>
<excludes>
@@ -81,9 +79,7 @@
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.apache.empire-db:empire-db:*:javadoc</include>
-
<include>org.apache.empire-db:empire-db-struts2:*:javadoc</include>
<include>org.apache.empire-db:empire-db-jsf2:*:javadoc</include>
-
<include>org.apache.empire-db:empire-db-spring:*:javadoc</include>
</includes>
</dependencySet>
<dependencySet>
@@ -91,9 +87,7 @@
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.apache.empire-db:empire-db:jar</include>
- <include>org.apache.empire-db:empire-db-struts2:jar</include>
<include>org.apache.empire-db:empire-db-jsf2:jar</include>
-
<include>org.apache.empire-db:empire-db-spring:jar</include>
</includes>
<excludes>
<exclude>org.apache.empire-db:*:*:javadoc</exclude>
diff --git a/empire-db-examples/empire-db-example-jsf2/pom.xml
b/empire-db-examples/empire-db-example-jsf2/pom.xml
index 3f3b62a..d1c0f11 100644
--- a/empire-db-examples/empire-db-example-jsf2/pom.xml
+++ b/empire-db-examples/empire-db-example-jsf2/pom.xml
@@ -27,8 +27,6 @@
<packaging>war</packaging>
<properties>
- <maven.compile.source>1.6</maven.compile.source>
- <maven.compile.target>1.6</maven.compile.target>
</properties>
<dependencies>
@@ -44,8 +42,8 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/empire-db-examples/empire-db-example-vue/pom.xml
b/empire-db-examples/empire-db-example-vue/pom.xml
index 7a949ca..3357549 100644
--- a/empire-db-examples/empire-db-example-vue/pom.xml
+++ b/empire-db-examples/empire-db-example-vue/pom.xml
@@ -25,16 +25,14 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <maven.compile.source>1.7</maven.compile.source>
- <maven.compile.target>1.7</maven.compile.target>
</properties>
<dependencies>
<!-- Servlet API -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/empire-db-jsf2/pom.xml b/empire-db-jsf2/pom.xml
index e2668a0..4b7cbbe 100644
--- a/empire-db-jsf2/pom.xml
+++ b/empire-db-jsf2/pom.xml
@@ -27,8 +27,6 @@
<name>Apache Empire-db Java Server Faces 2.x extensions</name>
<properties>
- <maven.compile.source>1.6</maven.compile.source>
- <maven.compile.target>1.6</maven.compile.target>
</properties>
<dependencies>
@@ -38,8 +36,8 @@
</dependency>
<!-- Servlet API -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.faces</groupId>
diff --git a/pom.xml b/pom.xml
index 3660b67..d1f7ca3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,24 +254,12 @@
</dependency>
<dependency>
<groupId>org.apache.empire-db</groupId>
- <artifactId>empire-db-struts2</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.empire-db</groupId>
<artifactId>empire-db-jsf2</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.empire-db</groupId>
- <artifactId>empire-db-spring</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.empire-db</groupId>
<artifactId>empire-db-codegen</artifactId>
<version>${project.version}</version>
<type>jar</type>
@@ -323,44 +311,10 @@
</dependency>
<!-- web -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <!-- struts2 -->
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-core</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-portlet-plugin</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts.xwork</groupId>
- <artifactId>xwork-core</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <!-- DO NOT REMOVE: required for struts2
extentions! -->
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.8.0.GA</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>4.0.0</version>
+ <scope>provided</scope>
</dependency>
<!-- Sun Mojarra -->
<dependency>
@@ -528,7 +482,7 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.1.2</version>
+ <version>3.1.1</version>
<configuration>
<!--
<useDefaultManifestFile>true</useDefaultManifestFile>
