Skip to content

Commit 767b81e

Browse files
nineinchnickelectrum
nineinchnick
authored and
electrum
committed
Finish renaming to Trino
1 parent aa1b5bd commit 767b81e

File tree

22 files changed

+46
-92
lines changed

22 files changed

+46
-92
lines changed

‎CONTRIBUTING.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# Contributing to Presto
1+
# Contributing to Trino
22

33
## Contributor License Agreement ("CLA")
44

5-
In order to accept your pull request, we need you to [submit a CLA](https://github.com/prestosql/cla).
5+
In order to accept your pull request, we need you to [submit a CLA](https://github.com/trinodb/cla).
66

77
## License
88

9-
By contributing to Presto, you agree that your contributions will be licensed under the [Apache License Version 2.0 (APLv2)](LICENSE).
9+
By contributing to Trino, you agree that your contributions will be licensed under the [Apache License Version 2.0 (APLv2)](LICENSE).

‎src/test/java/io/trino/maven/CheckerIntegrationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void testInvalidMissingProvided()
109109
File basedir = resources.getBasedir("invalid-missing");
110110
maven.forProject(basedir)
111111
.execute("verify")
112-
.assertLogText("[ERROR] Trino plugin dependency io.airlift:units must have scope 'provided'.");
112+
.assertLogText("[ERROR] Trino plugin dependency io.airlift:slice must have scope 'provided'.");
113113
}
114114

115115
@Test

‎src/test/java/io/trino/maven/GeneratorIntegrationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
@SuppressWarnings({"JUnitTestNG", "PublicField"})
2929
public class GeneratorIntegrationTest
3030
{
31-
private static final String DESCRIPTOR = "META-INF/services/io.prestosql.spi.Plugin";
31+
private static final String DESCRIPTOR = "META-INF/services/io.trino.spi.Plugin";
3232

3333
@Rule
3434
public final TestResources resources = new TestResources();

‎src/test/projects/abstract-plugin-class/pom.xml

+3-9
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
<dependencies>
1515
<dependency>
16-
<groupId>io.prestosql</groupId>
17-
<artifactId>presto-spi</artifactId>
18-
<version>300</version>
16+
<groupId>io.trino</groupId>
17+
<artifactId>trino-spi</artifactId>
18+
<version>351</version>
1919
<scope>provided</scope>
2020
</dependency>
2121
</dependencies>
@@ -27,12 +27,6 @@
2727
<artifactId>trino-maven-plugin</artifactId>
2828
<version>${it-plugin.version}</version>
2929
<extensions>true</extensions>
30-
<configuration>
31-
<!-- TODO: remove after trino-spi is released -->
32-
<pluginClassName>io.prestosql.spi.Plugin</pluginClassName>
33-
<spiGroupId>io.prestosql</spiGroupId>
34-
<spiArtifactId>presto-spi</spiArtifactId>
35-
</configuration>
3630
</plugin>
3731
</plugins>
3832
</build>

‎src/test/projects/abstract-plugin-class/src/main/java/its/AbstractPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package its;
22

3-
import io.prestosql.spi.Plugin;
3+
import io.trino.spi.Plugin;
44

55
public abstract class AbstractPlugin
66
implements Plugin

‎src/test/projects/abstract-plugin-class/src/main/java/its/TestPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package its;
22

3-
import io.prestosql.spi.Plugin;
3+
import io.trino.spi.Plugin;
44

55
public class TestPlugin
66
extends AbstractPlugin

‎src/test/projects/basic/pom.xml

+3-9
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
<dependencies>
1515
<dependency>
16-
<groupId>io.prestosql</groupId>
17-
<artifactId>presto-spi</artifactId>
18-
<version>300</version>
16+
<groupId>io.trino</groupId>
17+
<artifactId>trino-spi</artifactId>
18+
<version>351</version>
1919
<scope>provided</scope>
2020
</dependency>
2121
</dependencies>
@@ -27,12 +27,6 @@
2727
<artifactId>trino-maven-plugin</artifactId>
2828
<version>${it-plugin.version}</version>
2929
<extensions>true</extensions>
30-
<configuration>
31-
<!-- TODO: remove after trino-spi is released -->
32-
<pluginClassName>io.prestosql.spi.Plugin</pluginClassName>
33-
<spiGroupId>io.prestosql</spiGroupId>
34-
<spiArtifactId>presto-spi</spiArtifactId>
35-
</configuration>
3630
</plugin>
3731
</plugins>
3832
</build>

‎src/test/projects/basic/src/main/java/its/BasicPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package its;
22

3-
import io.prestosql.spi.Plugin;
3+
import io.trino.spi.Plugin;
44

55
public class BasicPlugin
66
implements Plugin

‎src/test/projects/excluded-extra/pom.xml

+3-7
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
</dependency>
2222

2323
<dependency>
24-
<groupId>io.prestosql</groupId>
25-
<artifactId>presto-spi</artifactId>
26-
<version>300</version>
24+
<groupId>io.trino</groupId>
25+
<artifactId>trino-spi</artifactId>
26+
<version>351</version>
2727
<scope>provided</scope>
2828
</dependency>
2929
</dependencies>
@@ -39,10 +39,6 @@
3939
<allowedProvidedDependencies>
4040
<allowedProvidedDependency>com.google.guava:guava</allowedProvidedDependency>
4141
</allowedProvidedDependencies>
42-
<!-- TODO: remove after trino-spi is released -->
43-
<pluginClassName>io.prestosql.spi.Plugin</pluginClassName>
44-
<spiGroupId>io.prestosql</spiGroupId>
45-
<spiArtifactId>presto-spi</spiArtifactId>
4642
</configuration>
4743
</plugin>
4844
</plugins>

‎src/test/projects/excluded-extra/src/main/java/its/ValidPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package its;
22

3-
import io.prestosql.spi.Plugin;
3+
import io.trino.spi.Plugin;
44

55
public class ValidPlugin
66
implements Plugin

‎src/test/projects/interface-plugin-class/pom.xml

+3-9
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
<dependencies>
1515
<dependency>
16-
<groupId>io.prestosql</groupId>
17-
<artifactId>presto-spi</artifactId>
18-
<version>300</version>
16+
<groupId>io.trino</groupId>
17+
<artifactId>trino-spi</artifactId>
18+
<version>351</version>
1919
<scope>provided</scope>
2020
</dependency>
2121
</dependencies>
@@ -27,12 +27,6 @@
2727
<artifactId>trino-maven-plugin</artifactId>
2828
<version>${it-plugin.version}</version>
2929
<extensions>true</extensions>
30-
<configuration>
31-
<!-- TODO: remove after trino-spi is released -->
32-
<pluginClassName>io.prestosql.spi.Plugin</pluginClassName>
33-
<spiGroupId>io.prestosql</spiGroupId>
34-
<spiArtifactId>presto-spi</spiArtifactId>
35-
</configuration>
3630
</plugin>
3731
</plugins>
3832
</build>

‎src/test/projects/interface-plugin-class/src/main/java/its/MyPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package its;
22

3-
import io.prestosql.spi.Plugin;
3+
import io.trino.spi.Plugin;
44

55
public interface MyPlugin
66
extends Plugin {}

‎src/test/projects/invalid-and-excluded-extra/pom.xml

+3-7
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
</dependency>
3030

3131
<dependency>
32-
<groupId>io.prestosql</groupId>
33-
<artifactId>presto-spi</artifactId>
34-
<version>300</version>
32+
<groupId>io.trino</groupId>
33+
<artifactId>trino-spi</artifactId>
34+
<version>351</version>
3535
<scope>provided</scope>
3636
</dependency>
3737
</dependencies>
@@ -47,10 +47,6 @@
4747
<allowedProvidedDependencies>
4848
<allowedProvidedDependency>com.google.guava:guava</allowedProvidedDependency>
4949
</allowedProvidedDependencies>
50-
<!-- TODO: remove after trino-spi is released -->
51-
<pluginClassName>io.prestosql.spi.Plugin</pluginClassName>
52-
<spiGroupId>io.prestosql</spiGroupId>
53-
<spiArtifactId>presto-spi</spiArtifactId>
5450
</configuration>
5551
</plugin>
5652
</plugins>

‎src/test/projects/invalid-and-excluded-extra/src/main/java/its/InvalidPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package its;
22

3-
import io.prestosql.spi.Plugin;
3+
import io.trino.spi.Plugin;
44

55
public class InvalidPlugin
66
implements Plugin

‎src/test/projects/invalid-extra/pom.xml

+4-10
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>io.prestosql.maven.its</groupId>
5+
<groupId>io.trino.maven.its</groupId>
66
<artifactId>invalid-extra</artifactId>
77
<version>1.0</version>
88
<packaging>trino-plugin</packaging>
@@ -21,9 +21,9 @@
2121
</dependency>
2222

2323
<dependency>
24-
<groupId>io.prestosql</groupId>
25-
<artifactId>presto-spi</artifactId>
26-
<version>300</version>
24+
<groupId>io.trino</groupId>
25+
<artifactId>trino-spi</artifactId>
26+
<version>351</version>
2727
<scope>provided</scope>
2828
</dependency>
2929
</dependencies>
@@ -35,12 +35,6 @@
3535
<artifactId>trino-maven-plugin</artifactId>
3636
<version>${it-plugin.version}</version>
3737
<extensions>true</extensions>
38-
<configuration>
39-
<!-- TODO: remove after trino-spi is released -->
40-
<pluginClassName>io.prestosql.spi.Plugin</pluginClassName>
41-
<spiGroupId>io.prestosql</spiGroupId>
42-
<spiArtifactId>presto-spi</spiArtifactId>
43-
</configuration>
4438
</plugin>
4539
</plugins>
4640
</build>

‎src/test/projects/invalid-extra/src/main/java/its/InvalidPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package its;
22

3-
import io.prestosql.spi.Plugin;
3+
import io.trino.spi.Plugin;
44

55
public class InvalidPlugin
66
implements Plugin

‎src/test/projects/invalid-missing/pom.xml

+6-12
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
</properties>
1313

1414
<dependencies>
15-
<!-- this dependency will bring in 'units' transitively -->
15+
<!-- this dependency will bring in 'slice' transitively -->
1616
<dependency>
1717
<groupId>io.airlift</groupId>
18-
<artifactId>concurrent</artifactId>
19-
<version>0.178</version>
18+
<artifactId>stats</artifactId>
19+
<version>205</version>
2020
</dependency>
2121

2222
<dependency>
23-
<groupId>io.prestosql</groupId>
24-
<artifactId>presto-spi</artifactId>
25-
<version>300</version>
23+
<groupId>io.trino</groupId>
24+
<artifactId>trino-spi</artifactId>
25+
<version>351</version>
2626
<scope>provided</scope>
2727
</dependency>
2828

@@ -41,12 +41,6 @@
4141
<artifactId>trino-maven-plugin</artifactId>
4242
<version>${it-plugin.version}</version>
4343
<extensions>true</extensions>
44-
<configuration>
45-
<!-- TODO: remove after trino-spi is released -->
46-
<pluginClassName>io.prestosql.spi.Plugin</pluginClassName>
47-
<spiGroupId>io.prestosql</spiGroupId>
48-
<spiArtifactId>presto-spi</spiArtifactId>
49-
</configuration>
5044
</plugin>
5145
</plugins>
5246
</build>

‎src/test/projects/invalid-missing/src/main/java/its/InvalidPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package its;
22

3-
import io.prestosql.spi.Plugin;
3+
import io.trino.spi.Plugin;
44

55
public class InvalidPlugin
66
implements Plugin

‎src/test/projects/invalid-skipped/pom.xml

+3-7
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
</dependency>
2222

2323
<dependency>
24-
<groupId>io.prestosql</groupId>
25-
<artifactId>presto-spi</artifactId>
26-
<version>300</version>
24+
<groupId>io.trino</groupId>
25+
<artifactId>trino-spi</artifactId>
26+
<version>351</version>
2727
<scope>provided</scope>
2828
</dependency>
2929
</dependencies>
@@ -37,10 +37,6 @@
3737
<extensions>true</extensions>
3838
<configuration>
3939
<skipCheckSpiDependencies>true</skipCheckSpiDependencies>
40-
<!-- TODO: remove after trino-spi is released -->
41-
<pluginClassName>io.prestosql.spi.Plugin</pluginClassName>
42-
<spiGroupId>io.prestosql</spiGroupId>
43-
<spiArtifactId>presto-spi</spiArtifactId>
4440
</configuration>
4541
</plugin>
4642
</plugins>

‎src/test/projects/invalid-skipped/src/main/java/its/InvalidPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package its;
22

3-
import io.prestosql.spi.Plugin;
3+
import io.trino.spi.Plugin;
44

55
public class InvalidPlugin
66
implements Plugin

‎src/test/projects/two-excluded-extra/pom.xml

+3-7
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
</dependency>
3030

3131
<dependency>
32-
<groupId>io.prestosql</groupId>
33-
<artifactId>presto-spi</artifactId>
34-
<version>300</version>
32+
<groupId>io.trino</groupId>
33+
<artifactId>trino-spi</artifactId>
34+
<version>351</version>
3535
<scope>provided</scope>
3636
</dependency>
3737
</dependencies>
@@ -48,10 +48,6 @@
4848
<allowedProvidedDependency>com.google.guava:guava</allowedProvidedDependency>
4949
<allowedProvidedDependency>org.scala-lang:scala-library</allowedProvidedDependency>
5050
</allowedProvidedDependencies>
51-
<!-- TODO: remove after trino-spi is released -->
52-
<pluginClassName>io.prestosql.spi.Plugin</pluginClassName>
53-
<spiGroupId>io.prestosql</spiGroupId>
54-
<spiArtifactId>presto-spi</spiArtifactId>
5551
</configuration>
5652
</plugin>
5753
</plugins>

‎src/test/projects/two-excluded-extra/src/main/java/its/ValidPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package its;
22

3-
import io.prestosql.spi.Plugin;
3+
import io.trino.spi.Plugin;
44

55
public class ValidPlugin
66
implements Plugin

0 commit comments

Comments
 (0)