Add release registry target to craft

.craft.yml

@@ -8,7 +8,6 @@ statusProvider:
 artifactProvider:
   name: github
 targets:
-  - name: bintray
   - name: github
   - name: registry
     type: sdk
@@ -34,6 +33,14 @@ targets:
     type: sdk
     config:
       canonical: "maven:io.sentry:sentry-log4j2"
+  - name: registry
+    type: sdk
+    config:
+      canonical: "maven:io.sentry:sentry-jul"
+  - name: registry
+    type: sdk
+    config:
+      canonical: "maven:io.sentry:sentry-apache-http-client-5"
   - name: registry
     type: sdk
     config:

CHANGELOG.md

@@ -9,6 +9,7 @@
 * Enchancement: Support @SentrySpan and @SentryTransaction on classes and interfaces. (#1243)
 * Enchancement: Do not serialize empty collections and maps (#1245)
 * Ref: Simplify RestTemplate instrumentation (#1246)
+* Ref: Prefix sdk.package names with io.sentry (#1249)
 * Fix: Make the ANR Atomic flags immutable
 * Enchancement: Integration interface better compatibility with Kotlin null-safety
 

sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroidOptions.java

@@ -49,7 +49,7 @@ public SentryAndroidOptions() {
     final String version = BuildConfig.VERSION_NAME;
     sdkVersion = SdkVersion.updateSdkVersion(sdkVersion, name, version);
 
-    sdkVersion.addPackage("maven:sentry-android-core", version);
+    sdkVersion.addPackage("maven:io.sentry:sentry-android-core", version);
 
     return sdkVersion;
   }

sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidOptionsTest.kt

@@ -27,12 +27,12 @@ class SentryAndroidOptionsTest {
         assertEquals(BuildConfig.VERSION_NAME, sdkVersion.version)
 
         assertTrue(sdkVersion.packages!!.any {
-            it.name == "maven:sentry-android-core" &&
+            it.name == "maven:io.sentry:sentry-android-core" &&
             it.version == BuildConfig.VERSION_NAME
         })
 
         assertTrue(sdkVersion.packages!!.any {
-            it.name == "maven:sentry" &&
+            it.name == "maven:io.sentry:sentry" &&
             it.version == BuildConfig.VERSION_NAME
         })
     }

sentry-android-ndk/src/main/java/io/sentry/android/ndk/SentryNdkUtil.java

@@ -19,6 +19,6 @@ static void addPackage(@Nullable final SdkVersion sdkVersion) {
     if (sdkVersion == null) {
       return;
     }
-    sdkVersion.addPackage("maven:sentry-android-ndk", BuildConfig.VERSION_NAME);
+    sdkVersion.addPackage("maven:io.sentry:sentry-android-ndk", BuildConfig.VERSION_NAME);
   }
 }

sentry-android-ndk/src/test/java/io/sentry/android/ndk/SentryNdkUtilTest.kt

@@ -12,7 +12,7 @@ class SentryNdkUtilTest {
         val options = SentryOptions()
         SentryNdkUtil.addPackage(options.sdkVersion)
         assertTrue(options.sdkVersion!!.packages!!.any {
-            it.name == "maven:sentry-android-ndk"
+            it.name == "maven:io.sentry:sentry-android-ndk"
             it.version == BuildConfig.VERSION_NAME
         })
     }

sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberIntegration.kt

@@ -40,6 +40,6 @@ class SentryTimberIntegration(
     }
 
     private fun addPackage(sdkVersion: SdkVersion?) {
-        sdkVersion?.addPackage("maven:sentry-android-timber", BuildConfig.VERSION_NAME)
+        sdkVersion?.addPackage("maven:io.sentry:sentry-android-timber", BuildConfig.VERSION_NAME)
     }
 }

sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberIntegrationTest.kt

@@ -92,7 +92,7 @@ class SentryTimberIntegrationTest {
         sut.register(fixture.hub, fixture.options)
 
         assertTrue(fixture.options.sdkVersion!!.packages!!.any {
-            it.name == "maven:sentry-android-timber"
+            it.name == "maven:io.sentry:sentry-android-timber"
             it.version == BuildConfig.VERSION_NAME
         })
     }

sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java

@@ -245,7 +245,7 @@ public void close() throws SecurityException {
     final String version = BuildConfig.VERSION_NAME;
 
     sdkVersion = SdkVersion.updateSdkVersion(sdkVersion, name, version);
-    sdkVersion.addPackage("maven:sentry-jul", version);
+    sdkVersion.addPackage("maven:io.sentry:sentry-jul", version);
 
     return sdkVersion;
   }

sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt

@@ -312,7 +312,7 @@ class SentryHandlerTest {
                     assertEquals(BuildConfig.VERSION_NAME, it.version)
                     assertNotNull(it.packages)
                     assertTrue(it.packages!!.any { pkg ->
-                        "maven:sentry-jul" == pkg.name &&
+                        "maven:io.sentry:sentry-jul" == pkg.name &&
                             BuildConfig.VERSION_NAME == pkg.version
                     })
                 }

sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java

@@ -209,7 +209,7 @@ public void append(final @NotNull LogEvent eventObject) {
     final String version = BuildConfig.VERSION_NAME;
     sdkVersion = SdkVersion.updateSdkVersion(sdkVersion, name, version);
 
-    sdkVersion.addPackage("maven:sentry-log4j2", version);
+    sdkVersion.addPackage("maven:io.sentry:sentry-log4j2", version);
 
     return sdkVersion;
   }

sentry-log4j2/src/test/kotlin/io/sentry/log4j2/SentryAppenderTest.kt

@@ -251,7 +251,7 @@ class SentryAppenderTest {
                     assertEquals(BuildConfig.VERSION_NAME, it.version)
                     assertNotNull(it.packages)
                     assertTrue(it.packages!!.any { pkg ->
-                        "maven:sentry-log4j2" == pkg.name &&
+                        "maven:io.sentry:sentry-log4j2" == pkg.name &&
                             BuildConfig.VERSION_NAME == pkg.version
                     })
                 }

sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java

@@ -144,7 +144,7 @@ protected void append(@NotNull ILoggingEvent eventObject) {
     final String version = BuildConfig.VERSION_NAME;
     sdkVersion = SdkVersion.updateSdkVersion(sdkVersion, name, version);
 
-    sdkVersion.addPackage("maven:sentry-logback", version);
+    sdkVersion.addPackage("maven:io.sentry:sentry-logback", version);
 
     return sdkVersion;
   }

sentry-logback/src/test/kotlin/io/sentry/logback/SentryAppenderTest.kt

@@ -227,7 +227,7 @@ class SentryAppenderTest {
                     assertEquals(BuildConfig.VERSION_NAME, it.version)
                     assertNotNull(it.packages)
                     assertTrue(it.packages!!.any { pkg ->
-                        "maven:sentry-logback" == pkg.name &&
+                        "maven:io.sentry:sentry-logback" == pkg.name &&
                             BuildConfig.VERSION_NAME == pkg.version
                     })
                 }

sentry-spring-boot-starter/src/main/java/io/sentry/spring/boot/SentryAutoConfiguration.java

@@ -195,7 +195,7 @@ static class ApacheHttpClientTransportFactoryAutoconfiguration {
       final String version = BuildConfig.VERSION_NAME;
       sdkVersion = SdkVersion.updateSdkVersion(sdkVersion, name, version);
 
-      sdkVersion.addPackage("maven:sentry-spring-boot-starter", version);
+      sdkVersion.addPackage("maven:io.sentry:sentry-spring-boot-starter", version);
 
       return sdkVersion;
     }

sentry-spring-boot-starter/src/test/kotlin/io/sentry/spring/boot/SentryAutoConfigurationTest.kt

@@ -192,7 +192,7 @@ class SentryAutoConfigurationTest {
                         assertThat(sdk.version).isEqualTo(BuildConfig.VERSION_NAME)
                         assertThat(sdk.name).isEqualTo(BuildConfig.SENTRY_SPRING_BOOT_SDK_NAME)
                         assertThat(sdk.packages).anyMatch { pkg ->
-                            pkg.name == "maven:sentry-spring-boot-starter" && pkg.version == BuildConfig.VERSION_NAME
+                            pkg.name == "maven:io.sentry:sentry-spring-boot-starter" && pkg.version == BuildConfig.VERSION_NAME
                         }
                     }, anyOrNull())
                 }

sentry-spring/src/main/java/io/sentry/spring/SentryHubRegistrar.java

@@ -77,7 +77,7 @@ private void registerSentryExceptionResolver(
     final String version = BuildConfig.VERSION_NAME;
     sdkVersion = SdkVersion.updateSdkVersion(sdkVersion, name, version);
 
-    sdkVersion.addPackage("maven:sentry-spring", version);
+    sdkVersion.addPackage("maven:io.sentry:sentry-spring", version);
 
     return sdkVersion;
   }

sentry-spring/src/test/kotlin/io/sentry/spring/EnableSentryTest.kt

@@ -45,7 +45,7 @@ class EnableSentryTest {
             assertThat(options.sdkVersion!!.name).isEqualTo("sentry.java.spring")
             assertThat(options.sdkVersion!!.version).isEqualTo(BuildConfig.VERSION_NAME)
             assertThat(options.sdkVersion!!.packages).isNotNull
-            assertThat(options.sdkVersion!!.packages!!.map { pkg -> pkg.name }).contains("maven:sentry-spring")
+            assertThat(options.sdkVersion!!.packages!!.map { pkg -> pkg.name }).contains("maven:io.sentry:sentry-spring")
         }
     }
 

sentry/src/main/java/io/sentry/SentryOptions.java

@@ -1329,7 +1329,7 @@ void merge(final @NotNull SentryOptions options) {
     final SdkVersion sdkVersion = new SdkVersion(BuildConfig.SENTRY_JAVA_SDK_NAME, version);
 
     sdkVersion.setVersion(version);
-    sdkVersion.addPackage("maven:sentry", version);
+    sdkVersion.addPackage("maven:io.sentry:sentry", version);
 
     return sdkVersion;
   }

sentry/src/test/java/io/sentry/GsonSerializerTest.kt

@@ -376,7 +376,7 @@ class GsonSerializerTest {
         assertNotNull(sdkInfo.packages)
 
         assertTrue(sdkInfo.packages!!.any {
-            it.name == "maven:sentry-android-core"
+            it.name == "maven:io.sentry:sentry-android-core"
             it.version == "4.5.6"
         })
     }

sentry/src/test/java/io/sentry/SentryOptionsTest.kt

@@ -125,7 +125,7 @@ class SentryOptionsTest {
         assertEquals(BuildConfig.VERSION_NAME, sdkVersion.version)
 
         assertTrue(sdkVersion.packages!!.any {
-            it.name == "maven:sentry" &&
+            it.name == "maven:io.sentry:sentry" &&
             it.version == BuildConfig.VERSION_NAME
         })
     }

sentry/src/test/resources/envelope_session_sdkversion.txt

@@ -1,3 +1,3 @@
-{"sdk":{"name":"test","version":"1.2.3","integrations":["NdkIntegration"],"packages":[{"name":"maven:sentry-android-core","version":"4.5.6"}]}}
+{"sdk":{"name":"test","version":"1.2.3","integrations":["NdkIntegration"],"packages":[{"name":"io.sentry:maven:sentry-android-core","version":"4.5.6"}]}}
 {"content_type":"application/json","type":"session","length":306}
 {"sid":"c81d4e2e-bcf2-11e6-869b-7df92533d2db","did":"123","init":true,"started":"2020-02-07T14:16:00Z","status":"ok","seq":123456,"errors":2,"duration":6000.0,"timestamp":"2020-02-07T14:16:00Z","attrs":{"release":"io.sentry@1.0+123","environment":"debug","ip_address":"127.0.0.1","user_agent":"jamesBond"}}