Skip to content
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.

Sign up for GitHub

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

Jump to bottom

JUCX: use google mirror + fix build on java10+. #4704

Merged
merged 2 commits into from
Jan 29, 2020
Merged

JUCX: use google mirror + fix build on java10+. #4704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3996cad
JUCX: use google mirror + fix build on java10+.
petro-rudenko Jan 27, 2020
39fe551
JUCX: fix makefile.
petro-rudenko Jan 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 65 additions & 21 deletions bindings/java/pom.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,65 @@
</repository>
</distributionManagement>

<repositories>
<repository>
<id>gcs-maven-central-mirror</id>
<!--
Google Mirror of Maven Central, placed first so that it's used instead of flaky Maven Central.
See https://storage-download.googleapis.com/maven-central/index.html
-->
<name>GCS Maven Central mirror</name>
<url>https://maven-central.storage-download.googleapis.com/repos/central/data/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<!--
This is used as a fallback when the first try fails.
-->
<id>central</id>
<name>Maven Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there way to avoid duplication with <repositories> ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

repository and pluginRepositories are different:
https://stackoverflow.com/questions/45557870/repository-vs-pluginrepository

<id>gcs-maven-central-mirror</id>
<!--
Google Mirror of Maven Central, placed first so that it's used instead of flaky Maven Central.
See https://storage-download.googleapis.com/maven-central/index.html
-->
<name>GCS Maven Central mirror</name>
<url>https://maven-central.storage-download.googleapis.com/repos/central/data/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>central</id>
<url>https://repo.maven.apache.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>

<dependencies>
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -267,28 +326,13 @@
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native-maven-plugin</artifactId>
<version>1.0-alpha-9</version>
<extensions>true</extensions>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<javahOutputDirectory>${native.dir}</javahOutputDirectory>
<javahClassNames>
<javahClassName>org.openucx.jucx.ucp.UcpConstants</javahClassName>
<javahClassName>org.openucx.jucx.ucp.UcpContext</javahClassName>
<javahClassName>org.openucx.jucx.ucp.UcpEndpoint</javahClassName>
<javahClassName>org.openucx.jucx.ucp.UcpListener</javahClassName>
<javahClassName>org.openucx.jucx.ucp.UcpMemory</javahClassName>
<javahClassName>org.openucx.jucx.ucp.UcpRequest</javahClassName>
<javahClassName>org.openucx.jucx.ucp.UcpRemoteKey</javahClassName>
<javahClassName>org.openucx.jucx.ucp.UcpWorker</javahClassName>
<javahClassName>org.openucx.jucx.ucs.UcsConstants</javahClassName>
</javahClassNames>
<sources>
<source>
<directory>${jucx.src.dir}/src/main/native</directory>
</source>
</sources>
<compilerArgs>
<arg>-h</arg>
<arg>${native.dir}</arg>
</compilerArgs>
petro-rudenko marked this conversation as resolved.
Show resolved Hide resolved
</configuration>
</plugin>

Expand Down
2 changes: 1 addition & 1 deletion bindings/java/src/main/native/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ MOSTLYCLEANFILES = $(JUCX_GENERATED_H_FILES) $(STAMP_FILE)
$(STAMP_FILE): \
$(javadir)/src/main/java/org/openucx/jucx/ucs/*.java \
$(javadir)/src/main/java/org/openucx/jucx/ucp/*.java
$(MVNCMD) compile native:javah
$(MVNCMD) compile
touch $(STAMP_FILE)

$(JUCX_GENERATED_H_FILES): $(STAMP_FILE)
Expand Down