chore(deps): use org.glassfish:jakarta.el instead of `org.glassfish…

….web:javax.el` which is dormant and insecure
chenhuimin · Aug 2, 2022 · 62e2d6b · 62e2d6b
1 parent 56999f0
commit 62e2d6b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 24 deletions.
diff --git a/...a-archetype-service/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml b/...a-archetype-service/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml
@@ -37,8 +37,8 @@
             <artifactId>javax.el-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.web</groupId>
-            <artifactId>javax.el</artifactId>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.el</artifactId>
         </dependency>
         <!-- JSR 303 Validation End-->
     </dependencies>

diff --git a/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/pom.xml b/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/pom.xml
@@ -90,19 +90,16 @@
 
             <!--Validation API-->
             <!--
-                javax.validation:javax.validation and org.hibernate.validator:hibernate-validator
+                - javax.validation:javax.validation
+                - org.hibernate.validator:hibernate-validator
+                - org.glassfish:jakarta.el
                 are declared in spring-boot-dependencies
             -->
             <dependency>
                 <groupId>javax.el</groupId>
                 <artifactId>javax.el-api</artifactId>
                 <version>3.0.0</version>
             </dependency>
-            <dependency>
-                <groupId>org.glassfish.web</groupId>
-                <artifactId>javax.el</artifactId>
-                <version>2.2.6</version>
-            </dependency>
             <!--Validation API End -->
 
             <!-- Misc -->

diff --git a/.../cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml b/.../cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml
@@ -37,8 +37,8 @@
             <artifactId>javax.el-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.web</groupId>
-            <artifactId>javax.el</artifactId>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.el</artifactId>
         </dependency>
         <!-- JSR 303 Validation End-->
     </dependencies>

diff --git a/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/pom.xml b/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/pom.xml
@@ -96,19 +96,16 @@
 
             <!--Validation API-->
             <!--
-                javax.validation:javax.validation and org.hibernate.validator:hibernate-validator
+                - javax.validation:javax.validation
+                - org.hibernate.validator:hibernate-validator
+                - org.glassfish:jakarta.el
                 are declared in spring-boot-dependencies
             -->
             <dependency>
                 <groupId>javax.el</groupId>
                 <artifactId>javax.el-api</artifactId>
                 <version>3.0.0</version>
             </dependency>
-            <dependency>
-                <groupId>org.glassfish.web</groupId>
-                <artifactId>javax.el</artifactId>
-                <version>2.2.6</version>
-            </dependency>
             <!--Validation API End -->
 
             <!-- Misc -->

diff --git a/cola-samples/craftsman/craftsman-app/pom.xml b/cola-samples/craftsman/craftsman-app/pom.xml
@@ -38,8 +38,8 @@
             <artifactId>javax.el-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.web</groupId>
-            <artifactId>javax.el</artifactId>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.el</artifactId>
         </dependency>
         <!-- JSR 303 Validation End-->
     </dependencies>

diff --git a/cola-samples/craftsman/pom.xml b/cola-samples/craftsman/pom.xml
@@ -96,19 +96,16 @@
 
             <!--Validation API-->
             <!--
-                javax.validation:javax.validation and org.hibernate.validator:hibernate-validator
+                - javax.validation:javax.validation
+                - org.hibernate.validator:hibernate-validator
+                - org.glassfish:jakarta.el
                 are declared in spring-boot-dependencies
             -->
             <dependency>
                 <groupId>javax.el</groupId>
                 <artifactId>javax.el-api</artifactId>
                 <version>3.0.0</version>
             </dependency>
-            <dependency>
-                <groupId>org.glassfish.web</groupId>
-                <artifactId>javax.el</artifactId>
-                <version>2.2.6</version>
-            </dependency>
             <!--Validation API End -->
 
             <!-- Misc -->