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/09 00:56:25 UTC
[1/4] incubator-s2graph git commit: [S2GRAPH-115] added necessary
machineries to publish to Maven Central
Repository: incubator-s2graph
Updated Branches:
refs/heads/master ed0379917 -> 1c2bd045a
[S2GRAPH-115] added necessary machineries to publish to Maven Central
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/04b731e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/04b731e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/04b731e5
Branch: refs/heads/master
Commit: 04b731e5fa55dd83162e3cf4eba706062f14ab5a
Parents: ed03799
Author: Jong Wook Kim <jo...@nyu.edu>
Authored: Sun Nov 6 01:11:43 2016 -0500
Committer: Jong Wook Kim <jo...@nyu.edu>
Committed: Sun Nov 6 01:12:46 2016 -0500
----------------------------------------------------------------------
build.sbt | 5 ++--
project/Publisher.scala | 64 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 67 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/04b731e5/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index 36b56fd..ae3efb3 100755
--- a/build.sbt
+++ b/build.sbt
@@ -25,7 +25,8 @@ name := "s2graph"
lazy val commonSettings = Seq(
organization := "org.apache.s2graph",
scalaVersion := "2.11.7",
- version := "0.1.0",
+ version := "0.1.1-SNAPSHOT",
+ isSnapshot := version.value.endsWith("-SNAPSHOT"),
scalacOptions := Seq("-language:postfixOps", "-unchecked", "-deprecation", "-feature", "-Xlint", "-Xlint:-missing-interpolator"),
javaOptions ++= collection.JavaConversions.propertiesAsScalaMap(System.getProperties).map { case (key, value) => "-D" + key + "=" + value }.toSeq,
testOptions in Test += Tests.Argument("-oDF"),
@@ -35,7 +36,7 @@ lazy val commonSettings = Seq(
resolvers ++= Seq(
Resolver.mavenLocal
)
-)
+) ++ Publisher.defaultSettings
Revolver.settings
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/04b731e5/project/Publisher.scala
----------------------------------------------------------------------
diff --git a/project/Publisher.scala b/project/Publisher.scala
new file mode 100644
index 0000000..add1279
--- /dev/null
+++ b/project/Publisher.scala
@@ -0,0 +1,64 @@
+import sbt.Keys._
+import sbt._
+import scala.xml.XML
+
+object Publisher {
+ val defaultSettings = Seq(
+ publishMavenStyle := true,
+ publishTo := {
+ if (isSnapshot.value) {
+ Some("apache" at "https://repository.apache.org/content/repositories/snapshots")
+ } else {
+ Some("apache" at "https://repository.apache.org/content/repositories/releases")
+ }
+ },
+ 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)
+ }
+ },
+ pomIncludeRepository := { _ => false },
+ pomExtra := {
+ <url>https://github.com/apache/incubator-s2graph</url>
+ <licenses>
+ <license>
+ <name>Apache 2</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:git://git.apache.org/incubator-s2graph.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-s2graph.git</developerConnection>
+ <url>github.com/apache/incubator-s2graph</url>
+ </scm>
+ <developers>
+ <developer>
+ <id>s2graph</id>
+ <name>S2Graph Team</name>
+ <url>http://s2graph.incubator.apache.org/</url>
+ </developer>
+ </developers>
+ <mailingLists>
+ <mailingList>
+ <name>Dev Mailing List</name>
+ <post>dev@s2graph.incubator.apache.org</post>
+ <subscribe>dev-subscribe@s2graph.incubator.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@s2graph.incubator.apache.org</unsubscribe>
+ </mailingList>
+ <mailingList>
+ <name>User Mailing List</name>
+ <post>users@s2graph.incubator.apache.org</post>
+ <subscribe>users-subscribe@s2graph.incubator.apache.org</subscribe>
+ <unsubscribe>users-unsubscribe@s2graph.incubator.apache.org</unsubscribe>
+ </mailingList>
+ <mailingList>
+ <name>Commits Mailing List</name>
+ <post>commits@s2graph.incubator.apache.org</post>
+ <subscribe>commits-subscribe@s2graph.incubator.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@s2graph.incubator.apache.org</unsubscribe>
+ </mailingList>
+ </mailingLists>
+ }
+ )
+}
[4/4] incubator-s2graph git commit: [S2GRAPH-115] Release binary
artifacts to Maven Central
Posted by st...@apache.org.
[S2GRAPH-115] Release binary artifacts to Maven Central
JIRA:
[S2GRAPH-115] https://issues.apache.org/jira/browse/S2GRAPH-115
Pull Request:
Closes #91
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/1c2bd045
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/1c2bd045
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/1c2bd045
Branch: refs/heads/master
Commit: 1c2bd045abb02b6ec8c0b50d412ea7a5870f8b26
Parents: 0e87804
Author: DO YUNG YOON <st...@apache.org>
Authored: Wed Nov 9 09:53:20 2016 +0900
Committer: DO YUNG YOON <st...@apache.org>
Committed: Wed Nov 9 09:53:51 2016 +0900
----------------------------------------------------------------------
CHANGES | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/1c2bd045/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 945e464..8731236 100644
--- a/CHANGES
+++ b/CHANGES
@@ -85,6 +85,9 @@ Release 0.1.0 - unreleased
S2GRAPH-117: Cleaner logging library usage.
(Contributed by Jong Wook Kim<jo...@nyu.edu>, committed by DOYUNG YOON)
+ S2GRAPH-115: Release binary artifacts to Maven Central.
+ (Contributed by Jong Wook Kim<jo...@nyu.edu>, committed by DOYUNG YOON)
+
BUG FIXES
S2GRAPH-18: Query Option "interval" is Broken.
[2/4] incubator-s2graph git commit: [S2GRAPH-115] forces
publishSigned;
version is now in version.sbt, to enable using sbt-release-plugin
Posted by st...@apache.org.
[S2GRAPH-115] forces publishSigned; version is now in version.sbt, to enable using sbt-release-plugin
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/a772061d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/a772061d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/a772061d
Branch: refs/heads/master
Commit: a772061d7f8630f729b69c952cdf03821bf2c883
Parents: 04b731e
Author: Jong Wook Kim <jo...@nyu.edu>
Authored: Mon Nov 7 19:23:07 2016 -0500
Committer: Jong Wook Kim <jo...@nyu.edu>
Committed: Mon Nov 7 19:24:07 2016 -0500
----------------------------------------------------------------------
build.sbt | 16 +++++++++++++---
project/Publisher.scala | 2 ++
version.sbt | 1 +
3 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/a772061d/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index ae3efb3..dc15792 100755
--- a/build.sbt
+++ b/build.sbt
@@ -18,6 +18,7 @@
*/
import ReleaseTransformations._
+import PgpKeys._
import sbt.complete.Parsers.spaceDelimited
name := "s2graph"
@@ -25,7 +26,6 @@ name := "s2graph"
lazy val commonSettings = Seq(
organization := "org.apache.s2graph",
scalaVersion := "2.11.7",
- version := "0.1.1-SNAPSHOT",
isSnapshot := version.value.endsWith("-SNAPSHOT"),
scalacOptions := Seq("-language:postfixOps", "-unchecked", "-deprecation", "-feature", "-Xlint", "-Xlint:-missing-interpolator"),
javaOptions ++= collection.JavaConversions.propertiesAsScalaMap(System.getProperties).map { case (key, value) => "-D" + key + "=" + value }.toSeq,
@@ -77,6 +77,16 @@ runRatTask := {
Packager.defaultSettings
+publishSigned := {
+ (publishSigned in s2rest_play).value
+ (publishSigned in s2rest_netty).value
+ (publishSigned in s2core).value
+ (publishSigned in spark).value
+ (publishSigned in loader).value
+ (publishSigned in s2counter_core).value
+ (publishSigned in s2counter_loader).value
+}
+
releaseProcess := Seq[ReleaseStep](
checkSnapshotDependencies, // : ReleaseStep
inquireVersions, // : ReleaseStep
@@ -89,6 +99,6 @@ releaseProcess := Seq[ReleaseStep](
commitNextVersion
)
-releasePublishArtifactsAction := PgpKeys.publishSigned.value
+releasePublishArtifactsAction := publishSigned.value
-mainClass in (Compile) := None
\ No newline at end of file
+mainClass in Compile := None
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/a772061d/project/Publisher.scala
----------------------------------------------------------------------
diff --git a/project/Publisher.scala b/project/Publisher.scala
index add1279..ed3bdab 100644
--- a/project/Publisher.scala
+++ b/project/Publisher.scala
@@ -3,7 +3,9 @@ import sbt._
import scala.xml.XML
object Publisher {
+
val defaultSettings = Seq(
+ publish := {}, // disable unsigned publishing
publishMavenStyle := true,
publishTo := {
if (isSnapshot.value) {
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/a772061d/version.sbt
----------------------------------------------------------------------
diff --git a/version.sbt b/version.sbt
new file mode 100644
index 0000000..d95fe6f
--- /dev/null
+++ b/version.sbt
@@ -0,0 +1 @@
+version in ThisBuild := "0.1.1-SNAPSHOT"
\ No newline at end of file
[3/4] incubator-s2graph git commit: [S2GRAPH-115] prints an error
message when running 'publish' task, suggesting to run 'publishSigned'
Posted by st...@apache.org.
[S2GRAPH-115] prints an error message when running 'publish' task, suggesting to run 'publishSigned'
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/0e87804c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/0e87804c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/0e87804c
Branch: refs/heads/master
Commit: 0e87804c144236da4d217bd16a5fce9b56e49ce3
Parents: a772061
Author: Jong Wook Kim <jo...@nyu.edu>
Authored: Tue Nov 8 01:09:17 2016 -0500
Committer: Jong Wook Kim <jo...@nyu.edu>
Committed: Tue Nov 8 01:09:17 2016 -0500
----------------------------------------------------------------------
project/Publisher.scala | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/0e87804c/project/Publisher.scala
----------------------------------------------------------------------
diff --git a/project/Publisher.scala b/project/Publisher.scala
index ed3bdab..49364e4 100644
--- a/project/Publisher.scala
+++ b/project/Publisher.scala
@@ -5,7 +5,9 @@ import scala.xml.XML
object Publisher {
val defaultSettings = Seq(
- publish := {}, // disable unsigned publishing
+ publish := {
+ streams.value.log.error("use publishSigned task instead, to produce code-signed artifacts")
+ },
publishMavenStyle := true,
publishTo := {
if (isSnapshot.value) {