Skip to content

Commit 9b16c50

Browse files
mdeinummdeinum
authored
Merge pull request #163 from spring-projects/spring-batch-excel-pom
Use `spring-boot-starter-parent` in `spring-batch-excel`
2 parents a6e8acb + da0beee commit 9b16c50

File tree

2 files changed

+109
-114
lines changed

2 files changed

+109
-114
lines changed

‎spring-batch-excel/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.flattened-pom.xml

‎spring-batch-excel/pom.xml

+108-114
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
~ Copyright 2006-2021 the original author or authors.
3+
~ Copyright 2006-2024 the original author or authors.
44
~
55
~ Licensed under the Apache License, Version 2.0 (the "License");
66
~ you may not use this file except in compliance with the License.
@@ -14,65 +14,50 @@
1414
~ See the License for the specific language governing permissions and
1515
~ limitations under the License.
1616
--><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
17-
1817
<modelVersion>4.0.0</modelVersion>
1918

19+
<parent>
20+
<groupId>org.springframework.boot</groupId>
21+
<artifactId>spring-boot-starter-parent</artifactId>
22+
<version>3.4.1</version>
23+
<relativePath/>
24+
</parent>
25+
2026
<groupId>org.springframework.batch.extensions</groupId>
2127
<artifactId>spring-batch-excel</artifactId>
2228
<version>0.2.0-SNAPSHOT</version>
23-
<name>Spring Batch Excel</name>
24-
<description>Spring Batch extension for Microsoft Excel</description>
25-
<url>https://github.com/spring-projects/spring-batch-extensions/tree/main/spring-batch-excel</url>
26-
27-
<licenses>
28-
<license>
29-
<name>Apache 2.0</name>
30-
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
31-
<distribution>repo</distribution>
32-
</license>
33-
</licenses>
3429

35-
<scm>
36-
<url>https://github.com/spring-projects/spring-batch-extensions</url>
37-
<connection>git://github.com/spring-projects/spring-batch-extensions.git</connection>
38-
<developerConnection>[email protected]:spring-projects/spring-batch-extensions.git</developerConnection>
39-
</scm>
30+
<name>Spring Batch Excel</name>
31+
<description>Spring Batch extension for Microsoft Excel</description>
32+
<url>https://github.com/spring-projects/spring-batch-extensions/tree/main/spring-batch-excel</url>
33+
<licenses>
34+
<license>
35+
<name>Apache 2.0</name>
36+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
37+
<distribution>repo</distribution>
38+
</license>
39+
</licenses>
4040

41-
<properties>
42-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
43-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
41+
<developers>
42+
<developer>
43+
<id>mdeinum</id>
44+
<name>Marten Deinum</name>
45+
<email>[email protected]</email>
46+
</developer>
47+
</developers>
4448

45-
<java.version>17</java.version>
49+
<scm>
50+
<url>https://github.com/spring-projects/spring-batch-extensions</url>
51+
<connection>git://github.com/spring-projects/spring-batch-extensions.git</connection>
52+
<developerConnection>[email protected]:spring-projects/spring-batch-extensions.git</developerConnection>
53+
</scm>
4654

47-
<spring.batch.version>5.1.2</spring.batch.version>
55+
<properties>
4856
<poi.version>5.3.0</poi.version>
49-
50-
<!-- Test Dependencies -->
51-
<assertj.version>3.26.3</assertj.version>
52-
<junit.jupiter.version>5.10.2</junit.jupiter.version>
53-
<slf4j.version>1.7.36</slf4j.version>
54-
<mockito.version>5.12.0</mockito.version>
5557
</properties>
5658

57-
<developers>
58-
<developer>
59-
<id>mdeinum</id>
60-
<name>Marten Deinum</name>
61-
<email>[email protected]</email>
62-
</developer>
63-
</developers>
64-
6559
<dependencies>
66-
<dependency>
67-
<groupId>org.springframework.batch</groupId>
68-
<artifactId>spring-batch-core</artifactId>
69-
<version>${spring.batch.version}</version>
70-
</dependency>
71-
<dependency>
72-
<groupId>org.springframework.batch</groupId>
73-
<artifactId>spring-batch-infrastructure</artifactId>
74-
<version>${spring.batch.version}</version>
75-
</dependency>
60+
<!-- Compile -->
7661
<dependency>
7762
<groupId>org.apache.poi</groupId>
7863
<artifactId>poi</artifactId>
@@ -85,53 +70,47 @@
8570
<version>${poi.version}</version>
8671
<optional>true</optional>
8772
</dependency>
88-
89-
<!-- Test Dependencies -->
73+
<dependency>
74+
<groupId>org.springframework.batch</groupId>
75+
<artifactId>spring-batch-core</artifactId>
76+
</dependency>
77+
<!-- Test -->
78+
<dependency>
79+
<groupId>org.assertj</groupId>
80+
<artifactId>assertj-core</artifactId>
81+
<scope>test</scope>
82+
</dependency>
9083
<dependency>
9184
<groupId>org.junit.jupiter</groupId>
9285
<artifactId>junit-jupiter</artifactId>
93-
<version>${junit.jupiter.version}</version>
9486
<scope>test</scope>
9587
</dependency>
9688
<dependency>
9789
<groupId>org.mockito</groupId>
9890
<artifactId>mockito-core</artifactId>
99-
<version>${mockito.version}</version>
10091
<scope>test</scope>
10192
</dependency>
102-
<dependency>
103-
<groupId>org.assertj</groupId>
104-
<artifactId>assertj-core</artifactId>
105-
<version>${assertj.version}</version>
106-
<scope>test</scope>
107-
</dependency>
108-
<dependency>
109-
<groupId>org.slf4j</groupId>
110-
<artifactId>slf4j-nop</artifactId>
111-
<version>${slf4j.version}</version>
112-
<scope>test</scope>
113-
</dependency>
93+
<dependency>
94+
<groupId>org.slf4j</groupId>
95+
<artifactId>slf4j-nop</artifactId>
96+
<scope>test</scope>
97+
</dependency>
11498
</dependencies>
11599

116100
<build>
117101
<plugins>
118102
<plugin>
119103
<groupId>org.apache.maven.plugins</groupId>
120104
<artifactId>maven-compiler-plugin</artifactId>
121-
<version>3.10.1</version>
122105
<configuration>
123-
<source>${java.version}</source>
124-
<target>${java.version}</target>
125-
<parameters>true</parameters>
126-
<compilerArgs>
127-
<arg>-Xlint:all,deprecation </arg>
128-
</compilerArgs>
106+
<compilerArgs>
107+
<arg>-Xlint:all,deprecation</arg>
108+
</compilerArgs>
129109
</configuration>
130110
</plugin>
131111
<plugin>
132112
<groupId>org.apache.maven.plugins</groupId>
133113
<artifactId>maven-javadoc-plugin</artifactId>
134-
<version>3.4.1</version>
135114
<executions>
136115
<execution>
137116
<id>attach-javadocs</id>
@@ -144,7 +123,6 @@
144123
<plugin>
145124
<groupId>org.apache.maven.plugins</groupId>
146125
<artifactId>maven-source-plugin</artifactId>
147-
<version>3.2.1</version>
148126
<executions>
149127
<execution>
150128
<id>attach-sources</id>
@@ -154,48 +132,64 @@
154132
</execution>
155133
</executions>
156134
</plugin>
157-
<plugin>
158-
<groupId>org.apache.maven.plugins</groupId>
159-
<artifactId>maven-checkstyle-plugin</artifactId>
160-
<version>3.2.0</version>
161-
<dependencies>
162-
<dependency>
163-
<groupId>com.puppycrawl.tools</groupId>
164-
<artifactId>checkstyle</artifactId>
165-
<version>9.3</version>
166-
</dependency>
167-
<dependency>
168-
<groupId>io.spring.javaformat</groupId>
169-
<artifactId>spring-javaformat-checkstyle</artifactId>
170-
<version>0.0.42</version>
171-
</dependency>
172-
</dependencies>
173-
<executions>
174-
<execution>
175-
<id>checkstyle-validation</id>
176-
<phase>validate</phase>
177-
<inherited>true</inherited>
178-
<configuration>
179-
<configLocation>io/spring/javaformat/checkstyle/checkstyle.xml</configLocation>
180-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
181-
</configuration>
182-
<goals>
183-
<goal>check</goal>
184-
</goals>
185-
</execution>
186-
</executions>
187-
</plugin>
188-
<plugin>
189-
<groupId>org.apache.maven.plugins</groupId>
190-
<artifactId>maven-surefire-plugin</artifactId>
191-
<version>3.0.0-M7</version>
192-
</plugin>
193-
<plugin>
194-
<groupId>org.apache.maven.plugins</groupId>
195-
<artifactId>maven-failsafe-plugin</artifactId>
196-
<version>3.0.0-M7</version>
197-
</plugin>
135+
<plugin>
136+
<groupId>org.apache.maven.plugins</groupId>
137+
<artifactId>maven-checkstyle-plugin</artifactId>
138+
<version>3.6.0</version>
139+
<dependencies>
140+
<dependency>
141+
<groupId>com.puppycrawl.tools</groupId>
142+
<artifactId>checkstyle</artifactId>
143+
<version>9.3</version>
144+
</dependency>
145+
<dependency>
146+
<groupId>io.spring.javaformat</groupId>
147+
<artifactId>spring-javaformat-checkstyle</artifactId>
148+
<version>0.0.43</version>
149+
</dependency>
150+
</dependencies>
151+
<executions>
152+
<execution>
153+
<id>checkstyle-validation</id>
154+
<phase>validate</phase>
155+
<inherited>true</inherited>
156+
<configuration>
157+
<configLocation>io/spring/javaformat/checkstyle/checkstyle.xml</configLocation>
158+
<includeTestSourceDirectory>true</includeTestSourceDirectory>
159+
</configuration>
160+
<goals>
161+
<goal>check</goal>
162+
</goals>
163+
</execution>
164+
</executions>
165+
</plugin>
166+
<plugin>
167+
<groupId>org.codehaus.mojo</groupId>
168+
<artifactId>flatten-maven-plugin</artifactId>
169+
<version>1.6.0</version>
170+
<executions>
171+
<execution>
172+
<id>flatten</id>
173+
<phase>process-resources</phase>
174+
<goals>
175+
<goal>flatten</goal>
176+
</goals>
177+
<configuration>
178+
<flattenMode>ossrh</flattenMode>
179+
<pomElements>
180+
<profiles>remove</profiles>
181+
</pomElements>
182+
</configuration>
183+
</execution>
184+
<execution>
185+
<id>flatten-clean</id>
186+
<phase>clean</phase>
187+
<goals>
188+
<goal>clean</goal>
189+
</goals>
190+
</execution>
191+
</executions>
192+
</plugin>
198193
</plugins>
199194
</build>
200-
201195
</project>

0 commit comments

Comments
 (0)