Skip to content

Commit 35fad66

Browse files
komamitsukomamitsu
committed
Merge pull request msgpack#225 from xerial/sbt-sonatype-0.3.3
Upgrade to sbt-sonatype-0.5.0
2 parents d3c96c3 + 9576984 commit 35fad66

File tree

4 files changed

+56
-75
lines changed

4 files changed

+56
-75
lines changed

‎project/Build.scala‎

Lines changed: 8 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ import sbtrelease.ReleasePlugin._
2525
import sbtrelease.ReleaseStateTransformations._
2626
import sbtrelease.ReleaseStep
2727
import scala.util.Properties
28-
import com.typesafe.sbt.pgp.PgpKeys
29-
import xerial.sbt.Sonatype.SonatypeKeys._
3028

3129
object Build extends Build {
3230

@@ -42,21 +40,13 @@ object Build extends Build {
4240
organizationHomepage := Some(new URL("http://msgpack.org/")),
4341
description := "MessagePack for Java",
4442
scalaVersion in Global := SCALA_VERSION,
45-
ReleaseKeys.publishArtifactsAction := PgpKeys.publishSigned.value,
4643
logBuffered in Test := false,
4744
//parallelExecution in Test := false,
4845
autoScalaLibrary := false,
4946
crossPaths := false,
5047
concurrentRestrictions in Global := Seq(
5148
Tags.limit(Tags.Test, 1)
5249
),
53-
publishTo := {
54-
val nexus = "https://oss.sonatype.org/"
55-
if (isSnapshot.value)
56-
Some("snapshots" at nexus + "content/repositories/snapshots")
57-
else
58-
Some("releases" at nexus + "service/local/staging/deploy/maven2")
59-
},
6050
ReleaseKeys.tagName <<= (version in ThisBuild) map (v => v),
6151
ReleaseKeys.releaseProcess := Seq[ReleaseStep](
6252
checkSnapshotDependencies,
@@ -66,18 +56,10 @@ object Build extends Build {
6656
setReleaseVersion,
6757
commitReleaseVersion,
6858
tagRelease,
69-
ReleaseStep(
70-
action = { state =>
71-
val extracted = Project extract state
72-
extracted.runAggregated(PgpKeys.publishSigned in Global in extracted.get(thisProjectRef), state)
73-
}
74-
),
59+
ReleaseStep(action = Command.process("publishSigned", _)),
7560
setNextVersion,
7661
commitNextVersion,
77-
ReleaseStep{ state =>
78-
val extracted = Project extract state
79-
extracted.runAggregated(sonatypeReleaseAll in Global in extracted.get(thisProjectRef), state)
80-
},
62+
ReleaseStep(action = Command.process("sonatypeReleaseAll", _)),
8163
pushChanges
8264
),
8365
parallelExecution in jacoco.Config := false,
@@ -95,70 +77,24 @@ object Build extends Build {
9577
opts
9678
},
9779
findbugsReportType := Some(ReportType.FancyHtml),
98-
findbugsReportPath := Some(crossTarget.value / "findbugs" / "report.html"),
99-
pomExtra := {
100-
<url>http://msgpack.org/</url>
101-
<licenses>
102-
<license>
103-
<name>Apache 2</name>
104-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
105-
</license>
106-
</licenses>
107-
<scm>
108-
<connection>scm:git:github.com/msgpack/msgpack-java.git</connection>
109-
<developerConnection>scm:git:git@github.com:msgpack/msgpack-java.git</developerConnection>
110-
<url>github.com/msgpack/msgpack-java.git</url>
111-
</scm>
112-
<properties>
113-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
114-
</properties>
115-
<developers>
116-
<developer>
117-
<id>frsyuki</id>
118-
<name>Sadayuki Furuhashi</name>
119-
<email>frsyuki@users.sourceforge.jp</email>
120-
</developer>
121-
<developer>
122-
<id>muga</id>
123-
<name>Muga Nishizawa</name>
124-
<email>muga.nishizawa@gmail.com</email>
125-
</developer>
126-
<developer>
127-
<id>oza</id>
128-
<name>Tsuyoshi Ozawa</name>
129-
<url>https://github.com/oza</url>
130-
</developer>
131-
<developer>
132-
<id>komamitsu</id>
133-
<name>Mitsunori Komatsu</name>
134-
<email>komamitsu@gmail.com</email>
135-
</developer>
136-
<developer>
137-
<id>xerial</id>
138-
<name>Taro L. Saito</name>
139-
<email>leo@xerial.org</email>
140-
</developer>
141-
</developers>
142-
}
80+
findbugsReportPath := Some(crossTarget.value / "findbugs" / "report.html")
14381
)
14482

14583
import Dependencies._
14684

147-
14885
lazy val root = Project(
14986
id = "msgpack-java",
15087
base = file("."),
15188
settings = buildSettings ++ Seq(
152-
findbugs := {
153-
// do not run findbugs for the root project
154-
},
15589
// Do not publish the root project
15690
publishArtifact := false,
15791
publish := {},
158-
publishLocal := {}
92+
publishLocal := {},
93+
findbugs := {
94+
// do not run findbugs for the root project
95+
}
15996
)
160-
) aggregate(msgpackCore, msgpackJackson)
161-
97+
).aggregate(msgpackCore, msgpackJackson)
16298

16399
lazy val msgpackCore = Project(
164100
id = "msgpack-core",

‎project/plugins.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.5")
33

4-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.2.1")
4+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.5.0")
55

66
addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3")
77

‎sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ init_default_option_file () {
119119

120120
declare -r cms_opts="-XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC"
121121
declare -r jit_opts="-XX:ReservedCodeCacheSize=256m -XX:+TieredCompilation"
122-
declare -r default_jvm_opts="-ea -Dfile.encoding=UTF8 -XX:MaxPermSize=384m -Xms512m -Xmx1536m -Xss2m $jit_opts $cms_opts"
122+
declare -r default_jvm_opts="-ea -Dfile.encoding=UTF8 -Xms512m -Xmx1536m -Xss2m $jit_opts $cms_opts"
123123
declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy"
124124
declare -r latest_28="2.8.2"
125125
declare -r latest_29="2.9.3"

‎sonatype.sbt‎

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,46 @@
1-
sonatypeSettings
1+
sonatypeProfileName := "org.msgpack"
2+
3+
pomExtra := {
4+
<url>http://msgpack.org/</url>
5+
<licenses>
6+
<license>
7+
<name>Apache 2</name>
8+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
9+
</license>
10+
</licenses>
11+
<scm>
12+
<connection>scm:git:github.com/msgpack/msgpack-java.git</connection>
13+
<developerConnection>scm:git:git@github.com:msgpack/msgpack-java.git</developerConnection>
14+
<url>github.com/msgpack/msgpack-java.git</url>
15+
</scm>
16+
<properties>
17+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18+
</properties>
19+
<developers>
20+
<developer>
21+
<id>frsyuki</id>
22+
<name>Sadayuki Furuhashi</name>
23+
<email>frsyuki@users.sourceforge.jp</email>
24+
</developer>
25+
<developer>
26+
<id>muga</id>
27+
<name>Muga Nishizawa</name>
28+
<email>muga.nishizawa@gmail.com</email>
29+
</developer>
30+
<developer>
31+
<id>oza</id>
32+
<name>Tsuyoshi Ozawa</name>
33+
<url>https://github.com/oza</url>
34+
</developer>
35+
<developer>
36+
<id>komamitsu</id>
37+
<name>Mitsunori Komatsu</name>
38+
<email>komamitsu@gmail.com</email>
39+
</developer>
40+
<developer>
41+
<id>xerial</id>
42+
<name>Taro L. Saito</name>
43+
<email>leo@xerial.org</email>
44+
</developer>
45+
</developers>
46+
}

0 commit comments

Comments
 (0)