You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by ns...@apache.org on 2018/05/23 12:08:45 UTC
[incubator-mxnet] branch v1.2.0 updated (8b487ef -> 96cd279)
This is an automated email from the ASF dual-hosted git repository.
nswamy pushed a change to branch v1.2.0
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git.
from 8b487ef [maven-release-plugin] prepare for next development iteration
new 3722791 remove force_load
new b6bd078 update link and compile paths for native code
new 84afce5 set inherited=false for maven-deploy plugin in the full-{platform} poms
new ba053b4 set inherited=false for maven-deploy plugin in the full-{platform} poms
new 96cd279 [maven-release-plugin] prepare release mxnet-parent_2.11-1.2.0
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Makefile | 6 ++++++
scala-package/assembly/linux-x86_64-cpu/pom.xml | 8 ++++++++
scala-package/assembly/linux-x86_64-gpu/pom.xml | 3 ++-
scala-package/assembly/osx-x86_64-cpu/pom.xml | 16 ++++++++++++----
scala-package/assembly/pom.xml | 2 +-
scala-package/core/pom.xml | 6 +++---
scala-package/examples/pom.xml | 6 +++---
scala-package/infer/pom.xml | 4 ++--
scala-package/init-native/linux-x86_64/pom.xml | 2 +-
scala-package/init-native/osx-x86_64/pom.xml | 8 ++++----
scala-package/init-native/pom.xml | 2 +-
scala-package/init/pom.xml | 2 +-
scala-package/macros/pom.xml | 6 +++---
scala-package/native/linux-x86_64-cpu/pom.xml | 2 +-
scala-package/native/linux-x86_64-gpu/pom.xml | 2 +-
scala-package/native/osx-x86_64-cpu/pom.xml | 8 ++++----
scala-package/native/pom.xml | 2 +-
scala-package/pom.xml | 8 ++++----
scala-package/spark/pom.xml | 4 ++--
19 files changed, 60 insertions(+), 37 deletions(-)
--
To stop receiving notification emails like this one, please contact
nswamy@apache.org.
[incubator-mxnet] 03/05: set inherited=false for maven-deploy
plugin in the full-{platform} poms
Posted by ns...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nswamy pushed a commit to branch v1.2.0
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
commit 84afce5b817aa24c8e4d4098a8f856b7e0571520
Author: Naveen Swamy <mn...@gmail.com>
AuthorDate: Wed May 23 04:39:25 2018 -0700
set inherited=false for maven-deploy plugin in the full-{platform} poms
---
scala-package/assembly/linux-x86_64-cpu/pom.xml | 5 +++++
scala-package/assembly/linux-x86_64-gpu/pom.xml | 4 +---
scala-package/assembly/osx-x86_64-cpu/pom.xml | 5 +++++
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/scala-package/assembly/linux-x86_64-cpu/pom.xml b/scala-package/assembly/linux-x86_64-cpu/pom.xml
index 9db9444..57c8bcb 100644
--- a/scala-package/assembly/linux-x86_64-cpu/pom.xml
+++ b/scala-package/assembly/linux-x86_64-cpu/pom.xml
@@ -38,6 +38,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
+ <inherited>false</inherited>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
diff --git a/scala-package/assembly/linux-x86_64-gpu/pom.xml b/scala-package/assembly/linux-x86_64-gpu/pom.xml
index c8e0f13..fc026d6 100644
--- a/scala-package/assembly/linux-x86_64-gpu/pom.xml
+++ b/scala-package/assembly/linux-x86_64-gpu/pom.xml
@@ -38,9 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
+ <inherited>false</inherited>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/scala-package/assembly/osx-x86_64-cpu/pom.xml b/scala-package/assembly/osx-x86_64-cpu/pom.xml
index 085b16b..f6c3ec7 100644
--- a/scala-package/assembly/osx-x86_64-cpu/pom.xml
+++ b/scala-package/assembly/osx-x86_64-cpu/pom.xml
@@ -35,6 +35,11 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <inherited>false</inherited>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
--
To stop receiving notification emails like this one, please contact
nswamy@apache.org.
[incubator-mxnet] 05/05: [maven-release-plugin] prepare release
mxnet-parent_2.11-1.2.0
Posted by ns...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nswamy pushed a commit to branch v1.2.0
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
commit 96cd279f2dc0437eedc850dbcddf2e6aebe1013e
Author: Naveen Swamy <mn...@gmail.com>
AuthorDate: Wed May 23 05:08:33 2018 -0700
[maven-release-plugin] prepare release mxnet-parent_2.11-1.2.0
---
scala-package/assembly/osx-x86_64-cpu/pom.xml | 8 ++++----
scala-package/assembly/pom.xml | 2 +-
scala-package/core/pom.xml | 6 +++---
scala-package/examples/pom.xml | 6 +++---
scala-package/infer/pom.xml | 4 ++--
scala-package/init-native/osx-x86_64/pom.xml | 4 ++--
scala-package/init-native/pom.xml | 2 +-
scala-package/init/pom.xml | 2 +-
scala-package/macros/pom.xml | 6 +++---
scala-package/native/osx-x86_64-cpu/pom.xml | 4 ++--
scala-package/native/pom.xml | 2 +-
scala-package/pom.xml | 4 ++--
scala-package/spark/pom.xml | 4 ++--
13 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/scala-package/assembly/osx-x86_64-cpu/pom.xml b/scala-package/assembly/osx-x86_64-cpu/pom.xml
index 57b184e..e0dd5fe 100644
--- a/scala-package/assembly/osx-x86_64-cpu/pom.xml
+++ b/scala-package/assembly/osx-x86_64-cpu/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-full-parent_2.11</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -16,18 +16,18 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>libmxnet-scala-osx-x86_64-cpu</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<type>jnilib</type>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-infer_${scala.binary.version}</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
</dependency>
</dependencies>
diff --git a/scala-package/assembly/pom.xml b/scala-package/assembly/pom.xml
index 2c2a4fc..8d2df25 100644
--- a/scala-package/assembly/pom.xml
+++ b/scala-package/assembly/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/scala-package/core/pom.xml b/scala-package/core/pom.xml
index 509e732..711a5fb 100644
--- a/scala-package/core/pom.xml
+++ b/scala-package/core/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -76,13 +76,13 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-init_${scala.binary.version}</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-macros_${scala.binary.version}</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/scala-package/examples/pom.xml b/scala-package/examples/pom.xml
index 1d187ca..721f882 100644
--- a/scala-package/examples/pom.xml
+++ b/scala-package/examples/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -150,13 +150,13 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-infer_${scala.binary.version}</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/scala-package/infer/pom.xml b/scala-package/infer/pom.xml
index 929a45e..56a3507 100644
--- a/scala-package/infer/pom.xml
+++ b/scala-package/infer/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>mxnet-parent_2.11</artifactId>
<groupId>org.apache.mxnet</groupId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<scope>provided</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
diff --git a/scala-package/init-native/osx-x86_64/pom.xml b/scala-package/init-native/osx-x86_64/pom.xml
index 54581e6..f2b2b3d 100644
--- a/scala-package/init-native/osx-x86_64/pom.xml
+++ b/scala-package/init-native/osx-x86_64/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-scala-init-native-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -18,7 +18,7 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-init_${scala.binary.version}</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
diff --git a/scala-package/init-native/pom.xml b/scala-package/init-native/pom.xml
index e7834a0..3a56d58 100644
--- a/scala-package/init-native/pom.xml
+++ b/scala-package/init-native/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/scala-package/init/pom.xml b/scala-package/init/pom.xml
index df24618..35ab07d 100644
--- a/scala-package/init/pom.xml
+++ b/scala-package/init/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<!-- <relativePath>../pom.xml</relativePath>-->
</parent>
diff --git a/scala-package/macros/pom.xml b/scala-package/macros/pom.xml
index 1b33561..e692d95 100644
--- a/scala-package/macros/pom.xml
+++ b/scala-package/macros/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -51,13 +51,13 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-init_${scala.binary.version}</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>libmxnet-init-scala-${platform}</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<scope>provided</scope>
<type>${libtype}</type>
</dependency>
diff --git a/scala-package/native/osx-x86_64-cpu/pom.xml b/scala-package/native/osx-x86_64-cpu/pom.xml
index 8a68864..01c3114 100644
--- a/scala-package/native/osx-x86_64-cpu/pom.xml
+++ b/scala-package/native/osx-x86_64-cpu/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-scala-native-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -18,7 +18,7 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
diff --git a/scala-package/native/pom.xml b/scala-package/native/pom.xml
index 594820a..3280ebf 100644
--- a/scala-package/native/pom.xml
+++ b/scala-package/native/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/scala-package/pom.xml b/scala-package/pom.xml
index 2a30867..63208c5 100644
--- a/scala-package/pom.xml
+++ b/scala-package/pom.xml
@@ -8,7 +8,7 @@
</parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<name>MXNet Scala Package - Parent</name>
<url>https://github.com/apache/incubator-mxnet/tree/master/scala-package</url>
<description>
@@ -30,7 +30,7 @@
<connection>scm:git:git@github.com:apache/incubator-mxnet.git</connection>
<developerConnection>scm:git:git@github.com:apache/incubator-mxnet.git</developerConnection>
<url>https://github.com/apache/incubator-mxnet</url>
- <tag>HEAD</tag>
+ <tag>mxnet-parent_2.11-1.2.0</tag>
</scm>
<properties>
diff --git a/scala-package/spark/pom.xml b/scala-package/spark/pom.xml
index e2554c4..41c0905 100644
--- a/scala-package/spark/pom.xml
+++ b/scala-package/spark/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
nswamy@apache.org.
[incubator-mxnet] 04/05: set inherited=false for maven-deploy
plugin in the full-{platform} poms
Posted by ns...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nswamy pushed a commit to branch v1.2.0
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
commit ba053b44cd19d227d2762d880e5e252c70150066
Author: Naveen Swamy <mn...@gmail.com>
AuthorDate: Wed May 23 04:48:51 2018 -0700
set inherited=false for maven-deploy plugin in the full-{platform} poms
---
scala-package/assembly/linux-x86_64-cpu/pom.xml | 3 +++
scala-package/assembly/linux-x86_64-gpu/pom.xml | 3 +++
scala-package/assembly/osx-x86_64-cpu/pom.xml | 3 +++
scala-package/pom.xml | 2 +-
4 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/scala-package/assembly/linux-x86_64-cpu/pom.xml b/scala-package/assembly/linux-x86_64-cpu/pom.xml
index 57c8bcb..869c14c 100644
--- a/scala-package/assembly/linux-x86_64-cpu/pom.xml
+++ b/scala-package/assembly/linux-x86_64-cpu/pom.xml
@@ -39,6 +39,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<inherited>false</inherited>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/scala-package/assembly/linux-x86_64-gpu/pom.xml b/scala-package/assembly/linux-x86_64-gpu/pom.xml
index fc026d6..386072a 100644
--- a/scala-package/assembly/linux-x86_64-gpu/pom.xml
+++ b/scala-package/assembly/linux-x86_64-gpu/pom.xml
@@ -39,6 +39,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<inherited>false</inherited>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/scala-package/assembly/osx-x86_64-cpu/pom.xml b/scala-package/assembly/osx-x86_64-cpu/pom.xml
index f6c3ec7..57b184e 100644
--- a/scala-package/assembly/osx-x86_64-cpu/pom.xml
+++ b/scala-package/assembly/osx-x86_64-cpu/pom.xml
@@ -37,6 +37,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<inherited>false</inherited>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/scala-package/pom.xml b/scala-package/pom.xml
index eeafb78..2a30867 100644
--- a/scala-package/pom.xml
+++ b/scala-package/pom.xml
@@ -30,7 +30,7 @@
<connection>scm:git:git@github.com:apache/incubator-mxnet.git</connection>
<developerConnection>scm:git:git@github.com:apache/incubator-mxnet.git</developerConnection>
<url>https://github.com/apache/incubator-mxnet</url>
- <tag></tag>
+ <tag>HEAD</tag>
</scm>
<properties>
--
To stop receiving notification emails like this one, please contact
nswamy@apache.org.
[incubator-mxnet] 01/05: remove force_load
Posted by ns...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nswamy pushed a commit to branch v1.2.0
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
commit 37227919ebc0841a04fd7e904a9d65c818cc92ed
Author: Naveen Swamy <mn...@gmail.com>
AuthorDate: Tue May 22 17:59:57 2018 -0700
remove force_load
---
scala-package/init-native/osx-x86_64/pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/scala-package/init-native/osx-x86_64/pom.xml b/scala-package/init-native/osx-x86_64/pom.xml
index 97193f4..c3bb4a2 100644
--- a/scala-package/init-native/osx-x86_64/pom.xml
+++ b/scala-package/init-native/osx-x86_64/pom.xml
@@ -71,7 +71,6 @@
<linkerMiddleOption>-Wl,-exported_symbol,_Java_*</linkerMiddleOption>
<linkerMiddleOption>-Wl,-x</linkerMiddleOption>
<linkerMiddleOption>${lddeps}</linkerMiddleOption>
- <linkerMiddleOption>-force_load ../../../lib/libmxnet.a</linkerMiddleOption>
</linkerMiddleOptions>
<linkerEndOptions>
<linkerEndOption>${ldflags}</linkerEndOption>
--
To stop receiving notification emails like this one, please contact
nswamy@apache.org.
[incubator-mxnet] 02/05: update link and compile paths for native
code
Posted by ns...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nswamy pushed a commit to branch v1.2.0
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
commit b6bd078d210634ed2111a829439c20ca363a712c
Author: Naveen Swamy <mn...@gmail.com>
AuthorDate: Wed May 23 04:26:10 2018 -0700
update link and compile paths for native code
---
Makefile | 6 ++++++
scala-package/assembly/osx-x86_64-cpu/pom.xml | 8 ++++----
scala-package/assembly/pom.xml | 2 +-
scala-package/core/pom.xml | 6 +++---
scala-package/examples/pom.xml | 6 +++---
scala-package/infer/pom.xml | 4 ++--
scala-package/init-native/linux-x86_64/pom.xml | 2 +-
scala-package/init-native/osx-x86_64/pom.xml | 7 ++++---
scala-package/init-native/pom.xml | 2 +-
scala-package/init/pom.xml | 2 +-
scala-package/macros/pom.xml | 6 +++---
scala-package/native/linux-x86_64-cpu/pom.xml | 2 +-
scala-package/native/linux-x86_64-gpu/pom.xml | 2 +-
scala-package/native/osx-x86_64-cpu/pom.xml | 8 ++++----
scala-package/native/pom.xml | 2 +-
scala-package/pom.xml | 8 ++++----
scala-package/spark/pom.xml | 4 ++--
17 files changed, 42 insertions(+), 35 deletions(-)
diff --git a/Makefile b/Makefile
index 9004dbe..3317fc5 100644
--- a/Makefile
+++ b/Makefile
@@ -604,6 +604,12 @@ scalarelease:
-Papache-release,$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) \
-Darguments=""-DskipTests\ -Dcflags=\""$(CFLAGS)\""\ -Dcxx=\""$(CXX)\""\ -Dldflags=\""$(LDFLAGS)\""\ -Dlddeps=\""$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a\"""")
+scalarelease-perform:
+ (cd $(ROOTDIR)/scala-package; \
+ mvn release:clean release:prepare -DautoVersionSubmodules=true \
+ -Papache-release,$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) \
+ -Darguments=""-DskipTests\ -Dcflags=\""$(CFLAGS)\""\ -Dcxx=\""$(CXX)\""\ -Dldflags=\""$(LDFLAGS)\""\ -Dlddeps=\""$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a\"""")
+
scaladeploy:
(cd $(ROOTDIR)/scala-package; \
mvn deploy -Papache-release,$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) \-DskipTests -Dcxx="$(CXX)" \
diff --git a/scala-package/assembly/osx-x86_64-cpu/pom.xml b/scala-package/assembly/osx-x86_64-cpu/pom.xml
index 2b3c28c..085b16b 100644
--- a/scala-package/assembly/osx-x86_64-cpu/pom.xml
+++ b/scala-package/assembly/osx-x86_64-cpu/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-full-parent_2.11</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -16,18 +16,18 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>libmxnet-scala-osx-x86_64-cpu</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<type>jnilib</type>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-infer_${scala.binary.version}</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/scala-package/assembly/pom.xml b/scala-package/assembly/pom.xml
index 456f453..2c2a4fc 100644
--- a/scala-package/assembly/pom.xml
+++ b/scala-package/assembly/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/scala-package/core/pom.xml b/scala-package/core/pom.xml
index fb5ea2b..509e732 100644
--- a/scala-package/core/pom.xml
+++ b/scala-package/core/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -76,13 +76,13 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-init_${scala.binary.version}</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-macros_${scala.binary.version}</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/scala-package/examples/pom.xml b/scala-package/examples/pom.xml
index 5ae86f4..1d187ca 100644
--- a/scala-package/examples/pom.xml
+++ b/scala-package/examples/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -150,13 +150,13 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-infer_${scala.binary.version}</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/scala-package/infer/pom.xml b/scala-package/infer/pom.xml
index daf4b47..929a45e 100644
--- a/scala-package/infer/pom.xml
+++ b/scala-package/infer/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>mxnet-parent_2.11</artifactId>
<groupId>org.apache.mxnet</groupId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
diff --git a/scala-package/init-native/linux-x86_64/pom.xml b/scala-package/init-native/linux-x86_64/pom.xml
index a54b4b9..d3653a5 100644
--- a/scala-package/init-native/linux-x86_64/pom.xml
+++ b/scala-package/init-native/linux-x86_64/pom.xml
@@ -62,7 +62,7 @@
<compilerStartOption>-std=c++0x</compilerStartOption>
</compilerStartOptions>
<compilerEndOptions>
- <compilerEndOption>-I../../../include</compilerEndOption>
+ <compilerEndOption>-I${project.basedir}/../../../include</compilerEndOption>
<compilerEndOption>${all_includes}</compilerEndOption>
<compilerEndOption>${cflags}</compilerEndOption>
</compilerEndOptions>
diff --git a/scala-package/init-native/osx-x86_64/pom.xml b/scala-package/init-native/osx-x86_64/pom.xml
index c3bb4a2..54581e6 100644
--- a/scala-package/init-native/osx-x86_64/pom.xml
+++ b/scala-package/init-native/osx-x86_64/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-scala-init-native-parent</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -18,7 +18,7 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-init_${scala.binary.version}</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -60,7 +60,7 @@
<compilerStartOption>-std=c++0x</compilerStartOption>
</compilerStartOptions>
<compilerEndOptions>
- <compilerEndOption>-I../../../include</compilerEndOption>
+ <compilerEndOption>-I${project.basedir}/../../../include</compilerEndOption>
<compilerEndOption>${cflags}</compilerEndOption>
</compilerEndOptions>
<linkerStartOptions>
@@ -71,6 +71,7 @@
<linkerMiddleOption>-Wl,-exported_symbol,_Java_*</linkerMiddleOption>
<linkerMiddleOption>-Wl,-x</linkerMiddleOption>
<linkerMiddleOption>${lddeps}</linkerMiddleOption>
+ <linkerMiddleOption>-force_load ${project.basedir}/../../../lib/libmxnet.a</linkerMiddleOption>
</linkerMiddleOptions>
<linkerEndOptions>
<linkerEndOption>${ldflags}</linkerEndOption>
diff --git a/scala-package/init-native/pom.xml b/scala-package/init-native/pom.xml
index 55c724d..e7834a0 100644
--- a/scala-package/init-native/pom.xml
+++ b/scala-package/init-native/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/scala-package/init/pom.xml b/scala-package/init/pom.xml
index 198bd89..df24618 100644
--- a/scala-package/init/pom.xml
+++ b/scala-package/init/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<!-- <relativePath>../pom.xml</relativePath>-->
</parent>
diff --git a/scala-package/macros/pom.xml b/scala-package/macros/pom.xml
index fee1dd2..1b33561 100644
--- a/scala-package/macros/pom.xml
+++ b/scala-package/macros/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -51,13 +51,13 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-init_${scala.binary.version}</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>libmxnet-init-scala-${platform}</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<scope>provided</scope>
<type>${libtype}</type>
</dependency>
diff --git a/scala-package/native/linux-x86_64-cpu/pom.xml b/scala-package/native/linux-x86_64-cpu/pom.xml
index d102299..94c2a74 100644
--- a/scala-package/native/linux-x86_64-cpu/pom.xml
+++ b/scala-package/native/linux-x86_64-cpu/pom.xml
@@ -62,7 +62,7 @@
<compilerStartOption>-std=c++0x</compilerStartOption>
</compilerStartOptions>
<compilerEndOptions>
- <compilerEndOption>-I../../../include</compilerEndOption>
+ <compilerEndOption>-I${project.basedir}/../../../include</compilerEndOption>
<compilerEndOption>${all_includes}</compilerEndOption>
<compilerEndOption>${cflags}</compilerEndOption>
</compilerEndOptions>
diff --git a/scala-package/native/linux-x86_64-gpu/pom.xml b/scala-package/native/linux-x86_64-gpu/pom.xml
index 00c6b8b..3d2969b 100644
--- a/scala-package/native/linux-x86_64-gpu/pom.xml
+++ b/scala-package/native/linux-x86_64-gpu/pom.xml
@@ -62,7 +62,7 @@
<compilerStartOption>-std=c++0x</compilerStartOption>
</compilerStartOptions>
<compilerEndOptions>
- <compilerEndOption>-I../../../include</compilerEndOption>
+ <compilerEndOption>-I${project.basedir}/../../../include</compilerEndOption>
<compilerEndOption>${all_includes}</compilerEndOption>
<compilerEndOption>${cflags}</compilerEndOption>
</compilerEndOptions>
diff --git a/scala-package/native/osx-x86_64-cpu/pom.xml b/scala-package/native/osx-x86_64-cpu/pom.xml
index 343f660..8a68864 100644
--- a/scala-package/native/osx-x86_64-cpu/pom.xml
+++ b/scala-package/native/osx-x86_64-cpu/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-scala-native-parent</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -18,7 +18,7 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -71,8 +71,8 @@
<linkerMiddleOption>-Wl,-exported_symbol,_Java_*</linkerMiddleOption>
<linkerMiddleOption>-Wl,-x</linkerMiddleOption>
<linkerMiddleOption>${lddeps}</linkerMiddleOption>
- <linkerMiddleOption>-force_load ../../../lib/libmxnet.a</linkerMiddleOption>
- <linkerMiddleOption>-force_load ../../../3rdparty/nnvm/lib/libnnvm.a</linkerMiddleOption>
+ <linkerMiddleOption>-force_load ${project.basedir}/../../../lib/libmxnet.a</linkerMiddleOption>
+ <linkerMiddleOption>-force_load ${project.basedir}/../../../3rdparty/nnvm/lib/libnnvm.a</linkerMiddleOption>
</linkerMiddleOptions>
<linkerEndOptions>
<linkerEndOption>${ldflags}</linkerEndOption>
diff --git a/scala-package/native/pom.xml b/scala-package/native/pom.xml
index a9b2ec9..594820a 100644
--- a/scala-package/native/pom.xml
+++ b/scala-package/native/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/scala-package/pom.xml b/scala-package/pom.xml
index 6e4bfba..eeafb78 100644
--- a/scala-package/pom.xml
+++ b/scala-package/pom.xml
@@ -8,7 +8,7 @@
</parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<name>MXNet Scala Package - Parent</name>
<url>https://github.com/apache/incubator-mxnet/tree/master/scala-package</url>
<description>
@@ -27,10 +27,10 @@
</licenses>
<scm>
- <connection>scm:git:git@github.com:dmlc/mxnet.git</connection>
- <developerConnection>scm:git:git@github.com:dmlc/mxnet.git</developerConnection>
+ <connection>scm:git:git@github.com:apache/incubator-mxnet.git</connection>
+ <developerConnection>scm:git:git@github.com:apache/incubator-mxnet.git</developerConnection>
<url>https://github.com/apache/incubator-mxnet</url>
- <tag>HEAD</tag>
+ <tag></tag>
</scm>
<properties>
diff --git a/scala-package/spark/pom.xml b/scala-package/spark/pom.xml
index 8ba4241..e2554c4 100644
--- a/scala-package/spark/pom.xml
+++ b/scala-package/spark/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
nswamy@apache.org.