Fix msgpack#145: msgpack-{core,jackson}-0.7.0-M5 release. Fix sbt scripts to allow multi-module project deployment

xerial · xerial · commit 45aceadc3553 · 2014-11-13T17:27:37.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessageFormat.java b/msgpack-core/src/main/java/org/msgpack/core/MessageFormat.java
@@ -61,7 +61,7 @@ private MessageFormat(ValueType valueType) {
 
     /**
      * Retruns the ValueType corresponding to this MessageFormat
-     * @return
+     * @return value type
      * @throws MessageFormatException if this == NEVER_USED type
      */
     public ValueType getValueType() throws MessageFormatException {
@@ -82,7 +82,7 @@ public ValueType getValueType() throws MessageFormatException {
 
     /**
      * Returns a MessageFormat type of the specified byte value
-     * @param b
+     * @param b MessageFormat of the given byte
      * @return
      */
     public static MessageFormat valueOf(final byte b) {
@@ -91,7 +91,7 @@ public static MessageFormat valueOf(final byte b) {
 
     /**
      * Converting a byte value into MessageFormat. For faster performance, use {@link #valueOf}
-     * @param b
+     * @param b MessageFormat of the given byte
      * @return
      */
     @VisibleForTesting
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java
@@ -50,13 +50,13 @@
  *     while(unpacker.hasNext()) {
  *         MessageFormat f = unpacker.getNextFormat();
  *         switch(f) {
- *             case MessageFormat.POSFIXINT =>
- *             case MessageFormat.INT8 =>
- *             case MessageFormat.UINT8 => {
+ *             case MessageFormat.POSFIXINT:
+ *             case MessageFormat.INT8:
+ *             case MessageFormat.UINT8: {
  *                int v = unpacker.unpackInt();
  *                break;
  *             }
- *             case MessageFormat.STRING => {
+ *             case MessageFormat.STRING: {
  *                String v = unpacker.unpackString();
  *                break;
  *             }
diff --git a/project/Build.scala b/project/Build.scala
@@ -29,7 +29,6 @@ object Build extends Build {
   val SCALA_VERSION = "2.11.1"
 
   lazy val buildSettings = Defaults.coreDefaultSettings ++
-    sonatypeSettings ++
     releaseSettings ++
     findbugsSettings ++
     jacoco.settings ++
@@ -46,13 +45,21 @@ object Build extends Build {
       concurrentRestrictions in Global := Seq(
         Tags.limit(Tags.Test, 1)
       ),
+      publishTo := {
+        val nexus = "https://oss.sonatype.org/"
+        if (isSnapshot.value)
+          Some("snapshots" at nexus + "content/repositories/snapshots")
+        else
+          Some("releases" at nexus + "service/local/staging/deploy/maven2")
+      },
       parallelExecution in jacoco.Config := false,
       // Since sbt-0.13.2
       incOptions := incOptions.value.withNameHashing(true),
       //resolvers += Resolver.mavenLocal,
       scalacOptions ++= Seq("-encoding", "UTF-8", "-deprecation", "-unchecked", "-target:jvm-1.6", "-feature"),
       javaOptions in Test ++= Seq("-ea"),
       javacOptions in (Compile, compile) ++= Seq("-encoding", "UTF-8", "-Xlint:unchecked", "-Xlint:deprecation", "-source", "1.6", "-target", "1.6"),
+      javacOptions in doc := Seq("-source", "1.6", "-Xdoclint:none"),
       findbugsReportType := Some(ReportType.FancyHtml),
       findbugsReportPath := Some(crossTarget.value / "findbugs" / "report.html"),
       pomExtra := {
diff --git a/sonatype.sbt b/sonatype.sbt
@@ -0,0 +1 @@
+sonatypeSettings
diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.7.0-p1"
+version in ThisBuild := "0.7.0-M5"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-version in ThisBuild := "0.7.0-p1"`
	`1`	`+version in ThisBuild := "0.7.0-M5"`