Skip to content

Commit a5c1f1b

Browse files
ctomcctomc
committed
WFLY-5542 Use apache upstream JSTL instead of jboss fork of java.net / apache.org one
1 parent 35ff7b3 commit a5c1f1b

File tree

5 files changed

+72
-21
lines changed

5 files changed

+72
-21
lines changed

‎feature-pack/src/license/licenses.xml

+33
Original file line numberDiff line numberDiff line change
@@ -3136,6 +3136,39 @@
31363136
</license>
31373137
</licenses>
31383138
</dependency>
3139+
<dependency>
3140+
<groupId>org.apache.taglibs</groupId>
3141+
<artifactId>taglibs-standard-spec</artifactId>
3142+
<licenses>
3143+
<license>
3144+
<name>Apache Software License, Version 2.0</name>
3145+
<url>http://repository.jboss.org/licenses/apache-2.0.txt</url>
3146+
<distribution>repo</distribution>
3147+
</license>
3148+
</licenses>
3149+
</dependency>
3150+
<dependency>
3151+
<groupId>org.apache.taglibs</groupId>
3152+
<artifactId>taglibs-standard-impl</artifactId>
3153+
<licenses>
3154+
<license>
3155+
<name>Apache Software License, Version 2.0</name>
3156+
<url>http://repository.jboss.org/licenses/apache-2.0.txt</url>
3157+
<distribution>repo</distribution>
3158+
</license>
3159+
</licenses>
3160+
</dependency>
3161+
<dependency>
3162+
<groupId>org.apache.taglibs</groupId>
3163+
<artifactId>taglibs-standard-compat</artifactId>
3164+
<licenses>
3165+
<license>
3166+
<name>Apache Software License, Version 2.0</name>
3167+
<url>http://repository.jboss.org/licenses/apache-2.0.txt</url>
3168+
<distribution>repo</distribution>
3169+
</license>
3170+
</licenses>
3171+
</dependency>
31393172
<dependency>
31403173
<groupId>org.jboss.spec.javax.transaction</groupId>
31413174
<artifactId>jboss-transaction-api_1.2_spec</artifactId>

‎pom.xml

+19-13
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
<version.org.apache.cxf.xjcplugins>3.0.5</version.org.apache.cxf.xjcplugins>
123123
<version.org.apache.ds>2.0.0-M20</version.org.apache.ds>
124124
<version.org.apache.httpcomponents.httpasyncclient>4.1</version.org.apache.httpcomponents.httpasyncclient>
125+
<version.org.apache.jstl>1.2.5</version.org.apache.jstl>
125126
<version.org.apache.james.apache-mime4j>0.6</version.org.apache.james.apache-mime4j>
126127
<version.org.apache.lucene>5.3.1</version.org.apache.lucene>
127128
<version.org.apache.myfaces.core>2.1.17</version.org.apache.myfaces.core>
@@ -191,7 +192,6 @@
191192
<version.org.jboss.spec.javax.security.jacc.jboss-jacc-api_1.5_spec>1.0.0.Final</version.org.jboss.spec.javax.security.jacc.jboss-jacc-api_1.5_spec>
192193
<version.org.jboss.spec.javax.servlet.jboss-servlet-api_3.1_spec>1.0.0.Final</version.org.jboss.spec.javax.servlet.jboss-servlet-api_3.1_spec>
193194
<version.org.jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec>1.0.1.Final</version.org.jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec>
194-
<version.org.jboss.spec.javax.servlet.jstl.jboss-jstl-api_1.2_spec>1.1.3.Final</version.org.jboss.spec.javax.servlet.jstl.jboss-jstl-api_1.2_spec>
195195
<version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec>1.0.0.Final</version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec>
196196
<version.org.jboss.spec.javax.ws.jboss-jaxrs-api_2.0_spec>1.0.0.Final</version.org.jboss.spec.javax.ws.jboss-jaxrs-api_2.0_spec>
197197
<version.org.jboss.spec.javax.xml.bind.jboss-jaxb-api_2.2_spec>1.0.4.Final</version.org.jboss.spec.javax.xml.bind.jboss-jaxb-api_2.2_spec>
@@ -3393,6 +3393,24 @@
33933393
</exclusions>
33943394
</dependency>
33953395

3396+
<dependency>
3397+
<groupId>org.apache.taglibs</groupId>
3398+
<artifactId>taglibs-standard-spec</artifactId>
3399+
<version>${version.org.apache.jstl}</version>
3400+
</dependency>
3401+
3402+
<dependency>
3403+
<groupId>org.apache.taglibs</groupId>
3404+
<artifactId>taglibs-standard-impl</artifactId>
3405+
<version>${version.org.apache.jstl}</version>
3406+
</dependency>
3407+
3408+
<dependency>
3409+
<groupId>org.apache.taglibs</groupId>
3410+
<artifactId>taglibs-standard-compat</artifactId>
3411+
<version>${version.org.apache.jstl}</version>
3412+
</dependency>
3413+
33963414
<dependency>
33973415
<groupId>org.cryptacular</groupId>
33983416
<artifactId>cryptacular</artifactId>
@@ -5251,18 +5269,6 @@
52515269
</exclusions>
52525270
</dependency>
52535271

5254-
<dependency>
5255-
<groupId>org.jboss.spec.javax.servlet.jstl</groupId>
5256-
<artifactId>jboss-jstl-api_1.2_spec</artifactId>
5257-
<version>${version.org.jboss.spec.javax.servlet.jstl.jboss-jstl-api_1.2_spec}</version>
5258-
<exclusions>
5259-
<exclusion>
5260-
<groupId>org.jboss.spec.javax.servlet</groupId>
5261-
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
5262-
</exclusion>
5263-
</exclusions>
5264-
</dependency>
5265-
52665272
<dependency>
52675273
<groupId>org.jboss.spec.javax.transaction</groupId>
52685274
<artifactId>jboss-transaction-api_1.2_spec</artifactId>

‎servlet-feature-pack/pom.xml

+15-5
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,21 @@
124124
<artifactId>javax.el-impl</artifactId>
125125
</dependency>
126126

127+
<dependency>
128+
<groupId>org.apache.taglibs</groupId>
129+
<artifactId>taglibs-standard-spec</artifactId>
130+
</dependency>
131+
132+
<dependency>
133+
<groupId>org.apache.taglibs</groupId>
134+
<artifactId>taglibs-standard-impl</artifactId>
135+
</dependency>
136+
137+
<dependency>
138+
<groupId>org.apache.taglibs</groupId>
139+
<artifactId>taglibs-standard-compat</artifactId>
140+
</dependency>
141+
127142
<dependency>
128143
<groupId>org.jboss</groupId>
129144
<artifactId>jboss-remote-naming</artifactId>
@@ -170,11 +185,6 @@
170185
<artifactId>jboss-jsp-api_2.3_spec</artifactId>
171186
</dependency>
172187

173-
<dependency>
174-
<groupId>org.jboss.spec.javax.servlet.jstl</groupId>
175-
<artifactId>jboss-jstl-api_1.2_spec</artifactId>
176-
</dependency>
177-
178188
<dependency>
179189
<groupId>org.jboss.spec.javax.security.jacc</groupId>
180190
<artifactId>jboss-jacc-api_1.5_spec</artifactId>

‎servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/servlet/jstl/api/main/module.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
</dependencies>
3333

3434
<resources>
35-
<artifact name="${org.jboss.spec.javax.servlet.jstl:jboss-jstl-api_1.2_spec}"/>
35+
<artifact name="${org.apache.taglibs:taglibs-standard-spec}"/>
36+
<artifact name="${org.apache.taglibs:taglibs-standard-impl}"/>
37+
<artifact name="${org.apache.taglibs:taglibs-standard-compat}"/>
3638
</resources>
3739
</module>

‎spec-api/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@
9898
<artifactId>jboss-jsp-api_2.3_spec</artifactId>
9999
</dependency>
100100
<dependency>
101-
<groupId>org.jboss.spec.javax.servlet.jstl</groupId>
102-
<artifactId>jboss-jstl-api_1.2_spec</artifactId>
101+
<groupId>org.apache.taglibs</groupId>
102+
<artifactId>taglibs-standard-spec</artifactId>
103103
</dependency>
104104
<dependency>
105105
<groupId>org.jboss.spec.javax.transaction</groupId>

0 commit comments

Comments
 (0)