Finish renaming to Trino

trinodb · May 17, 2021 · 767b81e · 767b81e
1 parent aa1b5bd
commit 767b81e
Show file tree

Hide file tree

Showing 22 changed files with 46 additions and 92 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,9 +1,9 @@
-# Contributing to Presto
+# Contributing to Trino
 
 ## Contributor License Agreement ("CLA")
 
-In order to accept your pull request, we need you to [submit a CLA](https://github.com/prestosql/cla).
+In order to accept your pull request, we need you to [submit a CLA](https://github.com/trinodb/cla).
 
 ## License
 
-By contributing to Presto, you agree that your contributions will be licensed under the [Apache License Version 2.0 (APLv2)](LICENSE).
+By contributing to Trino, you agree that your contributions will be licensed under the [Apache License Version 2.0 (APLv2)](LICENSE).
diff --git a/src/test/java/io/trino/maven/CheckerIntegrationTest.java b/src/test/java/io/trino/maven/CheckerIntegrationTest.java
@@ -109,7 +109,7 @@ public void testInvalidMissingProvided()
         File basedir = resources.getBasedir("invalid-missing");
         maven.forProject(basedir)
                 .execute("verify")
-                .assertLogText("[ERROR] Trino plugin dependency io.airlift:units must have scope 'provided'.");
+                .assertLogText("[ERROR] Trino plugin dependency io.airlift:slice must have scope 'provided'.");
     }
 
     @Test

diff --git a/src/test/java/io/trino/maven/GeneratorIntegrationTest.java b/src/test/java/io/trino/maven/GeneratorIntegrationTest.java
@@ -28,7 +28,7 @@
 @SuppressWarnings({"JUnitTestNG", "PublicField"})
 public class GeneratorIntegrationTest
 {
-    private static final String DESCRIPTOR = "META-INF/services/io.prestosql.spi.Plugin";
+    private static final String DESCRIPTOR = "META-INF/services/io.trino.spi.Plugin";
 
     @Rule
     public final TestResources resources = new TestResources();

diff --git a/src/test/projects/abstract-plugin-class/pom.xml b/src/test/projects/abstract-plugin-class/pom.xml
@@ -13,9 +13,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.prestosql</groupId>
-            <artifactId>presto-spi</artifactId>
-            <version>300</version>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <version>351</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -27,12 +27,6 @@
                 <artifactId>trino-maven-plugin</artifactId>
                 <version>${it-plugin.version}</version>
                 <extensions>true</extensions>
-                <configuration>
-                    <!-- TODO: remove after trino-spi is released -->
-                    <pluginClassName>io.prestosql.spi.Plugin</pluginClassName>
-                    <spiGroupId>io.prestosql</spiGroupId>
-                    <spiArtifactId>presto-spi</spiArtifactId>
-                </configuration>
             </plugin>
         </plugins>
     </build>

diff --git a/src/test/projects/abstract-plugin-class/src/main/java/its/AbstractPlugin.java b/src/test/projects/abstract-plugin-class/src/main/java/its/AbstractPlugin.java
@@ -1,6 +1,6 @@
 package its;
 
-import io.prestosql.spi.Plugin;
+import io.trino.spi.Plugin;
 
 public abstract class AbstractPlugin
         implements Plugin

diff --git a/src/test/projects/abstract-plugin-class/src/main/java/its/TestPlugin.java b/src/test/projects/abstract-plugin-class/src/main/java/its/TestPlugin.java
@@ -1,6 +1,6 @@
 package its;
 
-import io.prestosql.spi.Plugin;
+import io.trino.spi.Plugin;
 
 public class TestPlugin
         extends AbstractPlugin

diff --git a/src/test/projects/basic/pom.xml b/src/test/projects/basic/pom.xml
@@ -13,9 +13,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.prestosql</groupId>
-            <artifactId>presto-spi</artifactId>
-            <version>300</version>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <version>351</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -27,12 +27,6 @@
                 <artifactId>trino-maven-plugin</artifactId>
                 <version>${it-plugin.version}</version>
                 <extensions>true</extensions>
-                <configuration>
-                    <!-- TODO: remove after trino-spi is released -->
-                    <pluginClassName>io.prestosql.spi.Plugin</pluginClassName>
-                    <spiGroupId>io.prestosql</spiGroupId>
-                    <spiArtifactId>presto-spi</spiArtifactId>
-                </configuration>
             </plugin>
         </plugins>
     </build>

diff --git a/src/test/projects/basic/src/main/java/its/BasicPlugin.java b/src/test/projects/basic/src/main/java/its/BasicPlugin.java
@@ -1,6 +1,6 @@
 package its;
 
-import io.prestosql.spi.Plugin;
+import io.trino.spi.Plugin;
 
 public class BasicPlugin
         implements Plugin

diff --git a/src/test/projects/excluded-extra/pom.xml b/src/test/projects/excluded-extra/pom.xml
@@ -21,9 +21,9 @@
         </dependency>
 
         <dependency>
-            <groupId>io.prestosql</groupId>
-            <artifactId>presto-spi</artifactId>
-            <version>300</version>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <version>351</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -39,10 +39,6 @@
                     <allowedProvidedDependencies>
                         <allowedProvidedDependency>com.google.guava:guava</allowedProvidedDependency>
                     </allowedProvidedDependencies>
-                    <!-- TODO: remove after trino-spi is released -->
-                    <pluginClassName>io.prestosql.spi.Plugin</pluginClassName>
-                    <spiGroupId>io.prestosql</spiGroupId>
-                    <spiArtifactId>presto-spi</spiArtifactId>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/test/projects/excluded-extra/src/main/java/its/ValidPlugin.java b/src/test/projects/excluded-extra/src/main/java/its/ValidPlugin.java
@@ -1,6 +1,6 @@
 package its;
 
-import io.prestosql.spi.Plugin;
+import io.trino.spi.Plugin;
 
 public class ValidPlugin
         implements Plugin

diff --git a/src/test/projects/interface-plugin-class/pom.xml b/src/test/projects/interface-plugin-class/pom.xml
@@ -13,9 +13,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.prestosql</groupId>
-            <artifactId>presto-spi</artifactId>
-            <version>300</version>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <version>351</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -27,12 +27,6 @@
                 <artifactId>trino-maven-plugin</artifactId>
                 <version>${it-plugin.version}</version>
                 <extensions>true</extensions>
-                <configuration>
-                    <!-- TODO: remove after trino-spi is released -->
-                    <pluginClassName>io.prestosql.spi.Plugin</pluginClassName>
-                    <spiGroupId>io.prestosql</spiGroupId>
-                    <spiArtifactId>presto-spi</spiArtifactId>
-                </configuration>
             </plugin>
         </plugins>
     </build>

diff --git a/src/test/projects/interface-plugin-class/src/main/java/its/MyPlugin.java b/src/test/projects/interface-plugin-class/src/main/java/its/MyPlugin.java
@@ -1,6 +1,6 @@
 package its;
 
-import io.prestosql.spi.Plugin;
+import io.trino.spi.Plugin;
 
 public interface MyPlugin
         extends Plugin {}
diff --git a/src/test/projects/invalid-and-excluded-extra/pom.xml b/src/test/projects/invalid-and-excluded-extra/pom.xml
@@ -29,9 +29,9 @@
         </dependency>
 
         <dependency>
-            <groupId>io.prestosql</groupId>
-            <artifactId>presto-spi</artifactId>
-            <version>300</version>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <version>351</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -47,10 +47,6 @@
                     <allowedProvidedDependencies>
                         <allowedProvidedDependency>com.google.guava:guava</allowedProvidedDependency>
                     </allowedProvidedDependencies>
-                    <!-- TODO: remove after trino-spi is released -->
-                    <pluginClassName>io.prestosql.spi.Plugin</pluginClassName>
-                    <spiGroupId>io.prestosql</spiGroupId>
-                    <spiArtifactId>presto-spi</spiArtifactId>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/test/projects/invalid-and-excluded-extra/src/main/java/its/InvalidPlugin.java b/src/test/projects/invalid-and-excluded-extra/src/main/java/its/InvalidPlugin.java
@@ -1,6 +1,6 @@
 package its;
 
-import io.prestosql.spi.Plugin;
+import io.trino.spi.Plugin;
 
 public class InvalidPlugin
         implements Plugin

diff --git a/src/test/projects/invalid-extra/pom.xml b/src/test/projects/invalid-extra/pom.xml
@@ -2,7 +2,7 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>io.prestosql.maven.its</groupId>
+    <groupId>io.trino.maven.its</groupId>
     <artifactId>invalid-extra</artifactId>
     <version>1.0</version>
     <packaging>trino-plugin</packaging>
@@ -21,9 +21,9 @@
         </dependency>
 
         <dependency>
-            <groupId>io.prestosql</groupId>
-            <artifactId>presto-spi</artifactId>
-            <version>300</version>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <version>351</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -35,12 +35,6 @@
                 <artifactId>trino-maven-plugin</artifactId>
                 <version>${it-plugin.version}</version>
                 <extensions>true</extensions>
-                <configuration>
-                    <!-- TODO: remove after trino-spi is released -->
-                    <pluginClassName>io.prestosql.spi.Plugin</pluginClassName>
-                    <spiGroupId>io.prestosql</spiGroupId>
-                    <spiArtifactId>presto-spi</spiArtifactId>
-                </configuration>
             </plugin>
         </plugins>
     </build>

diff --git a/src/test/projects/invalid-extra/src/main/java/its/InvalidPlugin.java b/src/test/projects/invalid-extra/src/main/java/its/InvalidPlugin.java
@@ -1,6 +1,6 @@
 package its;
 
-import io.prestosql.spi.Plugin;
+import io.trino.spi.Plugin;
 
 public class InvalidPlugin
         implements Plugin

diff --git a/src/test/projects/invalid-missing/pom.xml b/src/test/projects/invalid-missing/pom.xml
@@ -12,17 +12,17 @@
     </properties>
 
     <dependencies>
-        <!-- this dependency will bring in 'units' transitively -->
+        <!-- this dependency will bring in 'slice' transitively -->
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>concurrent</artifactId>
-            <version>0.178</version>
+            <artifactId>stats</artifactId>
+            <version>205</version>
         </dependency>
 
         <dependency>
-            <groupId>io.prestosql</groupId>
-            <artifactId>presto-spi</artifactId>
-            <version>300</version>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <version>351</version>
             <scope>provided</scope>
         </dependency>
 
@@ -41,12 +41,6 @@
                 <artifactId>trino-maven-plugin</artifactId>
                 <version>${it-plugin.version}</version>
                 <extensions>true</extensions>
-                <configuration>
-                    <!-- TODO: remove after trino-spi is released -->
-                    <pluginClassName>io.prestosql.spi.Plugin</pluginClassName>
-                    <spiGroupId>io.prestosql</spiGroupId>
-                    <spiArtifactId>presto-spi</spiArtifactId>
-                </configuration>
             </plugin>
         </plugins>
     </build>

diff --git a/src/test/projects/invalid-missing/src/main/java/its/InvalidPlugin.java b/src/test/projects/invalid-missing/src/main/java/its/InvalidPlugin.java
@@ -1,6 +1,6 @@
 package its;
 
-import io.prestosql.spi.Plugin;
+import io.trino.spi.Plugin;
 
 public class InvalidPlugin
         implements Plugin

diff --git a/src/test/projects/invalid-skipped/pom.xml b/src/test/projects/invalid-skipped/pom.xml
@@ -21,9 +21,9 @@
         </dependency>
 
         <dependency>
-            <groupId>io.prestosql</groupId>
-            <artifactId>presto-spi</artifactId>
-            <version>300</version>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <version>351</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -37,10 +37,6 @@
                 <extensions>true</extensions>
                 <configuration>
                     <skipCheckSpiDependencies>true</skipCheckSpiDependencies>
-                    <!-- TODO: remove after trino-spi is released -->
-                    <pluginClassName>io.prestosql.spi.Plugin</pluginClassName>
-                    <spiGroupId>io.prestosql</spiGroupId>
-                    <spiArtifactId>presto-spi</spiArtifactId>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/test/projects/invalid-skipped/src/main/java/its/InvalidPlugin.java b/src/test/projects/invalid-skipped/src/main/java/its/InvalidPlugin.java
@@ -1,6 +1,6 @@
 package its;
 
-import io.prestosql.spi.Plugin;
+import io.trino.spi.Plugin;
 
 public class InvalidPlugin
         implements Plugin

diff --git a/src/test/projects/two-excluded-extra/pom.xml b/src/test/projects/two-excluded-extra/pom.xml
@@ -29,9 +29,9 @@
         </dependency>
 
         <dependency>
-            <groupId>io.prestosql</groupId>
-            <artifactId>presto-spi</artifactId>
-            <version>300</version>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <version>351</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -48,10 +48,6 @@
                         <allowedProvidedDependency>com.google.guava:guava</allowedProvidedDependency>
                         <allowedProvidedDependency>org.scala-lang:scala-library</allowedProvidedDependency>
                     </allowedProvidedDependencies>
-                    <!-- TODO: remove after trino-spi is released -->
-                    <pluginClassName>io.prestosql.spi.Plugin</pluginClassName>
-                    <spiGroupId>io.prestosql</spiGroupId>
-                    <spiArtifactId>presto-spi</spiArtifactId>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/test/projects/two-excluded-extra/src/main/java/its/ValidPlugin.java b/src/test/projects/two-excluded-extra/src/main/java/its/ValidPlugin.java
@@ -1,6 +1,6 @@
 package its;
 
-import io.prestosql.spi.Plugin;
+import io.trino.spi.Plugin;
 
 public class ValidPlugin
         implements Plugin