Skip to content

Commit 3ac8d06

Browse files
oldratleeoldratlee
committed
upgrade dependencies/plugins of generated maven project by cola-archetypes 
1 parent eba3993 commit 3ac8d06

File tree

4 files changed

+30
-41
lines changed
  • cola-archetypes
    • cola-archetype-service/src/main/resources/archetype-resources
    • cola-archetype-web/src/main/resources/archetype-resources
  • cola-samples/craftsman
  • scripts

4 files changed

+30
-41
lines changed

‎cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<scope>import</scope>
4040
</dependency>
4141
<!--COLA components End-->
42+
4243
<!--Project modules-->
4344
<dependency>
4445
<groupId>${groupId}</groupId>
@@ -61,6 +62,7 @@
6162
<version>${project.version}</version>
6263
</dependency>
6364
<!--Project modules End-->
65+
6466
<!--Spring Boot-->
6567
<dependency>
6668
<groupId>org.springframework.boot</groupId>
@@ -75,17 +77,12 @@
7577
<version>${mybatis-starter.version}</version>
7678
</dependency>
7779
<!--Spring Boot End-->
80+
7881
<!--Validation API-->
79-
<dependency>
80-
<groupId>javax.validation</groupId>
81-
<artifactId>validation-api</artifactId>
82-
<version>2.0.0.Final</version>
83-
</dependency>
84-
<dependency>
85-
<groupId>org.hibernate.validator</groupId>
86-
<artifactId>hibernate-validator</artifactId>
87-
<version>6.0.22.Final</version>
88-
</dependency>
82+
<!--
83+
javax.validation:javax.validation and org.hibernate.validator:hibernate-validator
84+
are decleared in spring-boot-dependencies
85+
-->
8986
<dependency>
9087
<groupId>javax.el</groupId>
9188
<artifactId>javax.el-api</artifactId>
@@ -97,21 +94,22 @@
9794
<version>2.2.6</version>
9895
</dependency>
9996
<!--Validation API End -->
97+
10098
<!-- Misc -->
10199
<dependency>
102100
<groupId>org.reflections</groupId>
103101
<artifactId>reflections</artifactId>
104-
<version>0.9.10</version>
102+
<version>0.10.2</version>
105103
</dependency>
106104
<dependency>
107105
<groupId>org.projectlombok</groupId>
108106
<artifactId>lombok</artifactId>
109-
<version>1.18.22</version>
107+
<version>1.18.24</version>
110108
</dependency>
111109
<dependency>
112110
<groupId>org.apache.commons</groupId>
113111
<artifactId>commons-lang3</artifactId>
114-
<version>3.4</version>
112+
<version>3.12.0</version>
115113
</dependency>
116114
<dependency>
117115
<groupId>com.alibaba</groupId>
@@ -134,7 +132,7 @@
134132
<plugin>
135133
<groupId>org.apache.maven.plugins</groupId>
136134
<artifactId>maven-source-plugin</artifactId>
137-
<version>3.0.1</version>
135+
<version>3.2.1</version>
138136
</plugin>
139137
<plugin>
140138
<groupId>org.apache.maven.plugins</groupId>
@@ -144,7 +142,7 @@
144142
<plugin>
145143
<groupId>org.apache.maven.plugins</groupId>
146144
<artifactId>maven-compiler-plugin</artifactId>
147-
<version>3.9.0</version>
145+
<version>3.10.1</version>
148146
</plugin>
149147
<plugin>
150148
<artifactId>maven-deploy-plugin</artifactId>

‎cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
<version>${project.version}</version>
6969
</dependency>
7070
<!--Project modules End-->
71+
7172
<!--Spring Boot-->
7273
<dependency>
7374
<groupId>org.springframework.boot</groupId>
@@ -82,17 +83,12 @@
8283
<version>${mybatis-starter.version}</version>
8384
</dependency>
8485
<!--Spring Boot End-->
86+
8587
<!--Validation API-->
86-
<dependency>
87-
<groupId>javax.validation</groupId>
88-
<artifactId>validation-api</artifactId>
89-
<version>2.0.0.Final</version>
90-
</dependency>
91-
<dependency>
92-
<groupId>org.hibernate.validator</groupId>
93-
<artifactId>hibernate-validator</artifactId>
94-
<version>6.0.22.Final</version>
95-
</dependency>
88+
<!--
89+
javax.validation:javax.validation and org.hibernate.validator:hibernate-validator
90+
are decleared in spring-boot-dependencies
91+
-->
9692
<dependency>
9793
<groupId>javax.el</groupId>
9894
<artifactId>javax.el-api</artifactId>
@@ -104,21 +100,22 @@
104100
<version>2.2.6</version>
105101
</dependency>
106102
<!--Validation API End -->
103+
107104
<!-- Misc -->
108105
<dependency>
109106
<groupId>org.reflections</groupId>
110107
<artifactId>reflections</artifactId>
111-
<version>0.9.10</version>
108+
<version>0.10.2</version>
112109
</dependency>
113110
<dependency>
114111
<groupId>org.projectlombok</groupId>
115112
<artifactId>lombok</artifactId>
116-
<version>1.18.22</version>
113+
<version>1.18.24</version>
117114
</dependency>
118115
<dependency>
119116
<groupId>org.apache.commons</groupId>
120117
<artifactId>commons-lang3</artifactId>
121-
<version>3.4</version>
118+
<version>3.12.0</version>
122119
</dependency>
123120
<dependency>
124121
<groupId>com.alibaba</groupId>
@@ -141,7 +138,7 @@
141138
<plugin>
142139
<groupId>org.apache.maven.plugins</groupId>
143140
<artifactId>maven-source-plugin</artifactId>
144-
<version>3.0.1</version>
141+
<version>3.2.1</version>
145142
</plugin>
146143
<plugin>
147144
<groupId>org.apache.maven.plugins</groupId>
@@ -151,7 +148,7 @@
151148
<plugin>
152149
<groupId>org.apache.maven.plugins</groupId>
153150
<artifactId>maven-compiler-plugin</artifactId>
154-
<version>3.9.0</version>
151+
<version>3.10.1</version>
155152
</plugin>
156153
<plugin>
157154
<artifactId>maven-deploy-plugin</artifactId>

‎cola-samples/craftsman/pom.xml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,10 @@
8989
</dependency>
9090
<!--Spring Boot End-->
9191
<!--Validation API-->
92-
<dependency>
93-
<groupId>javax.validation</groupId>
94-
<artifactId>validation-api</artifactId>
95-
<version>2.0.1.Final</version>
96-
</dependency>
97-
<dependency>
98-
<groupId>org.hibernate.validator</groupId>
99-
<artifactId>hibernate-validator</artifactId>
100-
<version>7.0.4.Final</version>
101-
</dependency>
92+
<!--
93+
javax.validation:javax.validation and org.hibernate.validator:hibernate-validator
94+
are declared in spring-boot-dependencies
95+
-->
10296
<dependency>
10397
<groupId>javax.el</groupId>
10498
<artifactId>javax.el-api</artifactId>

‎scripts/bump_cola_version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ readonly bump_version="$1"
2929
cd ../cola-archetypes/
3030

3131
jvb::mvn_cmd \
32-
org.codehaus.mojo:versions-maven-plugin:2.8.1:set \
32+
org.codehaus.mojo:versions-maven-plugin:2.11.0:set \
3333
-DgenerateBackupPoms=false \
3434
-DnewVersion="$bump_version"
3535

0 commit comments

Comments
 (0)