Merge pull request #29 from sailpoint-oss/publish-fixes

publish-fixes
sailpoint-oss · May 7, 2021 · 098f973 · 098f973
2 parents 441ff19 + e5457df
commit 098f973
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,9 +10,13 @@ plugins {
     id 'signing'
 }
 
+version = '0.2.0-SNAPSHOT'
+
 repositories {
     mavenCentral()
-
+    maven {
+        url "https://s01.oss.sonatype.org/content/repositories/snapshots/"
+    }
     flatDir {
         dirs 'libs'
     }
@@ -23,7 +27,8 @@ dependencies {
     // Nimbus JOSE JWT
     // https://mvnrepository.com/artifact/com.nimbusds/nimbus-jose-jwt
     api group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.9'
-    implementation files("libs/ietf-subject-identifiers-model-0.1.0-SNAPSHOT.jar")
+    implementation group: 'com.sailpoint', name: 'ietf-subject-identifiers-model', version: '0.1.0-SNAPSHOT'
+    //implementation files("libs/ietf-subject-identifiers-model-0.1.0-SNAPSHOT.jar")
     // Use JUnit test framework
     testImplementation 'junit:junit:4.13.2'
 }
@@ -42,6 +47,8 @@ java {
     withSourcesJar()
 }
 
+ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
+
 publishing {
     publications {
         model(MavenPublication) {
@@ -83,6 +90,15 @@ publishing {
             name = 'myRepo'
             url = "file://${buildDir}/repo"
         }
+        maven {
+            def releaseRepo = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
+            def snapshotRepo = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
+            url = isReleaseVersion ? releaseRepo : snapshotRepo
+            credentials {
+                username = project.hasProperty('ossrhUsername') ? ossrhUsername : "Unknown user"
+                password = project.hasProperty('ossrhPassword') ? ossrhPassword : "Unknown password"
+            }
+        }
     }
 }
 
@@ -98,6 +114,5 @@ signing {
 }
 
 group = 'com.sailpoint'
-version = '0.1.0-SNAPSHOT'
 sourceCompatibility = 9;
 targetCompatibility = 9;
diff --git a/gradle/verification-keyring.gpg b/gradle/verification-keyring.gpg
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -7,10 +7,21 @@
          <trusted-key id="042b29e928995b9db963c636c7ca19b7b620d787" group="com.github.stephenc.jcip" name="jcip-annotations" version="1.0-1"/>
          <trusted-key id="4db1a49729b053caf015cee9a6adfc93ef34893e" group="org.hamcrest"/>
          <trusted-key id="82f0964816ad7319cb0cccf93efd9d223d715e9a" group="com.nimbusds" name="nimbus-jose-jwt" version="9.9"/>
+         <trusted-key id="fa5c0cc71b18b0faa2ed5e1a453785727f5767d9" group="com.sailpoint"/>
          <trusted-key id="ff6e2c001948c5f2f38b0cc385911f425ec61b51" group="junit" name="junit" version="4.13.2"/>
       </trusted-keys>
    </configuration>
    <components>
+      <component group="com.sailpoint" name="ietf-subject-identifiers-model" version="0.1.0-SNAPSHOT">
+         <artifact name="ietf-subject-identifiers-model-0.1.0-SNAPSHOT.jar">
+            <pgp value="fa5c0cc71b18b0faa2ed5e1a453785727f5767d9"/>
+         </artifact>
+      </component>
+      <component group="com.sailpoint" name="ietf-subject-identifiers-model" version="0.1.0-SNAPSHOT">
+         <artifact name="ietf-subject-identifiers-model-0.1.0-SNAPSHOT.module">
+            <sha256 value="a2f1dbb5cd7c3dcc8e237dbc8e1bd5a5fdc21e3b04cacb1d4bb0e1d33485a0ff" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
       <component group="org.sonatype.oss" name="oss-parent" version="7">
          <artifact name="oss-parent-7.pom">
             <sha256 value="b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454" origin="Generated by Gradle because artifact wasn't signed"/>