-
Notifications
You must be signed in to change notification settings - Fork 693
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[SEDONA-212] Rework dependency management #735
Merged
Merged
Changes from 20 commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
bd7fd8b
Rework dependencies
Kimahriman 5c17662
Add guava exclusion
Kimahriman c4b1ee4
Add missing optionals
Kimahriman 8dc19b0
Core needs spark-sql now
Kimahriman 13b76a2
Fix some geotools things and use separate shaded artifact
Kimahriman 10190c9
More rework
Kimahriman f12b7da
Comment out jackson and make scala opt-in
Kimahriman caf1844
Fix datasyslab deps
Kimahriman 2b1e724
Add epsg to python-adapter
Kimahriman c4d85fd
Actually include scala code in python-adapter
Kimahriman 55911a1
Get mini hdfs test working
Kimahriman 3f13c14
Create separate shaded modules
Kimahriman 8d54691
Search for shaded module too to get version
Kimahriman c09ed45
Add geotools to spark-shaded for python tests
Kimahriman 64fc58b
Make the cdm dependency provided by default and included in shaded mo…
Kimahriman 588dabb
Re-enable resolve pom plugin for python-adapter
Kimahriman 4b50ec8
FIx guava for python-adapter tests
Kimahriman 06320de
Merge branch 'master' into rework-deps2
Kimahriman 8c0e1fd
Fix new module versions
Kimahriman eb4ce52
Remove spark compat version from flink shaded
Kimahriman cf4aae3
Merge branch 'master' into rework-deps2
Kimahriman cd4ab98
Revert CI triggers
Kimahriman 908a41b
Skip deploying parent pom with scala 2.13 profile
Kimahriman d8ede5f
Merge branch 'master' into rework-deps2
Kimahriman c56cd6e
Merge branch 'master' into rework-deps2
Kimahriman 472f56e
Remove java.net repo
Kimahriman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ name: Python build | |
on: | ||
push: | ||
branches: | ||
- master | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here. Use |
||
- '*' | ||
pull_request: | ||
branches: | ||
- '*' | ||
|
@@ -83,7 +83,7 @@ jobs: | |
- env: | ||
SPARK_VERSION: ${{ matrix.spark }} | ||
HADOOP_VERSION: ${{ matrix.hadoop }} | ||
run: find python-adapter/target -name sedona-* -exec cp {} spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}/jars/ \; | ||
run: find spark-shaded/target -name sedona-*.jar -exec cp {} spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}/jars/ \; | ||
- env: | ||
SPARK_VERSION: ${{ matrix.spark }} | ||
HADOOP_VERSION: ${{ matrix.hadoop }} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
/target/ | ||
/.settings/ | ||
/.classpath | ||
/.project | ||
/dependency-reduced-pom.xml | ||
/doc/ | ||
/.idea/ | ||
*.iml | ||
/latest/ | ||
/spark-warehouse/ | ||
/metastore_db/ | ||
*.log |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,105 @@ | ||
<!-- | ||
~ Licensed to the Apache Software Foundation (ASF) under one | ||
~ or more contributor license agreements. See the NOTICE file | ||
~ distributed with this work for additional information | ||
~ regarding copyright ownership. The ASF licenses this file | ||
~ to you under the Apache License, Version 2.0 (the | ||
~ "License"); you may not use this file except in compliance | ||
~ with the License. You may obtain a copy of the License at | ||
~ | ||
~ http://www.apache.org/licenses/LICENSE-2.0 | ||
~ | ||
~ Unless required by applicable law or agreed to in writing, | ||
~ software distributed under the License is distributed on an | ||
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
~ KIND, either express or implied. See the License for the | ||
~ specific language governing permissions and limitations | ||
~ under the License. | ||
--> | ||
|
||
<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> | ||
<parent> | ||
<artifactId>sedona-parent</artifactId> | ||
<groupId>org.apache.sedona</groupId> | ||
<version>1.3.2-incubating-SNAPSHOT</version> | ||
</parent> | ||
<artifactId>sedona-flink-shaded_${scala.compat.version}</artifactId> | ||
|
||
<name>${project.groupId}:${project.artifactId}</name> | ||
<description>A cluster computing system for processing large-scale spatial data: Flink Shaded. Apache Sedona is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</description> | ||
<url>http://sedona.apache.org/</url> | ||
<packaging>jar</packaging> | ||
|
||
<properties> | ||
<maven.deploy.skip>false</maven.deploy.skip> | ||
<cdm.scope>compile</cdm.scope> | ||
</properties> | ||
|
||
<dependencies> | ||
<dependency> | ||
<groupId>org.apache.sedona</groupId> | ||
<artifactId>sedona-flink_${scala.compat.version}</artifactId> | ||
<version>${project.version}</version> | ||
</dependency> | ||
<!-- Define this to be shaded since it is provided in other modules --> | ||
<dependency> | ||
<groupId>edu.ucar</groupId> | ||
<artifactId>cdm-core</artifactId> | ||
</dependency> | ||
</dependencies> | ||
<build> | ||
<sourceDirectory>src/main/scala</sourceDirectory> | ||
<plugins> | ||
<plugin> | ||
<groupId>io.paradoxical</groupId> | ||
<artifactId>resolved-pom-maven-plugin</artifactId> | ||
<version>1.0</version> | ||
<executions> | ||
<execution> | ||
<id>resolve-my-pom</id> | ||
<phase>none</phase> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-shade-plugin</artifactId> | ||
<version>2.1</version> | ||
<executions> | ||
<execution> | ||
<phase>package</phase> | ||
<goals> | ||
<goal>shade</goal> | ||
</goals> | ||
<configuration> | ||
<transformers> | ||
<!-- use transformer to handle merge of META-INF/services - see http://java.net/jira/browse/JERSEY-440?focusedCommentId=14822&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#action_14822 --> | ||
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> | ||
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> | ||
<resource>reference.conf</resource> | ||
</transformer> | ||
</transformers> | ||
<artifactSet> | ||
<excludes> | ||
<exclude>org.scala-lang:scala-library</exclude> | ||
</excludes> | ||
</artifactSet> | ||
<filters> | ||
<!-- filter to address "Invalid signature file" issue - see http://stackoverflow.com/a/6743609/589215 --> | ||
<filter> | ||
<artifact>*:*</artifact> | ||
<excludes> | ||
<exclude>META-INF/*.SF</exclude> | ||
<exclude>META-INF/*.DSA</exclude> | ||
<exclude>META-INF/*.RSA</exclude> | ||
</excludes> | ||
</filter> | ||
</filters> | ||
</configuration> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
</project> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please don't change it to
*
. CI is supposed to only test the master branch and pull requests because all repos under ASF share 150 VMs sponsored by GitHub and we want to leave some resources to other projects.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I always change this locally so that I can get the CI to run before making a PR, will change this back. Does that only apply to things running under the apache group? When it runs on my own GitHub actions does it use the same vms?