Skip to content

Commit 58a0988

Browse files
wendigowendigo
committed
Update takari to 54
Reformat files using spotless:format to conform with the checks
1 parent 8cbacca commit 58a0988

File tree

5 files changed

+263
-323
lines changed

5 files changed

+263
-323
lines changed

‎pom.xml

+141-142
Original file line numberDiff line numberDiff line change
@@ -1,146 +1,145 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<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/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
5-
<parent>
6-
<groupId>io.takari</groupId>
7-
<artifactId>takari</artifactId>
8-
<version>52</version>
9-
</parent>
10-
11-
<groupId>io.trino</groupId>
12-
<artifactId>trino-maven-plugin</artifactId>
13-
<version>15-SNAPSHOT</version>
14-
<packaging>takari-maven-plugin</packaging>
15-
16-
<name>Trino Maven Build Extension</name>
17-
<description>The Trino Maven Plugin provides a packing and lifecycle for Trino plugins</description>
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>io.takari</groupId>
7+
<artifactId>takari</artifactId>
8+
<version>54</version>
9+
</parent>
10+
11+
<groupId>io.trino</groupId>
12+
<artifactId>trino-maven-plugin</artifactId>
13+
<version>15-SNAPSHOT</version>
14+
<packaging>takari-maven-plugin</packaging>
15+
16+
<name>Trino Maven Build Extension</name>
17+
<description>The Trino Maven Plugin provides a packing and lifecycle for Trino plugins</description>
18+
<url>https://github.com/trinodb/trino-maven-plugin</url>
19+
20+
<prerequisites>
21+
<maven>[3.6.3,)</maven>
22+
</prerequisites>
23+
24+
<scm>
25+
<connection>scm:git:git://github.com/trinodb/trino-maven-plugin.git</connection>
26+
<tag>HEAD</tag>
1827
<url>https://github.com/trinodb/trino-maven-plugin</url>
19-
20-
<scm>
21-
<connection>scm:git:git://github.com/trinodb/trino-maven-plugin.git</connection>
22-
<url>https://github.com/trinodb/trino-maven-plugin</url>
23-
<tag>HEAD</tag>
24-
</scm>
25-
26-
<properties>
27-
<mavenVersion>3.9.6</mavenVersion>
28-
<mavenPluginPluginVersion>3.11.0</mavenPluginPluginVersion>
29-
<provisioVersion>1.0.25</provisioVersion>
30-
<takari.javaSourceVersion>11</takari.javaSourceVersion>
31-
32-
<!-- declare language version for IntelliJ IDEA -->
33-
<maven.compiler.source>${takari.javaSourceVersion}</maven.compiler.source>
34-
<maven.compiler.target>${takari.javaSourceVersion}</maven.compiler.target>
35-
</properties>
36-
37-
<prerequisites>
38-
<maven>[3.6.3,)</maven>
39-
</prerequisites>
40-
41-
<dependencies>
42-
<dependency>
43-
<groupId>org.apache.maven</groupId>
44-
<artifactId>maven-plugin-api</artifactId>
45-
<version>${mavenVersion}</version>
46-
<scope>provided</scope>
47-
</dependency>
48-
<dependency>
49-
<groupId>org.apache.maven.plugin-tools</groupId>
50-
<artifactId>maven-plugin-annotations</artifactId>
51-
<version>${mavenPluginPluginVersion}</version>
52-
<scope>provided</scope>
53-
</dependency>
54-
<dependency>
55-
<groupId>org.apache.maven</groupId>
56-
<artifactId>maven-core</artifactId>
57-
<version>${mavenVersion}</version>
58-
<scope>provided</scope>
59-
</dependency>
60-
<dependency>
61-
<groupId>org.apache.maven</groupId>
62-
<artifactId>maven-artifact</artifactId>
63-
<version>${mavenVersion}</version>
64-
<scope>provided</scope>
65-
</dependency>
66-
67-
<dependency>
68-
<groupId>org.apache.maven.resolver</groupId>
69-
<artifactId>maven-resolver-api</artifactId>
70-
<version>1.9.18</version>
71-
<scope>provided</scope>
72-
</dependency>
73-
74-
<dependency>
75-
<groupId>org.codehaus.plexus</groupId>
76-
<artifactId>plexus-utils</artifactId>
77-
<version>3.5.1</version>
78-
</dependency>
79-
80-
<!-- for testing -->
81-
<dependency>
82-
<groupId>io.takari.maven.plugins</groupId>
83-
<artifactId>takari-plugin-testing</artifactId>
84-
<version>3.0.1</version>
85-
<scope>test</scope>
86-
</dependency>
87-
88-
<dependency>
89-
<groupId>io.takari.maven.plugins</groupId>
90-
<artifactId>takari-plugin-integration-testing</artifactId>
91-
<version>3.0.1</version>
92-
<type>pom</type>
93-
<scope>test</scope>
94-
</dependency>
95-
96-
<dependency>
97-
<groupId>junit</groupId>
98-
<artifactId>junit</artifactId>
99-
<version>4.13.2</version>
100-
<scope>test</scope>
101-
</dependency>
102-
103-
<dependency>
104-
<groupId>org.assertj</groupId>
105-
<artifactId>assertj-core</artifactId>
106-
<version>3.15.0</version>
107-
<scope>test</scope>
108-
</dependency>
109-
</dependencies>
110-
111-
<build>
112-
<resources>
113-
<resource>
114-
<directory>src/main/resources</directory>
115-
</resource>
116-
<resource>
117-
<directory>src/main/resources-filtered</directory>
118-
<filtering>true</filtering>
119-
</resource>
120-
</resources>
121-
122-
<plugins>
123-
<plugin>
124-
<groupId>org.apache.maven.plugins</groupId>
125-
<artifactId>maven-enforcer-plugin</artifactId>
126-
<executions>
127-
<execution>
128-
<goals>
129-
<goal>enforce</goal>
130-
</goals>
131-
<configuration>
132-
<rules>
133-
<requireJavaVersion>
134-
<version>${takari.javaSourceVersion}</version>
135-
</requireJavaVersion>
136-
<requireMavenVersion>
137-
<version>${mavenVersion}</version>
138-
</requireMavenVersion>
139-
</rules>
140-
</configuration>
141-
</execution>
142-
</executions>
143-
</plugin>
144-
</plugins>
145-
</build>
28+
</scm>
29+
30+
<properties>
31+
<mavenVersion>3.9.6</mavenVersion>
32+
<mavenPluginPluginVersion>3.13.0</mavenPluginPluginVersion>
33+
<provisioVersion>1.0.25</provisioVersion>
34+
<takari.javaSourceVersion>11</takari.javaSourceVersion>
35+
<!-- declare language version for IntelliJ IDEA -->
36+
<maven.compiler.source>${takari.javaSourceVersion}</maven.compiler.source>
37+
<maven.compiler.target>${takari.javaSourceVersion}</maven.compiler.target>
38+
</properties>
39+
40+
<dependencies>
41+
<dependency>
42+
<groupId>org.apache.maven</groupId>
43+
<artifactId>maven-plugin-api</artifactId>
44+
<version>${mavenVersion}</version>
45+
<scope>provided</scope>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.apache.maven.plugin-tools</groupId>
49+
<artifactId>maven-plugin-annotations</artifactId>
50+
<version>${mavenPluginPluginVersion}</version>
51+
<scope>provided</scope>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.apache.maven</groupId>
55+
<artifactId>maven-core</artifactId>
56+
<version>${mavenVersion}</version>
57+
<scope>provided</scope>
58+
</dependency>
59+
<dependency>
60+
<groupId>org.apache.maven</groupId>
61+
<artifactId>maven-artifact</artifactId>
62+
<version>${mavenVersion}</version>
63+
<scope>provided</scope>
64+
</dependency>
65+
66+
<dependency>
67+
<groupId>org.apache.maven.resolver</groupId>
68+
<artifactId>maven-resolver-api</artifactId>
69+
<version>1.9.18</version>
70+
<scope>provided</scope>
71+
</dependency>
72+
73+
<dependency>
74+
<groupId>org.codehaus.plexus</groupId>
75+
<artifactId>plexus-utils</artifactId>
76+
<version>3.5.1</version>
77+
</dependency>
78+
79+
<!-- for testing -->
80+
<dependency>
81+
<groupId>io.takari.maven.plugins</groupId>
82+
<artifactId>takari-plugin-testing</artifactId>
83+
<version>3.0.1</version>
84+
<scope>test</scope>
85+
</dependency>
86+
87+
<dependency>
88+
<groupId>io.takari.maven.plugins</groupId>
89+
<artifactId>takari-plugin-integration-testing</artifactId>
90+
<version>3.0.1</version>
91+
<type>pom</type>
92+
<scope>test</scope>
93+
</dependency>
94+
95+
<dependency>
96+
<groupId>junit</groupId>
97+
<artifactId>junit</artifactId>
98+
<version>4.13.2</version>
99+
<scope>test</scope>
100+
</dependency>
101+
102+
<dependency>
103+
<groupId>org.assertj</groupId>
104+
<artifactId>assertj-core</artifactId>
105+
<version>3.15.0</version>
106+
<scope>test</scope>
107+
</dependency>
108+
</dependencies>
109+
110+
<build>
111+
<resources>
112+
<resource>
113+
<directory>src/main/resources</directory>
114+
</resource>
115+
<resource>
116+
<filtering>true</filtering>
117+
<directory>src/main/resources-filtered</directory>
118+
</resource>
119+
</resources>
120+
121+
<plugins>
122+
<plugin>
123+
<groupId>org.apache.maven.plugins</groupId>
124+
<artifactId>maven-enforcer-plugin</artifactId>
125+
<executions>
126+
<execution>
127+
<goals>
128+
<goal>enforce</goal>
129+
</goals>
130+
<configuration>
131+
<rules>
132+
<requireJavaVersion>
133+
<version>${takari.javaSourceVersion}</version>
134+
</requireJavaVersion>
135+
<requireMavenVersion>
136+
<version>${mavenVersion}</version>
137+
</requireMavenVersion>
138+
</rules>
139+
</configuration>
140+
</execution>
141+
</executions>
142+
</plugin>
143+
</plugins>
144+
</build>
146145
</project>

0 commit comments

Comments
 (0)