Skip to content

Commit

Permalink
More cleanup
Browse files Browse the repository at this point in the history 
Signed-off-by: Hongxin Liang <[email protected]>
  • Loading branch information
@honnix
honnix committed Sep 29, 2023
1 parent ea36901 commit 24456e9
Show file tree
Hide file tree
Showing 13 changed files with 100 additions and 166 deletions.
47 changes: 2 additions & 45 deletions flyteidl-protos/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,8 @@
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>0.6.1</version>
<configuration>
<protocArtifact>com.google.protobuf:protoc:3.21.1:exe:${os.detected.classifier}</protocArtifact>
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
<checkStaleness>true</checkStaleness>
Expand All @@ -70,53 +69,11 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>8</source>
<target>8</target>
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<!-- there are lots of deprecation in the protos but we don't want to fail -->
<failOnWarning>false</failOnWarning>
<!-- Generated proto classes produce warnings -->
<!-- The semantics of this option are reversed, see MCOMPILER-209. -->
<useIncrementalCompilation>false</useIncrementalCompilation>
<encoding>utf-8</encoding>
<compilerArgs>
<!-- for AutoValue reflection -->
<arg>-parameters</arg>
<arg>-Xlint:all</arg>
<!-- disable not helpful warnings to fail on warnings -->
<arg>-Xlint:-path</arg>
<arg>-Xlint:-processing</arg>
<!-- we don't care about classes being deserialized with different classpath -->
<arg>-Xlint:-serial</arg>
<arg>-implicit:class</arg>
<!-- see https://stackoverflow.com/a/57004351 -->
<arg>-Xpkginfo:always</arg>
</compilerArgs>
<annotationProcessorPaths>
<path>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
<version>${auto-value.version}</version>
</path>
<path>
<groupId>com.google.auto.service</groupId>
<artifactId>auto-service</artifactId>
<version>${auto-service.version}</version>
</path>
<path>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
<version>${error_prone.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
</plugin>
Expand Down
1 change: 1 addition & 0 deletions flytekit-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
14 changes: 6 additions & 8 deletions flytekit-examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@
<artifactId>auto-service-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<scope>provided</scope>
</dependency>

<!-- test -->
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand All @@ -66,11 +72,6 @@
<artifactId>flytekit-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -100,9 +101,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
1 change: 0 additions & 1 deletion flytekit-java/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@
<artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-reflect</artifactId>
Expand Down
20 changes: 18 additions & 2 deletions flytekit-scala-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@

<dependencies>
<!-- test -->
<!-- provided -->
<dependency>
<groupId>org.flyte</groupId>
<artifactId>flytekit-api</artifactId>
Expand Down Expand Up @@ -109,10 +108,27 @@
<goal>testCompile</goal>
</goals>
</execution>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>doc-jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Disabling the default javadoc plugin - we use scala-maven-plugin instead -->
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down
21 changes: 17 additions & 4 deletions flytekit-scala_2.12/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,29 @@
<goals>
<goal>compile</goal>
<goal>testCompile</goal>
</goals>
</execution>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>doc-jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Disabling the default javadoc plugin - we use scala-maven-plugin instead -->
<plugin>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down
21 changes: 17 additions & 4 deletions flytekit-scala_2.13/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,16 +95,29 @@
<goals>
<goal>compile</goal>
<goal>testCompile</goal>
</goals>
</execution>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>doc-jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Disabling the default javadoc plugin - we use scala-maven-plugin instead -->
<plugin>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down
11 changes: 1 addition & 10 deletions integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,22 +56,16 @@
<scope>provided</scope>
</dependency>

<!-- dependencies for integration-tests -->
<!-- dependencies for integration-tests to make sure these modules are built prior to integration-tests -->
<dependency>
<groupId>org.flyte</groupId>
<artifactId>flytekit-examples</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.flyte</groupId>
<artifactId>flytekit-examples-scala_2.13</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.flyte</groupId>
<artifactId>jflyte</artifactId>
<scope>test</scope>

</dependency>

<!-- test -->
Expand Down Expand Up @@ -119,9 +113,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
</plugins>
</build>
<profiles>
Expand Down
3 changes: 0 additions & 3 deletions jflyte-aws/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,6 @@

<build>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
</plugin>
Expand Down
27 changes: 8 additions & 19 deletions jflyte-google-cloud/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@
<name>JFlyte - Gcloud Filesystem and IdToken extension</name>
<description>Stages jars in GCS.</description>

<properties>
<mockito.version>3.3.3</mockito.version>
<junit.version>5.7.0</junit.version>
</properties>

<dependencies>
<!-- compile -->
<dependency>
Expand All @@ -57,49 +52,43 @@
<artifactId>jsr305</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<scope>provided</scope>
</dependency>

<!-- tests -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>2.2</version>
<artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
</plugin>
Expand Down
24 changes: 0 additions & 24 deletions jflyte-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,6 @@
<groupId>org.flyte</groupId>
<artifactId>jflyte-api</artifactId>
</dependency>
<dependency>
<groupId>org.flyte</groupId>
<artifactId>jflyte-aws</artifactId>
<!-- We want to have the dependency, so it is already built before building the docker image,
but we want to avoid the artifacts from the module to pollute jflyte -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.flyte</groupId>
<artifactId>jflyte-google-cloud</artifactId>
<!-- We want to have the dependency, so it is already built before building the docker image,
but we want to avoid the artifacts from the module to pollute jflyte -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down Expand Up @@ -90,13 +76,6 @@
<artifactId>netty-tcnative-boringssl-static</artifactId>
</dependency>

<!-- runtime -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>runtime</scope>
</dependency>

<!-- provided -->
<dependency>
<groupId>com.google.auto.value</groupId>
Expand Down Expand Up @@ -171,9 +150,6 @@

<build>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
</plugin>
Expand Down
Loading

0 comments on commit 24456e9

Please sign in to comment.