Repository: incubator-systemml Updated Branches: refs/heads/master 3aa4c4fd9 -> 59e961fd8
[MINOR] Properly format newly added dependency entries Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/59e961fd Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/59e961fd Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/59e961fd Branch: refs/heads/master Commit: 59e961fd856890d26612aaefda53b550d1499d21 Parents: 3aa4c4f Author: Luciano Resende <[email protected]> Authored: Fri May 20 15:42:05 2016 -0700 Committer: Luciano Resende <[email protected]> Committed: Fri May 20 15:42:21 2016 -0700 ---------------------------------------------------------------------- dev/release/release-build.sh | 2 + pom.xml | 96 ++++++++++++++++++++------------------- 2 files changed, 51 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/59e961fd/dev/release/release-build.sh ---------------------------------------------------------------------- diff --git a/dev/release/release-build.sh b/dev/release/release-build.sh index f2231b3..eb8fcd6 100644 --- a/dev/release/release-build.sh +++ b/dev/release/release-build.sh @@ -33,6 +33,8 @@ RELEASE=`pwd`/target/RELEASE #mvn clean verify gpg:sign install:install deploy:deploy -Dgpg.passphrase=XXXX -DaltDeploymentRepository=apache.staging::default::https://repository.apache.org/service/local/staging/deploy/maven2 -Pdistribution,rat -Dgpg.skip -DskipTests -Darguments="-DskipTests" mvn clean verify gpg:sign install:install deploy:deploy -Dgpg.passphrase=XXXX -Pdistribution,rat -DskipTests -Darguments="-DskipTests" +mvn release:prepare -Pdistribution,rat -DskipTests -Darguments="-DskipTests" -Dproject + mkdir $RELEASE/ cp $BUILD/systemml-* $RELEASE/ cd $RELEASE http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/59e961fd/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7fe3580..eb79d31 100644 --- a/pom.xml +++ b/pom.xml @@ -68,6 +68,8 @@ <spark.version>1.4.1</spark.version> <scala.version>2.10.5</scala.version> <scala.binary.version>2.10</scala.binary.version> + <scala.test.version>2.2.1</scala.test.version> + <scala.check.version>1.11.3</scala.check.version> <!-- OS-specific JVM arguments for running integration tests --> <integrationTestExtraJVMArgs /> </properties> @@ -976,54 +978,54 @@ <version>${hadoop.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-compiler</artifactId> - <version>${scala.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-reflect</artifactId> - <version>${scala.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - <version>${scala.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-actors</artifactId> - <version>${scala.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scalap</artifactId> - <version>${scala.version}</version> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-compiler</artifactId> + <version>${scala.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-reflect</artifactId> + <version>${scala.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + <version>${scala.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-actors</artifactId> + <version>${scala.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scalap</artifactId> + <version>${scala.version}</version> <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.scalatest</groupId> - <artifactId>scalatest_${scala.binary.version}</artifactId> - <version>2.2.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>1.9.5</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.scalacheck</groupId> - <artifactId>scalacheck_${scala.binary.version}</artifactId> - <version>1.11.3</version> - <scope>test</scope> - </dependency> + </dependency> + <dependency> + <groupId>org.scalatest</groupId> + <artifactId>scalatest_${scala.binary.version}</artifactId> + <version>${scala.test.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.scalacheck</groupId> + <artifactId>scalacheck_${scala.binary.version}</artifactId> + <version>${scala.check.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.9.5</version> + <scope>test</scope> + </dependency> </dependencies> </project>
