Skip to content

Commit f76a9aa

Browse files
ibodrovibodrov
committed
project: remove takari-lifecycle, parent pom
1 parent b86d29c commit f76a9aa

File tree

23 files changed

+134
-45
lines changed

23 files changed

+134
-45
lines changed

‎pom.xml‎

Lines changed: 112 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,16 @@
33

44
<modelVersion>4.0.0</modelVersion>
55

6-
<parent>
7-
<groupId>io.takari</groupId>
8-
<artifactId>takari</artifactId>
9-
<version>27</version>
10-
</parent>
11-
126
<groupId>com.walmartlabs.concord.plugins</groupId>
137
<artifactId>concord-plugins-parent</artifactId>
148
<version>2.7.1-SNAPSHOT</version>
159

1610
<packaging>pom</packaging>
1711

12+
<name>${project.groupId}:${project.artifactId}</name>
13+
<description>Plugins for walmartlabs/concord</description>
14+
<url>https://concord.walmartlabs.com/</url>
15+
1816
<licenses>
1917
<license>
2018
<name>Apache License, Version 2.0</name>
@@ -57,8 +55,9 @@
5755
</modules>
5856

5957
<properties>
60-
<maven.compiler.source>17</maven.compiler.source>
61-
<maven.compiler.target>17</maven.compiler.target>
58+
<maven.compiler.release>17</maven.compiler.release>
59+
<maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
60+
<maven.compiler.target>${maven.compiler.release}</maven.compiler.target>
6261

6362
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6463
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -155,16 +154,66 @@
155154
</configuration>
156155
</plugin>
157156
<plugin>
158-
<groupId>io.takari.maven.plugins</groupId>
159-
<artifactId>takari-lifecycle-plugin</artifactId>
160-
<version>2.2.0</version>
161-
<extensions>true</extensions>
157+
<artifactId>maven-compiler-plugin</artifactId>
158+
<version>3.14.0</version>
162159
<configuration>
163-
<source>${maven.compiler.source}</source>
164-
<target>${maven.compiler.target}</target>
165-
<proc>proc</proc>
160+
<compilerArgs>-proc:full</compilerArgs>
166161
</configuration>
167162
</plugin>
163+
<plugin>
164+
<groupId>org.apache.maven.plugins</groupId>
165+
<artifactId>maven-release-plugin</artifactId>
166+
<version>3.1.1</version>
167+
<configuration>
168+
<indentSize>4</indentSize>
169+
<tagNameFormat>@{project.version}</tagNameFormat>
170+
<localCheckout>true</localCheckout>
171+
<autoVersionSubmodules>true</autoVersionSubmodules>
172+
<pushChanges>false</pushChanges>
173+
<useReleaseProfile>false</useReleaseProfile>
174+
<goals>deploy</goals>
175+
<arguments>--batch-mode -DskipTests -Pconcord-release</arguments>
176+
</configuration>
177+
</plugin>
178+
<plugin>
179+
<groupId>org.apache.maven.plugins</groupId>
180+
<artifactId>maven-source-plugin</artifactId>
181+
<version>3.3.0</version>
182+
<executions>
183+
<execution>
184+
<id>attach-sources</id>
185+
<goals>
186+
<goal>jar-no-fork</goal>
187+
</goals>
188+
</execution>
189+
</executions>
190+
<configuration>
191+
<skipSource>true</skipSource>
192+
</configuration>
193+
</plugin>
194+
195+
<plugin>
196+
<groupId>org.apache.maven.plugins</groupId>
197+
<artifactId>maven-gpg-plugin</artifactId>
198+
<version>3.1.0</version>
199+
<executions>
200+
<execution>
201+
<id>sign-artifacts</id>
202+
<phase>verify</phase>
203+
<goals>
204+
<goal>sign</goal>
205+
</goals>
206+
</execution>
207+
</executions>
208+
<configuration>
209+
<skip>true</skip>
210+
</configuration>
211+
</plugin>
212+
<plugin>
213+
<groupId>org.apache.maven.plugins</groupId>
214+
<artifactId>maven-javadoc-plugin</artifactId>
215+
<version>3.11.2</version>
216+
</plugin>
168217
<plugin>
169218
<groupId>org.codehaus.mojo</groupId>
170219
<artifactId>license-maven-plugin</artifactId>
@@ -220,7 +269,55 @@
220269
</build>
221270

222271
<scm>
272+
<url>${scm.connection}</url>
223273
<developerConnection>${scm.connection}</developerConnection>
224274
<tag>2.7.0</tag>
225275
</scm>
276+
277+
<profiles>
278+
<profile>
279+
<id>concord-release</id>
280+
<build>
281+
<plugins>
282+
<plugin>
283+
<artifactId>maven-gpg-plugin</artifactId>
284+
<configuration>
285+
<skip>false</skip>
286+
</configuration>
287+
</plugin>
288+
<plugin>
289+
<groupId>org.apache.maven.plugins</groupId>
290+
<artifactId>maven-javadoc-plugin</artifactId>
291+
<executions>
292+
<execution>
293+
<id>attach-javadocs</id>
294+
<goals>
295+
<goal>jar</goal>
296+
</goals>
297+
</execution>
298+
</executions>
299+
<configuration>
300+
<quiet>true</quiet>
301+
<doclint>none</doclint>
302+
</configuration>
303+
</plugin>
304+
<plugin>
305+
<groupId>org.apache.maven.plugins</groupId>
306+
<artifactId>maven-source-plugin</artifactId>
307+
<executions>
308+
<execution>
309+
<id>attach-sources</id>
310+
<goals>
311+
<goal>jar-no-fork</goal>
312+
</goals>
313+
</execution>
314+
</executions>
315+
<configuration>
316+
<skipSource>false</skipSource>
317+
</configuration>
318+
</plugin>
319+
</plugins>
320+
</build>
321+
</profile>
322+
</profiles>
226323
</project>

‎runtime/codecoverage/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</parent>
1212

1313
<artifactId>codecoverage</artifactId>
14-
<packaging>takari-jar</packaging>
14+
<packaging>jar</packaging>
1515

1616
<properties>
1717
</properties>

‎runtime/opentelemetry/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</parent>
1212

1313
<artifactId>opentelemetry</artifactId>
14-
<packaging>takari-jar</packaging>
14+
<packaging>jar</packaging>
1515

1616
<properties>
1717
<opentelemetry.version>1.43.0</opentelemetry.version>

‎tasks/akeyless/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111

1212
<artifactId>akeyless-task</artifactId>
13-
<packaging>takari-jar</packaging>
13+
<packaging>jar</packaging>
1414

1515
<properties>
1616
<maven.compiler.source>${java.version}</maven.compiler.source>

‎tasks/argocd/pom.xml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<relativePath>../../pom.xml</relativePath>
1010
</parent>
1111
<artifactId>argocd-task</artifactId>
12-
<packaging>takari-jar</packaging>
12+
<packaging>jar</packaging>
1313
<properties>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515

@@ -203,13 +203,6 @@
203203
</testResources>
204204

205205
<plugins>
206-
<plugin>
207-
<groupId>io.takari.maven.plugins</groupId>
208-
<artifactId>takari-lifecycle-plugin</artifactId>
209-
<configuration>
210-
<proc>proc</proc>
211-
</configuration>
212-
</plugin>
213206
<plugin>
214207
<groupId>dev.ybrig.concord</groupId>
215208
<artifactId>concord-maven-plugin</artifactId>

‎tasks/aws/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111

1212
<artifactId>aws-tasks</artifactId>
13-
<packaging>takari-jar</packaging>
13+
<packaging>jar</packaging>
1414

1515
<properties>
1616
<aws.sdk.version>2.26.4</aws.sdk.version>

‎tasks/confluence/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111

1212
<artifactId>confluence-task</artifactId>
13-
<packaging>takari-jar</packaging>
13+
<packaging>jar</packaging>
1414

1515
<dependencies>
1616
<dependency>

‎tasks/git/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</parent>
1212

1313
<artifactId>git</artifactId>
14-
<packaging>takari-jar</packaging>
14+
<packaging>jar</packaging>
1515

1616
<properties>
1717
<jgit.version>6.5.0.202303070854-r</jgit.version>

‎tasks/gremlin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111

1212
<artifactId>gremlin-task</artifactId>
13-
<packaging>takari-jar</packaging>
13+
<packaging>jar</packaging>
1414

1515
<build>
1616
<resources>

‎tasks/hashivault/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<artifactId>hashivault-task</artifactId>
1313

14-
<packaging>takari-jar</packaging>
14+
<packaging>jar</packaging>
1515

1616
<properties>
1717
<okhttp.version>3.11.0</okhttp.version>

0 commit comments

Comments
 (0)