From 5f9eb46cb757f16b817ba0216096a852dd3556a7 Mon Sep 17 00:00:00 2001 From: xerial-bot Date: Sat, 28 Jan 2023 08:15:44 +0000 Subject: [PATCH 1/3] Update airframe-log to 23.1.4 --- build.sbt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/build.sbt b/build.sbt index 8850ea27..eabb96e2 100644 --- a/build.sbt +++ b/build.sbt @@ -1,14 +1,14 @@ Global / onChangedBuildSource := ReloadOnSourceChanges -name := "snappy-java" -organization := "org.xerial.snappy" +name := "snappy-java" +organization := "org.xerial.snappy" organizationName := "xerial.org" -description := "snappy-java: A fast compression/decompression library" +description := "snappy-java: A fast compression/decompression library" -sonatypeProfileName := "org.xerial" +sonatypeProfileName := "org.xerial" ThisBuild / publishTo := sonatypePublishToBundle.value -licenses := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0.html")) -homepage := Some(url("https://github.com/xerial/snappy-java")) +licenses := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0.html")) +homepage := Some(url("https://github.com/xerial/snappy-java")) scmInfo := Some( ScmInfo( browseUrl = url("https://github.com/xerial/snappy-java"), @@ -57,27 +57,27 @@ testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v") Test / parallelExecution := false autoScalaLibrary := false -crossPaths := false +crossPaths := false libraryDependencies ++= Seq( "junit" % "junit" % "4.13.2" % "test", "org.codehaus.plexus" % "plexus-classworlds" % "2.7.0" % "test", "org.xerial.java" % "xerial-core" % "2.1" % "test", - "org.wvlet.airframe" %% "airframe-log" % "22.12.6" % "test", + "org.wvlet.airframe" %% "airframe-log" % "23.1.4" % "test", "org.osgi" % "org.osgi.core" % "4.3.0" % "provided", "com.github.sbt" % "junit-interface" % "0.13.3" % "test", - "org.apache.hadoop" % "hadoop-common" % "2.10.2" % "test" exclude ("org.xerial.snappy", "snappy-java") + "org.apache.hadoop" % "hadoop-common" % "2.10.2" % "test" exclude ("org.xerial.snappy", "snappy-java") ) enablePlugins(SbtOsgi) osgiSettings -OsgiKeys.exportPackage := Seq("org.xerial.snappy", "org.xerial.snappy.buffer", "org.xerial.snappy.pool") +OsgiKeys.exportPackage := Seq("org.xerial.snappy", "org.xerial.snappy.buffer", "org.xerial.snappy.pool") OsgiKeys.bundleSymbolicName := "org.xerial.snappy.snappy-java" -OsgiKeys.bundleActivator := Option("org.xerial.snappy.SnappyBundleActivator") -OsgiKeys.importPackage := Seq("""org.osgi.framework;version="[1.5,2)"""") -OsgiKeys.requireCapability := """osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.7))"""" +OsgiKeys.bundleActivator := Option("org.xerial.snappy.SnappyBundleActivator") +OsgiKeys.importPackage := Seq("""org.osgi.framework;version="[1.5,2)"""") +OsgiKeys.requireCapability := """osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.7))"""" OsgiKeys.additionalHeaders := Map( "Bundle-NativeCode" -> Seq( From b793b3a91cf24f8c2c53cd620e6d6176daecf8ae Mon Sep 17 00:00:00 2001 From: xerial-bot Date: Sat, 28 Jan 2023 12:15:51 +0000 Subject: [PATCH 2/3] Revert commit(s) 5f9eb46 --- build.sbt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/build.sbt b/build.sbt index eabb96e2..8850ea27 100644 --- a/build.sbt +++ b/build.sbt @@ -1,14 +1,14 @@ Global / onChangedBuildSource := ReloadOnSourceChanges -name := "snappy-java" -organization := "org.xerial.snappy" +name := "snappy-java" +organization := "org.xerial.snappy" organizationName := "xerial.org" -description := "snappy-java: A fast compression/decompression library" +description := "snappy-java: A fast compression/decompression library" -sonatypeProfileName := "org.xerial" +sonatypeProfileName := "org.xerial" ThisBuild / publishTo := sonatypePublishToBundle.value -licenses := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0.html")) -homepage := Some(url("https://github.com/xerial/snappy-java")) +licenses := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0.html")) +homepage := Some(url("https://github.com/xerial/snappy-java")) scmInfo := Some( ScmInfo( browseUrl = url("https://github.com/xerial/snappy-java"), @@ -57,27 +57,27 @@ testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v") Test / parallelExecution := false autoScalaLibrary := false -crossPaths := false +crossPaths := false libraryDependencies ++= Seq( "junit" % "junit" % "4.13.2" % "test", "org.codehaus.plexus" % "plexus-classworlds" % "2.7.0" % "test", "org.xerial.java" % "xerial-core" % "2.1" % "test", - "org.wvlet.airframe" %% "airframe-log" % "23.1.4" % "test", + "org.wvlet.airframe" %% "airframe-log" % "22.12.6" % "test", "org.osgi" % "org.osgi.core" % "4.3.0" % "provided", "com.github.sbt" % "junit-interface" % "0.13.3" % "test", - "org.apache.hadoop" % "hadoop-common" % "2.10.2" % "test" exclude ("org.xerial.snappy", "snappy-java") + "org.apache.hadoop" % "hadoop-common" % "2.10.2" % "test" exclude ("org.xerial.snappy", "snappy-java") ) enablePlugins(SbtOsgi) osgiSettings -OsgiKeys.exportPackage := Seq("org.xerial.snappy", "org.xerial.snappy.buffer", "org.xerial.snappy.pool") +OsgiKeys.exportPackage := Seq("org.xerial.snappy", "org.xerial.snappy.buffer", "org.xerial.snappy.pool") OsgiKeys.bundleSymbolicName := "org.xerial.snappy.snappy-java" -OsgiKeys.bundleActivator := Option("org.xerial.snappy.SnappyBundleActivator") -OsgiKeys.importPackage := Seq("""org.osgi.framework;version="[1.5,2)"""") -OsgiKeys.requireCapability := """osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.7))"""" +OsgiKeys.bundleActivator := Option("org.xerial.snappy.SnappyBundleActivator") +OsgiKeys.importPackage := Seq("""org.osgi.framework;version="[1.5,2)"""") +OsgiKeys.requireCapability := """osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.7))"""" OsgiKeys.additionalHeaders := Map( "Bundle-NativeCode" -> Seq( From 0cdc10818de898c9c20b669af1728d9311f7a602 Mon Sep 17 00:00:00 2001 From: xerial-bot Date: Sat, 28 Jan 2023 12:15:53 +0000 Subject: [PATCH 3/3] Update airframe-log to 23.1.4 --- build.sbt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index 97a7ff48..c196f200 100644 --- a/build.sbt +++ b/build.sbt @@ -65,13 +65,13 @@ autoScalaLibrary := false crossPaths := false libraryDependencies ++= Seq( - "junit" % "junit" % "4.13.2" % "test", - "org.codehaus.plexus" % "plexus-classworlds" % "2.7.0" % "test", - "org.xerial.java" % "xerial-core" % "2.1" % "test", - "org.wvlet.airframe" %% "airframe-log" % "22.12.6" % "test", - "org.osgi" % "org.osgi.core" % "4.3.0" % "provided", - "com.github.sbt" % "junit-interface" % "0.13.3" % "test", - "org.apache.hadoop" % "hadoop-common" % "2.10.2" % "test" exclude ("org.xerial.snappy", "snappy-java") + "junit" % "junit" % "4.13.2" % "test", + "org.codehaus.plexus" % "plexus-classworlds" % "2.7.0" % "test", + "org.xerial.java" % "xerial-core" % "2.1" % "test", + "org.wvlet.airframe" %% "airframe-log" % "23.1.4" % "test", + "org.osgi" % "org.osgi.core" % "4.3.0" % "provided", + "com.github.sbt" % "junit-interface" % "0.13.3" % "test", + "org.apache.hadoop" % "hadoop-common" % "2.10.2" % "test" exclude ("org.xerial.snappy", "snappy-java") ) enablePlugins(SbtOsgi)