add defaults and clean up the tests (#13295)

apache · Nov 16, 2018 · 3ec9030 · 3ec9030
1 parent 7d51241
commit 3ec9030
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 19 deletions.
diff --git a/Makefile b/Makefile
@@ -605,7 +605,7 @@ scalaclean:
 
 scalapkg:
 	(cd $(ROOTDIR)/scala-package; \
-		mvn package -P$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE),integrationtest -Dcxx="$(CXX)" \
+		mvn package -P$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) -Dcxx="$(CXX)" \
 		    -Dbuild.platform="$(SCALA_PKG_PROFILE)" \
 			-Dcflags="$(CFLAGS)" -Dldflags="$(LDFLAGS)" \
 			-Dcurrent_libdir="$(ROOTDIR)/lib" \

diff --git a/scala-package/core/pom.xml b/scala-package/core/pom.xml
@@ -10,6 +10,10 @@
     <relativePath>../pom.xml</relativePath>
   </parent>
 
+  <properties>
+    <skipTests>true</skipTests>
+  </properties>
+
   <artifactId>mxnet-core_2.11</artifactId>
   <name>MXNet Scala Package - Core</name>
 
@@ -20,12 +24,6 @@
         <skipTests>false</skipTests>
       </properties>
     </profile>
-    <profile>
-      <id>integrationtest</id>
-      <properties>
-        <skipTests>true</skipTests>
-      </properties>
-    </profile>
     <profile>
       <id>osx-x86_64-cpu</id>
       <properties>

diff --git a/scala-package/examples/pom.xml b/scala-package/examples/pom.xml
@@ -13,13 +13,11 @@
   <artifactId>mxnet-examples_2.11</artifactId>
   <name>MXNet Scala Package - Examples</name>
 
+  <properties>
+    <skipTests>true</skipTests>
+  </properties>
+
   <profiles>
-    <profile>
-      <id>unittest</id>
-      <properties>
-        <skipTests>true</skipTests>
-      </properties>
-    </profile>
     <profile>
       <id>integrationtest</id>
       <properties>

diff --git a/scala-package/infer/pom.xml b/scala-package/infer/pom.xml
@@ -13,19 +13,17 @@
     <artifactId>mxnet-infer_2.11</artifactId>
     <name>MXNet Scala Package - Inference</name>
 
+    <properties>
+        <skipTests>true</skipTests>
+    </properties>
+
     <profiles>
         <profile>
             <id>unittest</id>
             <properties>
                 <skipTests>false</skipTests>
             </properties>
         </profile>
-        <profile>
-            <id>integrationtest</id>
-            <properties>
-                <skipTests>true</skipTests>
-            </properties>
-        </profile>
         <profile>
             <id>osx-x86_64-cpu</id>
             <properties>