Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 07:37:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes dependency clash

Browse Source 
(cherry picked from commit 6622fab25b)

Conflicts:
	apps/showcase/pom.xml
	plugins/bean-validation/pom.xml
This commit is contained in:
Lukasz Lenart
2015-11-28 15:39:47 +01:00
parent f19e4be947
commit 27aa7e1e27
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/tiles/pom.xml
+3 -4
View File
@@ -73,11 +73,10 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
<scope>provided</scope>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
pom.xml
+3 -4
View File
@@ -641,10 +641,9 @@
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
<version>1.0</version>
<scope>provided</scope>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>