Skip to content

Commit

Permalink
Fix stray com.typesafe.sbt org references
Browse files Browse the repository at this point in the history
  • Loading branch information
mdedetrich committed Jan 26, 2024
1 parent a0284b6 commit cb54d9b
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ sbt-osgi can be configured with the following settings:
Example `build.sbt`:

```
organization := "com.typesafe.sbt"
organization := "com.github.sbt"
name := "osgi.demo"
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-osgi/test-00-defaults/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
lazy val test00 = (project in file("")).enablePlugins(SbtOsgi)

organization := "com.typesafe.sbt"
organization := "com.github.sbt"

name := "sbt-osgi-test"

Expand Down
10 changes: 5 additions & 5 deletions src/sbt-test/sbt-osgi/test-01-contents/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
lazy val test01 = (project in file(".")).enablePlugins(SbtOsgi)

organization := "com.typesafe.sbt"
organization := "com.github.sbt"

name := "sbt-osgi-test"

Expand Down Expand Up @@ -47,10 +47,10 @@ TaskKey[Unit]("verifyBundle") := {
sys.error("Expected 'Bundle-Name: sbt-osgi-test' in manifest!" + butWas)
if (!(lines contains "Bundle-RequiredExecutionEnvironment: JavaSE-1.7,JavaSE-1.8"))
sys.error("Expected 'Bundle-RequiredExecutionEnvironment: JavaSE-1.7,JavaSE-1.8' in manifest!" + butWas)
if (!(lines contains "Bundle-Vendor: com.typesafe.sbt"))
sys.error("Expected 'Bundle-Vendor: com.typesafe.sbt' in manifest!" + butWas)
if (!(lines contains "Bundle-SymbolicName: com.typesafe.sbt.osgi.test"))
sys.error("Expected 'Bundle-SymbolicName: com.typesafe.sbt.osgi.test' in manifest!" + butWas)
if (!(lines contains "Bundle-Vendor: com.github.sbt"))
sys.error("Expected 'Bundle-Vendor: com.github.sbt' in manifest!" + butWas)
if (!(lines contains "Bundle-SymbolicName: com.github.sbt.osgi.test"))
sys.error("Expected 'Bundle-SymbolicName: com.github.sbt.osgi.test' in manifest!" + butWas)
if (!(lines contains "Bundle-Version: 1.2.3"))
sys.error("Expected 'Bundle-Version: 1.2.3' in manifest!" + butWas)
if (!(lines contains "DynamicImport-Package: scala.*"))
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-osgi/test-02-includeresource/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
lazy val test02 = (project in file("")).enablePlugins(SbtOsgi)

organization := "com.typesafe.sbt"
organization := "com.github.sbt"

name := "sbt-osgi-test"

Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-osgi/test-03-arbitraryHeaders/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
lazy val test03 = (project in file("")).enablePlugins(SbtOsgi)

organization := "com.typesafe.sbt"
organization := "com.github.sbt"

name := "sbt-osgi-test"

Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-osgi/test-04-embeddedJars/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
lazy val test04 = (project in file("")).enablePlugins(SbtOsgi)

organization := "com.typesafe.sbt"
organization := "com.github.sbt"

name := "sbt-osgi-test"

Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-osgi/test-06-explodedJars/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
lazy val test06 = (project in file("")).enablePlugins(SbtOsgi)

organization := "com.typesafe.sbt"
organization := "com.github.sbt"

name := "sbt-osgi-test"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
lazy val test01 = (project in file(".")).enablePlugins(SbtOsgi)

organization := "com.typesafe.sbt"
organization := "com.github.sbt"

name := "sbt-osgi-test"

Expand Down Expand Up @@ -55,10 +55,10 @@ TaskKey[Unit]("verifyBundle") := {
sys.error("Expected 'Bundle-Name: sbt-osgi-test' in manifest!" + butWas)
if (!(lines contains "Bundle-RequiredExecutionEnvironment: JavaSE-1.7,JavaSE-1.8"))
sys.error("Expected 'Bundle-RequiredExecutionEnvironment: JavaSE-1.7,JavaSE-1.8' in manifest!" + butWas)
if (!(lines contains "Bundle-Vendor: com.typesafe.sbt"))
sys.error("Expected 'Bundle-Vendor: com.typesafe.sbt' in manifest!" + butWas)
if (!(lines contains "Bundle-SymbolicName: com.typesafe.sbt.osgi.test"))
sys.error("Expected 'Bundle-SymbolicName: com.typesafe.sbt.osgi.test' in manifest!" + butWas)
if (!(lines contains "Bundle-Vendor: com.github.sbt"))
sys.error("Expected 'Bundle-Vendor: com.github.sbt' in manifest!" + butWas)
if (!(lines contains "Bundle-SymbolicName: com.github.sbt.osgi.test"))
sys.error("Expected 'Bundle-SymbolicName: com.github.sbt.osgi.test' in manifest!" + butWas)
if (!(lines contains "Bundle-Version: 1.2.3"))
sys.error("Expected 'Bundle-Version: 1.2.3' in manifest!" + butWas)
if (!(lines contains "DynamicImport-Package: scala.*"))
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-osgi/test-08-packageWithJVMJar/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
lazy val test08 = (project in file("")).enablePlugins(SbtOsgi)

organization := "com.typesafe.sbt"
organization := "com.github.sbt"

name := "sbt-osgi-test"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
lazy val test01 = (project in file(".")).enablePlugins(SbtOsgi)

organization := "com.typesafe.sbt"
organization := "com.github.sbt"

name := "sbt-osgi-test"

Expand Down Expand Up @@ -56,10 +56,10 @@ TaskKey[Unit]("verifyBundle") := {
sys.error("Expected 'Bundle-Name: sbt-osgi-test' in manifest!" + butWas)
if (!(lines contains "Bundle-RequiredExecutionEnvironment: JavaSE-1.7,JavaSE-1.8"))
sys.error("Expected 'Bundle-RequiredExecutionEnvironment: JavaSE-1.7,JavaSE-1.8' in manifest!" + butWas)
if (!(lines contains "Bundle-Vendor: com.typesafe.sbt"))
sys.error("Expected 'Bundle-Vendor: com.typesafe.sbt' in manifest!" + butWas)
if (!(lines contains "Bundle-SymbolicName: com.typesafe.sbt.osgi.test"))
sys.error("Expected 'Bundle-SymbolicName: com.typesafe.sbt.osgi.test' in manifest!" + butWas)
if (!(lines contains "Bundle-Vendor: com.github.sbt"))
sys.error("Expected 'Bundle-Vendor: com.github.sbt' in manifest!" + butWas)
if (!(lines contains "Bundle-SymbolicName: com.github.sbt.osgi.test"))
sys.error("Expected 'Bundle-SymbolicName: com.github.sbt.osgi.test' in manifest!" + butWas)
if (!(lines contains "Bundle-Version: 1.2.3"))
sys.error("Expected 'Bundle-Version: 1.2.3' in manifest!" + butWas)
if (!(lines contains "DynamicImport-Package: scala.*"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import com.typesafe.sbt.osgi.OsgiKeys

inThisBuild(
Seq(
organization := "com.typesafe.sbt",
organization := "com.github.sbt",
homepage := Some(url("https://github.com/woq-blended/blended")),
version := "1.2.3",
libraryDependencies += "org.osgi" % "org.osgi.core" % "4.3.0" % "provided",
Expand Down

0 comments on commit cb54d9b

Please sign in to comment.