Skip to content

Commit d9eee35

Browse files
scordioscordio
committed
Use spring-boot-starter-parent in spring-batch-bigquery 
1 parent 41a29c7 commit d9eee35

File tree

2 files changed

+64
-79
lines changed

2 files changed

+64
-79
lines changed

‎spring-batch-bigquery/.gitignore

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

‎spring-batch-bigquery/pom.xml

+63-79
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,31 @@
1313
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1414
~ See the License for the specific language governing permissions and
1515
~ limitations under the License.
16-
--><project xmlns="http://maven.apache.org/POM/4.0.0"
17-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
19-
16+
-->
17+
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2018
<modelVersion>4.0.0</modelVersion>
2119

20+
<parent>
21+
<groupId>org.springframework.boot</groupId>
22+
<artifactId>spring-boot-starter-parent</artifactId>
23+
<version>3.4.1</version>
24+
<relativePath/>
25+
</parent>
26+
2227
<groupId>org.springframework.batch.extensions</groupId>
2328
<artifactId>spring-batch-bigquery</artifactId>
2429
<version>0.2.0-SNAPSHOT</version>
30+
2531
<name>Spring Batch BigQuery</name>
2632
<description>Spring Batch extension for Google BigQuery</description>
2733
<url>https://github.com/spring-projects/spring-batch-extensions/tree/main/spring-batch-bigquery</url>
34+
<licenses>
35+
<license>
36+
<name>Apache-2.0</name>
37+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
38+
<distribution>repo</distribution>
39+
</license>
40+
</licenses>
2841

2942
<developers>
3043
<developer>
@@ -34,70 +47,40 @@
3447
</developer>
3548
</developers>
3649

37-
<licenses>
38-
<license>
39-
<name>Apache-2.0</name>
40-
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
41-
<distribution>repo</distribution>
42-
</license>
43-
</licenses>
44-
4550
<scm>
4651
<url>https://github.com/spring-projects/spring-batch-extensions</url>
4752
<connection>git://github.com/spring-projects/spring-batch-extensions.git</connection>
4853
<developerConnection>[email protected]:spring-projects/spring-batch-extensions.git</developerConnection>
4954
</scm>
5055

51-
<properties>
52-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
53-
54-
<!-- Dependent on Spring Batch core -->
55-
<java.version>17</java.version>
56-
<logback.version>1.5.13</logback.version>
57-
</properties>
58-
5956
<dependencies>
57+
<!-- Compile -->
6058
<dependency>
61-
<groupId>org.springframework.batch</groupId>
62-
<artifactId>spring-batch-core</artifactId>
63-
<version>5.1.2</version>
59+
<groupId>com.fasterxml.jackson.dataformat</groupId>
60+
<artifactId>jackson-dataformat-csv</artifactId>
6461
</dependency>
65-
6662
<dependency>
6763
<groupId>com.google.cloud</groupId>
6864
<artifactId>google-cloud-bigquery</artifactId>
69-
<version>2.42.0</version>
65+
<version>2.45.0</version>
7066
</dependency>
71-
<dependency>
72-
<groupId>com.fasterxml.jackson.dataformat</groupId>
73-
<artifactId>jackson-dataformat-csv</artifactId>
74-
<version>2.17.2</version>
75-
</dependency>
76-
7767
<dependency>
7868
<groupId>org.apache.commons</groupId>
7969
<artifactId>commons-lang3</artifactId>
80-
<version>3.16.0</version>
8170
</dependency>
82-
83-
84-
<!-- Test Dependencies -->
71+
<dependency>
72+
<groupId>org.springframework.batch</groupId>
73+
<artifactId>spring-batch-core</artifactId>
74+
</dependency>
75+
<!-- Test -->
8576
<dependency>
8677
<groupId>org.junit.jupiter</groupId>
8778
<artifactId>junit-jupiter-api</artifactId>
88-
<version>5.11.0</version>
8979
<scope>test</scope>
9080
</dependency>
9181
<dependency>
9282
<groupId>org.mockito</groupId>
9383
<artifactId>mockito-core</artifactId>
94-
<version>5.12.0</version>
95-
<scope>test</scope>
96-
</dependency>
97-
<dependency>
98-
<groupId>ch.qos.logback</groupId>
99-
<artifactId>logback-core</artifactId>
100-
<version>${logback.version}</version>
10184
<scope>test</scope>
10285
</dependency>
10386
<dependency>
@@ -106,39 +89,42 @@
10689
<version>${logback.version}</version>
10790
<scope>test</scope>
10891
</dependency>
109-
<dependency>
110-
<groupId>org.slf4j</groupId>
111-
<artifactId>slf4j-api</artifactId>
112-
<version>2.0.16</version>
113-
<scope>test</scope>
114-
</dependency>
11592
<dependency>
11693
<groupId>org.testcontainers</groupId>
11794
<artifactId>junit-jupiter</artifactId>
118-
<version>1.20.1</version>
11995
<scope>test</scope>
12096
</dependency>
121-
12297
</dependencies>
12398

12499
<build>
125100
<plugins>
126-
<!-- Compiles source code -->
127101
<plugin>
128102
<groupId>org.apache.maven.plugins</groupId>
129-
<artifactId>maven-compiler-plugin</artifactId>
130-
<version>3.13.0</version>
131-
<configuration>
132-
<source>${java.version}</source>
133-
<target>${java.version}</target>
134-
</configuration>
103+
<artifactId>maven-javadoc-plugin</artifactId>
104+
<executions>
105+
<execution>
106+
<id>attach-javadocs</id>
107+
<goals>
108+
<goal>jar</goal>
109+
</goals>
110+
</execution>
111+
</executions>
112+
</plugin>
113+
<plugin>
114+
<groupId>org.apache.maven.plugins</groupId>
115+
<artifactId>maven-source-plugin</artifactId>
116+
<executions>
117+
<execution>
118+
<id>attach-sources</id>
119+
<goals>
120+
<goal>jar</goal>
121+
</goals>
122+
</execution>
123+
</executions>
135124
</plugin>
136-
137-
<!-- Runs tests -->
138125
<plugin>
139126
<groupId>org.apache.maven.plugins</groupId>
140127
<artifactId>maven-surefire-plugin</artifactId>
141-
<version>3.3.1</version>
142128
<configuration>
143129
<includes>
144130
<!-- Google cloud tests are omitted because they are designed to be run locally -->
@@ -147,35 +133,33 @@
147133
</includes>
148134
</configuration>
149135
</plugin>
150-
151-
<!-- Generate javadoc and source jars -->
152136
<plugin>
153-
<groupId>org.apache.maven.plugins</groupId>
154-
<artifactId>maven-javadoc-plugin</artifactId>
155-
<version>3.8.0</version>
137+
<groupId>org.codehaus.mojo</groupId>
138+
<artifactId>flatten-maven-plugin</artifactId>
139+
<version>1.6.0</version>
156140
<executions>
157141
<execution>
158-
<id>attach-javadocs</id>
142+
<id>flatten</id>
143+
<phase>process-resources</phase>
159144
<goals>
160-
<goal>jar</goal>
145+
<goal>flatten</goal>
161146
</goals>
147+
<configuration>
148+
<flattenMode>ossrh</flattenMode>
149+
<pomElements>
150+
<profiles>remove</profiles>
151+
</pomElements>
152+
</configuration>
162153
</execution>
163-
</executions>
164-
</plugin>
165-
<plugin>
166-
<groupId>org.apache.maven.plugins</groupId>
167-
<artifactId>maven-source-plugin</artifactId>
168-
<version>3.3.1</version>
169-
<executions>
170154
<execution>
171-
<id>attach-sources</id>
155+
<id>flatten-clean</id>
156+
<phase>clean</phase>
172157
<goals>
173-
<goal>jar</goal>
158+
<goal>clean</goal>
174159
</goals>
175160
</execution>
176161
</executions>
177162
</plugin>
178163
</plugins>
179164
</build>
180-
181-
</project>
165+
</project>

0 commit comments

Comments
 (0)