You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@s2graph.apache.org by st...@apache.org on 2016/11/11 01:44:09 UTC
[1/2] incubator-s2graph git commit: [S2GRAPH-126] does not produce
error even if ~/.m2/settings.xml does not exist
Repository: incubator-s2graph
Updated Branches:
refs/heads/master d37888ff2 -> 6610285ad
[S2GRAPH-126] does not produce error even if ~/.m2/settings.xml does not exist
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/f4374095
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/f4374095
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/f4374095
Branch: refs/heads/master
Commit: f4374095f5f33c84202d19fefb95d2d02b242966
Parents: 1c2bd04
Author: Jong Wook Kim <jo...@nyu.edu>
Authored: Wed Nov 9 16:22:40 2016 -0500
Committer: Jong Wook Kim <jo...@nyu.edu>
Committed: Wed Nov 9 16:27:37 2016 -0500
----------------------------------------------------------------------
CHANGES | 3 +++
project/Publisher.scala | 8 +++++---
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/f4374095/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 8731236..cfeac6a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -117,6 +117,9 @@ Release 0.1.0 - unreleased
S2GRAPH-120: Netty version is conflict with play 2.5.9 (Committed by DOYUNG YOON).
+ S2GRAPH-126: SBT error when there is no ~/.m2/settings.xml
+ (Contributed by Jong Wook Kim<jo...@nyu.edu>, committed by DOYUNG YOON)
+
TASKS
S2GRAPH-2: Update document and quick start environment to have recent set-up command changes.
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/f4374095/project/Publisher.scala
----------------------------------------------------------------------
diff --git a/project/Publisher.scala b/project/Publisher.scala
index 49364e4..7fb8d2b 100644
--- a/project/Publisher.scala
+++ b/project/Publisher.scala
@@ -1,5 +1,6 @@
import sbt.Keys._
import sbt._
+import scala.util.Try
import scala.xml.XML
object Publisher {
@@ -17,9 +18,10 @@ object Publisher {
}
},
credentials ++= {
- val xml = XML.loadFile(new File(System.getProperty("user.home")) / ".m2" / "settings.xml")
- for (server <- xml \\ "server" if (server \ "id").text == "apache") yield {
- Credentials("Sonatype Nexus Repository Manager", "repository.apache.org", (server \ "username").text, (server \ "password").text)
+ Try(XML.loadFile(new File(System.getProperty("user.home")) / ".m2" / "settings.xml")).toOption.toSeq.flatMap { xml =>
+ for (server <- xml \\ "server" if (server \ "id").text == "apache") yield {
+ Credentials("Sonatype Nexus Repository Manager", "repository.apache.org", (server \ "username").text, (server \ "password").text)
+ }
}
},
pomIncludeRepository := { _ => false },
[2/2] incubator-s2graph git commit: [S2GRAPH-126]: fixes SBT error
that occurs if ~/.m2/settings.xml does not exist.
Posted by st...@apache.org.
[S2GRAPH-126]: fixes SBT error that occurs if ~/.m2/settings.xml does not exist.
JIRA:
[S2GRAPH-126] https://issues.apache.org/jira/browse/S2GRAPH-126
Pull Request:
Closes #93
Authors
Jong Wook Kim: jongwook@nyu.edu
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/6610285a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/6610285a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/6610285a
Branch: refs/heads/master
Commit: 6610285ad11ef61845218c46483da642783c495a
Parents: d37888f f437409
Author: DO YUNG YOON <st...@apache.org>
Authored: Fri Nov 11 10:42:05 2016 +0900
Committer: DO YUNG YOON <st...@apache.org>
Committed: Fri Nov 11 10:43:17 2016 +0900
----------------------------------------------------------------------
CHANGES | 3 +++
project/Publisher.scala | 8 +++++---
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/6610285a/CHANGES
----------------------------------------------------------------------