diff --git a/README.md b/README.md index fca8f8b..0593fb7 100644 --- a/README.md +++ b/README.md @@ -2,15 +2,7 @@ :full_moon_with_face: Resource Access Management --- Grant User Authorities-Roles-Details Service :new_moon_with_face: -<<<<<<< HEAD -<<<<<<< HEAD based on this: http://seanthefish.com/2020/07/24/micro-service-authorization/index.html -======= -[![Build Status](https://travis.ibm.com/Entitled-Software-LicenseConfigurator/RAM-GUARDS.svg?token=oHkbp3XwpaspFfNojSzj&branch=master)](https://travis.ibm.com/Entitled-Software-LicenseConfigurator/RAM-GUARDS) ->>>>>>> 30c2c67... init commit -======= -based on this: http://seanthefish.com/2020/07/24/micro-service-authorization/index.html ->>>>>>> 6aa1872... Update README.md ## Overview @@ -105,14 +97,4 @@ Header: Authorization: Bearer {ibm_id_id_token_here} Ram-Guards: {RAM_GUARDS_access_token_here} ``` -<<<<<<< HEAD -<<<<<<< HEAD -## see the ppt inside to get more info -======= -## A brief structure diagram of RAM-GUARDS in spring cloud micro service framework - -![A brief structure diagram](https://ws3.sinaimg.cn/large/006tNbRwly1fxnw84eo38j318c0fw45a.jpg) ->>>>>>> 30c2c67... init commit -======= ## see the ppt inside to get more info ->>>>>>> 6aa1872... Update README.md diff --git a/build.gradle b/build.gradle index 310b82a..0fde3dd 100644 --- a/build.gradle +++ b/build.gradle @@ -31,15 +31,7 @@ allprojects { apply plugin: 'io.freefair.lombok' group = 'com.ibm.ram.guards' -<<<<<<< HEAD -<<<<<<< HEAD version = '0.0.1-beta' -======= - version = '2.0.12-beta' ->>>>>>> 30c2c67... init commit -======= - version = '0.0.1-beta' ->>>>>>> 9f39b6d... publish sourceCompatibility = 1.8 repositories { @@ -102,10 +94,6 @@ allprojects { } task publishToJfrog(dependsOn: [ -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 9f39b6d... publish 'ibmid-resource-server-spring-boot-starter:publish', 'ibmid-client-spring-boot-starter:publish', 'ram-guards-authorization-server-spring-boot-starter:publish', @@ -113,17 +101,5 @@ task publishToJfrog(dependsOn: [ 'ram-guards-helper:publish', 'ram-guards-resource-server-spring-boot-starter:publish', 'ram-guards-zuul-esw-provider-spring-cloud-starter:publish' -<<<<<<< HEAD -======= - 'ibmid-resource-server-spring-boot-starter:artifactoryPublish', - 'ibmid-client-spring-boot-starter:artifactoryPublish', - 'ram-guards-authorization-server-spring-boot-starter:artifactoryPublish', - 'ram-guards-entity:artifactoryPublish', - 'ram-guards-helper:artifactoryPublish', - 'ram-guards-resource-server-spring-boot-starter:artifactoryPublish', - 'ram-guards-zuul-esw-provider-spring-cloud-starter:artifactoryPublish' ->>>>>>> 30c2c67... init commit -======= ->>>>>>> 9f39b6d... publish ]) diff --git a/ibmid-client-spring-boot-starter/README.md b/ibmid-client-spring-boot-starter/README.md index 49b131a..7da2f8f 100644 --- a/ibmid-client-spring-boot-starter/README.md +++ b/ibmid-client-spring-boot-starter/README.md @@ -8,101 +8,14 @@ repositories { mavenCentral() maven { url "https://repo.spring.io/milestone" } -<<<<<<< HEAD -<<<<<<< HEAD } dependencies { compile('com.ibm.ram.guards:ibmid-client-spring-boot-starter:0.0.1-beta') -======= - maven { - url "https://na.artifactory.swg-devops.com/artifactory/eswchina-generic-local" - credentials { - username = "${artifactory_user}" - password = "${artifactory_api_key}" - } - } -} - -dependencies { - compile('com.ibm.ram.guards:ibmid-client-spring-boot-starter:2.0.12-beta') ->>>>>>> 30c2c67... init commit -======= -} - -dependencies { - compile('com.ibm.ram.guards:ibmid-client-spring-boot-starter:0.0.1-beta') ->>>>>>> 73cc997... modify readme compileOnly('org.projectlombok:lombok') } ``` -<<<<<<< HEAD -<<<<<<< HEAD -======= -### Add dependency using Maven - -First add `settings.xml` in your local maven user’s install: `${user.home}/.m2/settings.xml` - -```xml - - - - eswchina-generic-local - ${artifactory_user} - ${artifactory_api_key} - - - - - - - eswchina-generic-local - eswchina generic local - https://na.artifactory.swg-devops.com/artifactory/eswchina-generic-local - - false - - - - - - -``` - -Then modify your `pom.xml` - -```xml - - - com.ibm.ram.guards - ibmid-client-spring-boot-starter - 2.0.12-beta - - - org.projectlombok - lombok - true - - - - - eswchina-generic-local - eswchina generic local - https://na.artifactory.swg-devops.com/artifactory/eswchina-generic-local - - false - - - -``` - ->>>>>>> 30c2c67... init commit -======= ->>>>>>> 73cc997... modify readme ### Add configuration in application.yml ```yml diff --git a/ibmid-client-spring-boot-starter/artifacts.gradle b/ibmid-client-spring-boot-starter/artifacts.gradle index d30679a..0510203 100644 --- a/ibmid-client-spring-boot-starter/artifacts.gradle +++ b/ibmid-client-spring-boot-starter/artifacts.gradle @@ -1,5 +1,3 @@ -<<<<<<< HEAD -<<<<<<< HEAD apply plugin: "maven-publish" publishing { @@ -16,57 +14,6 @@ publishing { publications { gpr(MavenPublication) { from(components.java) -======= -buildscript { - repositories { - jcenter() - } - dependencies { - //Check for the latest version here: http://plugins.gradle.org/plugin/com.jfrog.artifactory - classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5" - } -} - -apply plugin: org.jfrog.gradle.plugin.artifactory.ArtifactoryPlugin -======= ->>>>>>> 9f39b6d... publish -apply plugin: "maven-publish" - -publishing { - repositories { - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/IBM/ram-guards") - credentials { - username = project.findProperty("gpr.user") ?: System.getenv("USERNAME") - password = project.findProperty("gpr.key") ?: System.getenv("TOKEN") - } - } - } -<<<<<<< HEAD -} - -artifactory { - contextUrl = "${artifactory_url}" - publish { - repository { - // The Artifactory repository key to publish to - repoKey = "eswchina-generic-local" - username = "${artifactory_user}" - password = "${artifactory_api_key}" - maven = true - } - defaults { - publications("ibmid_client_spring_boot_starter") - publishArtifacts = true - // Publish generated POM files to Artifactory (true by default) - publishPom = true ->>>>>>> 30c2c67... init commit -======= - publications { - gpr(MavenPublication) { - from(components.java) ->>>>>>> 9f39b6d... publish } } } diff --git a/ibmid-resource-server-spring-boot-starter/README.md b/ibmid-resource-server-spring-boot-starter/README.md index a28e020..43620df 100644 --- a/ibmid-resource-server-spring-boot-starter/README.md +++ b/ibmid-resource-server-spring-boot-starter/README.md @@ -8,101 +8,14 @@ repositories { mavenCentral() maven { url "https://repo.spring.io/milestone" } -<<<<<<< HEAD -<<<<<<< HEAD } dependencies { compile('com.ibm.ram.guards:ibmid-resource-server-spring-boot-starter:0.0.1-beta') -======= - maven { - url "https://na.artifactory.swg-devops.com/artifactory/eswchina-generic-local" - credentials { - username = "${artifactory_user}" - password = "${artifactory_api_key}" - } - } -} - -dependencies { - compile('com.ibm.ram.guards:ibmid-resource-server-spring-boot-starter:2.0.12-beta') ->>>>>>> 30c2c67... init commit -======= -} - -dependencies { - compile('com.ibm.ram.guards:ibmid-resource-server-spring-boot-starter:0.0.1-beta') ->>>>>>> 73cc997... modify readme compileOnly('org.projectlombok:lombok') } ``` -<<<<<<< HEAD -<<<<<<< HEAD -======= -### Add dependency using Maven - -First add `settings.xml` in your local maven user’s install: `${user.home}/.m2/settings.xml` - -```xml - - - - eswchina-generic-local - ${artifactory_user} - ${artifactory_api_key} - - - - - - - eswchina-generic-local - eswchina generic local - https://na.artifactory.swg-devops.com/artifactory/eswchina-generic-local - - false - - - - - - -``` - -Then modify your `pom.xml` - -```xml - - - com.ibm.ram.guards - ibmid-resource-server-spring-boot-starter - 2.0.12-beta - - - org.projectlombok - lombok - true - - - - - eswchina-generic-local - eswchina generic local - https://na.artifactory.swg-devops.com/artifactory/eswchina-generic-local - - false - - - -``` - ->>>>>>> 30c2c67... init commit -======= ->>>>>>> 73cc997... modify readme ### Add configuration in application.yml ```yml diff --git a/ibmid-resource-server-spring-boot-starter/artifacts.gradle b/ibmid-resource-server-spring-boot-starter/artifacts.gradle index 6b78538..0510203 100644 --- a/ibmid-resource-server-spring-boot-starter/artifacts.gradle +++ b/ibmid-resource-server-spring-boot-starter/artifacts.gradle @@ -1,5 +1,3 @@ -<<<<<<< HEAD -<<<<<<< HEAD apply plugin: "maven-publish" publishing { @@ -19,41 +17,4 @@ publishing { } } } -======= -buildscript { - repositories { - jcenter() - } - dependencies { - //Check for the latest version here: http://plugins.gradle.org/plugin/com.jfrog.artifactory - classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5" - } -} - -apply plugin: org.jfrog.gradle.plugin.artifactory.ArtifactoryPlugin -======= ->>>>>>> 9f39b6d... publish -apply plugin: "maven-publish" - -publishing { - repositories { - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/IBM/ram-guards") - credentials { - username = project.findProperty("gpr.user") ?: System.getenv("USERNAME") - password = project.findProperty("gpr.key") ?: System.getenv("TOKEN") - } - } - } - publications { - gpr(MavenPublication) { - from(components.java) - } - } -} -<<<<<<< HEAD ->>>>>>> 30c2c67... init commit -======= ->>>>>>> 9f39b6d... publish diff --git a/ram-guards-authorization-server-spring-boot-starter/README.md b/ram-guards-authorization-server-spring-boot-starter/README.md index 9ae308b..6316f13 100644 --- a/ram-guards-authorization-server-spring-boot-starter/README.md +++ b/ram-guards-authorization-server-spring-boot-starter/README.md @@ -8,8 +8,6 @@ repositories { mavenCentral() maven { url "https://repo.spring.io/milestone" } -<<<<<<< HEAD -<<<<<<< HEAD } dependencies { @@ -17,82 +15,7 @@ dependencies { } ``` -======= - maven { - url "https://na.artifactory.swg-devops.com/artifactory/eswchina-generic-local" - credentials { - username = "${artifactory_user}" - password = "${artifactory_api_key}" - } - } -======= ->>>>>>> 73cc997... modify readme -} - -dependencies { - compile('com.ibm.ram.guards:ram-guards-authorization-server-spring-boot-starter:0.0.1-beta') -} -``` - -<<<<<<< HEAD -### Add dependency using Maven - -First add `settings.xml` in your local maven user’s install: `${user.home}/.m2/settings.xml` - -```xml - - - - eswchina-generic-local - ${artifactory_user} - ${artifactory_api_key} - - - - - - - eswchina-generic-local - eswchina generic local - https://na.artifactory.swg-devops.com/artifactory/eswchina-generic-local - - false - - - - - - -``` - -Then modify your `pom.xml` - -```xml - - - com.ibm.ram.guards - ram-guards-authorization-server-spring-boot-starter - 2.0.12-beta - - - - - eswchina-generic-local - eswchina generic local - https://na.artifactory.swg-devops.com/artifactory/eswchina-generic-local - - false - - - -``` ->>>>>>> 30c2c67... init commit -======= ->>>>>>> 73cc997... modify readme ### Add configuration in application.yml if you don't need cache your user' resource info in redis: diff --git a/ram-guards-authorization-server-spring-boot-starter/artifacts.gradle b/ram-guards-authorization-server-spring-boot-starter/artifacts.gradle index 6b78538..0510203 100644 --- a/ram-guards-authorization-server-spring-boot-starter/artifacts.gradle +++ b/ram-guards-authorization-server-spring-boot-starter/artifacts.gradle @@ -1,5 +1,3 @@ -<<<<<<< HEAD -<<<<<<< HEAD apply plugin: "maven-publish" publishing { @@ -19,41 +17,4 @@ publishing { } } } -======= -buildscript { - repositories { - jcenter() - } - dependencies { - //Check for the latest version here: http://plugins.gradle.org/plugin/com.jfrog.artifactory - classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5" - } -} - -apply plugin: org.jfrog.gradle.plugin.artifactory.ArtifactoryPlugin -======= ->>>>>>> 9f39b6d... publish -apply plugin: "maven-publish" - -publishing { - repositories { - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/IBM/ram-guards") - credentials { - username = project.findProperty("gpr.user") ?: System.getenv("USERNAME") - password = project.findProperty("gpr.key") ?: System.getenv("TOKEN") - } - } - } - publications { - gpr(MavenPublication) { - from(components.java) - } - } -} -<<<<<<< HEAD ->>>>>>> 30c2c67... init commit -======= ->>>>>>> 9f39b6d... publish diff --git a/ram-guards-entity/artifacts.gradle b/ram-guards-entity/artifacts.gradle index 6b78538..0510203 100644 --- a/ram-guards-entity/artifacts.gradle +++ b/ram-guards-entity/artifacts.gradle @@ -1,5 +1,3 @@ -<<<<<<< HEAD -<<<<<<< HEAD apply plugin: "maven-publish" publishing { @@ -19,41 +17,4 @@ publishing { } } } -======= -buildscript { - repositories { - jcenter() - } - dependencies { - //Check for the latest version here: http://plugins.gradle.org/plugin/com.jfrog.artifactory - classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5" - } -} - -apply plugin: org.jfrog.gradle.plugin.artifactory.ArtifactoryPlugin -======= ->>>>>>> 9f39b6d... publish -apply plugin: "maven-publish" - -publishing { - repositories { - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/IBM/ram-guards") - credentials { - username = project.findProperty("gpr.user") ?: System.getenv("USERNAME") - password = project.findProperty("gpr.key") ?: System.getenv("TOKEN") - } - } - } - publications { - gpr(MavenPublication) { - from(components.java) - } - } -} -<<<<<<< HEAD ->>>>>>> 30c2c67... init commit -======= ->>>>>>> 9f39b6d... publish diff --git a/ram-guards-helper/artifacts.gradle b/ram-guards-helper/artifacts.gradle index 6b78538..0510203 100644 --- a/ram-guards-helper/artifacts.gradle +++ b/ram-guards-helper/artifacts.gradle @@ -1,5 +1,3 @@ -<<<<<<< HEAD -<<<<<<< HEAD apply plugin: "maven-publish" publishing { @@ -19,41 +17,4 @@ publishing { } } } -======= -buildscript { - repositories { - jcenter() - } - dependencies { - //Check for the latest version here: http://plugins.gradle.org/plugin/com.jfrog.artifactory - classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5" - } -} - -apply plugin: org.jfrog.gradle.plugin.artifactory.ArtifactoryPlugin -======= ->>>>>>> 9f39b6d... publish -apply plugin: "maven-publish" - -publishing { - repositories { - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/IBM/ram-guards") - credentials { - username = project.findProperty("gpr.user") ?: System.getenv("USERNAME") - password = project.findProperty("gpr.key") ?: System.getenv("TOKEN") - } - } - } - publications { - gpr(MavenPublication) { - from(components.java) - } - } -} -<<<<<<< HEAD ->>>>>>> 30c2c67... init commit -======= ->>>>>>> 9f39b6d... publish diff --git a/ram-guards-resource-server-spring-boot-starter/README.md b/ram-guards-resource-server-spring-boot-starter/README.md index c6f8aa5..214b21e 100644 --- a/ram-guards-resource-server-spring-boot-starter/README.md +++ b/ram-guards-resource-server-spring-boot-starter/README.md @@ -8,101 +8,14 @@ repositories { mavenCentral() maven { url "https://repo.spring.io/milestone" } -<<<<<<< HEAD -<<<<<<< HEAD } dependencies { compile('com.ibm.ram.guards:ram-guards-resource-server-spring-boot-starter:0.0.1-beta') -======= - maven { - url "https://na.artifactory.swg-devops.com/artifactory/eswchina-generic-local" - credentials { - username = "${artifactory_user}" - password = "${artifactory_api_key}" - } - } -} - -dependencies { - compile('com.ibm.ram.guards:ram-guards-resource-server-spring-boot-starter:2.0.12-beta') ->>>>>>> 30c2c67... init commit -======= -} - -dependencies { - compile('com.ibm.ram.guards:ram-guards-resource-server-spring-boot-starter:0.0.1-beta') ->>>>>>> 73cc997... modify readme compileOnly('org.projectlombok:lombok') } ``` -<<<<<<< HEAD -<<<<<<< HEAD -======= -### Add dependency using Maven - -First add `settings.xml` in your local maven user’s install: `${user.home}/.m2/settings.xml` - -```xml - - - - eswchina-generic-local - ${artifactory_user} - ${artifactory_api_key} - - - - - - - eswchina-generic-local - eswchina generic local - https://na.artifactory.swg-devops.com/artifactory/eswchina-generic-local - - false - - - - - - -``` - -Then modify your `pom.xml` - -```xml - - - com.ibm.ram.guards - ram-guards-resource-server-spring-boot-starter - 2.0.12-beta - - - org.projectlombok - lombok - true - - - - - eswchina-generic-local - eswchina generic local - https://na.artifactory.swg-devops.com/artifactory/eswchina-generic-local - - false - - - -``` - ->>>>>>> 30c2c67... init commit -======= ->>>>>>> 73cc997... modify readme ### Add configuration in application.yml if you don't need cache your user' resource info in redis: diff --git a/ram-guards-resource-server-spring-boot-starter/artifacts.gradle b/ram-guards-resource-server-spring-boot-starter/artifacts.gradle index 6b78538..0510203 100644 --- a/ram-guards-resource-server-spring-boot-starter/artifacts.gradle +++ b/ram-guards-resource-server-spring-boot-starter/artifacts.gradle @@ -1,5 +1,3 @@ -<<<<<<< HEAD -<<<<<<< HEAD apply plugin: "maven-publish" publishing { @@ -19,41 +17,4 @@ publishing { } } } -======= -buildscript { - repositories { - jcenter() - } - dependencies { - //Check for the latest version here: http://plugins.gradle.org/plugin/com.jfrog.artifactory - classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5" - } -} - -apply plugin: org.jfrog.gradle.plugin.artifactory.ArtifactoryPlugin -======= ->>>>>>> 9f39b6d... publish -apply plugin: "maven-publish" - -publishing { - repositories { - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/IBM/ram-guards") - credentials { - username = project.findProperty("gpr.user") ?: System.getenv("USERNAME") - password = project.findProperty("gpr.key") ?: System.getenv("TOKEN") - } - } - } - publications { - gpr(MavenPublication) { - from(components.java) - } - } -} -<<<<<<< HEAD ->>>>>>> 30c2c67... init commit -======= ->>>>>>> 9f39b6d... publish diff --git a/ram-guards-zuul-esw-provider-spring-cloud-starter/README.md b/ram-guards-zuul-esw-provider-spring-cloud-starter/README.md index c44ee94..b0b2a60 100644 --- a/ram-guards-zuul-esw-provider-spring-cloud-starter/README.md +++ b/ram-guards-zuul-esw-provider-spring-cloud-starter/README.md @@ -14,34 +14,11 @@ You should always remember that this starter must be used with [ibmid-resource-s repositories { mavenCentral() maven { url "https://repo.spring.io/milestone" } -<<<<<<< HEAD -<<<<<<< HEAD } dependencies { compile('com.ibm.ram.guards:ibmid-resource-server-spring-boot-starter:0.0.1-beta') compile('com.ibm.ram.guards:ram-guards-zuul-esw-provider-spring-cloud-starter:0.0.1-beta') -======= - maven { - url "https://na.artifactory.swg-devops.com/artifactory/eswchina-generic-local" - credentials { - username = "${artifactory_user}" - password = "${artifactory_api_key}" - } - } -} - -dependencies { - compile('com.ibm.ram.guards:ibmid-resource-server-spring-boot-starter:2.0.12-beta') - compile('com.ibm.ram.guards:ram-guards-zuul-esw-provider-spring-cloud-starter:2.0.12-beta') ->>>>>>> 30c2c67... init commit -======= -} - -dependencies { - compile('com.ibm.ram.guards:ibmid-resource-server-spring-boot-starter:0.0.1-beta') - compile('com.ibm.ram.guards:ram-guards-zuul-esw-provider-spring-cloud-starter:0.0.1-beta') ->>>>>>> 73cc997... modify readme implementation('org.springframework.cloud:spring-cloud-starter-netflix-zuul') implementation('org.springframework.cloud:spring-cloud-starter-netflix-eureka-server') compileOnly('org.projectlombok:lombok') @@ -49,85 +26,6 @@ dependencies { ``` -<<<<<<< HEAD -<<<<<<< HEAD -======= -### Add dependency using Maven - -First add `settings.xml` in your local maven user’s install: `${user.home}/.m2/settings.xml` - -```xml - - - - eswchina-generic-local - ${artifactory_user} - ${artifactory_api_key} - - - - - - - eswchina-generic-local - eswchina generic local - https://na.artifactory.swg-devops.com/artifactory/eswchina-generic-local - - false - - - - - - -``` - -Then modify your `pom.xml` - -```xml - - - com.ibm.ram.guards - ram-guards-zuul-esw-provider-spring-cloud-starter - 2.0.12-beta - - - com.ibm.ram.guards - ibmid-resource-server-spring-boot-starter - 2.0.12-beta - - - org.springframework.cloud - spring-cloud-starter-netflix-eureka-server - - - org.springframework.cloud - spring-cloud-starter-netflix-zuul - - - org.projectlombok - lombok - true - - - - - eswchina-generic-local - eswchina generic local - https://na.artifactory.swg-devops.com/artifactory/eswchina-generic-local - - false - - - -``` - ->>>>>>> 30c2c67... init commit -======= ->>>>>>> 73cc997... modify readme ### Add configuration in application.yml ```yml diff --git a/ram-guards-zuul-esw-provider-spring-cloud-starter/artifacts.gradle b/ram-guards-zuul-esw-provider-spring-cloud-starter/artifacts.gradle index 6b78538..0510203 100644 --- a/ram-guards-zuul-esw-provider-spring-cloud-starter/artifacts.gradle +++ b/ram-guards-zuul-esw-provider-spring-cloud-starter/artifacts.gradle @@ -1,5 +1,3 @@ -<<<<<<< HEAD -<<<<<<< HEAD apply plugin: "maven-publish" publishing { @@ -19,41 +17,4 @@ publishing { } } } -======= -buildscript { - repositories { - jcenter() - } - dependencies { - //Check for the latest version here: http://plugins.gradle.org/plugin/com.jfrog.artifactory - classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5" - } -} - -apply plugin: org.jfrog.gradle.plugin.artifactory.ArtifactoryPlugin -======= ->>>>>>> 9f39b6d... publish -apply plugin: "maven-publish" - -publishing { - repositories { - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/IBM/ram-guards") - credentials { - username = project.findProperty("gpr.user") ?: System.getenv("USERNAME") - password = project.findProperty("gpr.key") ?: System.getenv("TOKEN") - } - } - } - publications { - gpr(MavenPublication) { - from(components.java) - } - } -} -<<<<<<< HEAD ->>>>>>> 30c2c67... init commit -======= ->>>>>>> 9f39b6d... publish