solve conflicts

IBM · Jan 25, 2021 · 10df6ba · 10df6ba
1 parent 8e4f759
commit 10df6ba
Show file tree

Hide file tree

Showing 14 changed files with 0 additions and 769 deletions.
diff --git 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
@@ -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,28 +94,12 @@ 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',
         'ram-guards-entity:publish',
         '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
@@ -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
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                          https://maven.apache.org/xsd/settings-1.0.0.xsd">
-    <servers>
-        <server>
-            <id>eswchina-generic-local</id>
-            <username>${artifactory_user}</username>
-            <password>${artifactory_api_key}</password>
-        </server>
-    </servers>
-    <profiles>
-        <profile>
-            <repositories>
-                <repository>
-                    <id>eswchina-generic-local</id>
-                    <name>eswchina generic local</name>
-                    <url>https://na.artifactory.swg-devops.com/artifactory/eswchina-generic-local</url>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                </repository>
-            </repositories>
-        </profile>
-    </profiles>
-</settings>
-```
-
-Then modify your `pom.xml`
-
-```xml
-</dependencies>
-    <dependency>
-        <groupId>com.ibm.ram.guards</groupId>
-        <artifactId>ibmid-client-spring-boot-starter</artifactId>
-        <version>2.0.12-beta</version>
-    </dependency>
-    <dependency>
-        <groupId>org.projectlombok</groupId>
-        <artifactId>lombok</artifactId>
-        <optional>true</optional>
-    </dependency>
-</dependencies>
-<repositories>
-    <repository>
-        <id>eswchina-generic-local</id>
-        <name>eswchina generic local</name>
-        <url>https://na.artifactory.swg-devops.com/artifactory/eswchina-generic-local</url>
-        <snapshots>
-            <enabled>false</enabled>
-        </snapshots>
-    </repository>
-</repositories>
-```
-
->>>>>>> 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
@@ -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
@@ -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
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                          https://maven.apache.org/xsd/settings-1.0.0.xsd">
-    <servers>
-        <server>
-            <id>eswchina-generic-local</id>
-            <username>${artifactory_user}</username>
-            <password>${artifactory_api_key}</password>
-        </server>
-    </servers>
-    <profiles>
-        <profile>
-            <repositories>
-                <repository>
-                    <id>eswchina-generic-local</id>
-                    <name>eswchina generic local</name>
-                    <url>https://na.artifactory.swg-devops.com/artifactory/eswchina-generic-local</url>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                </repository>
-            </repositories>
-        </profile>
-    </profiles>
-</settings>
-```
-
-Then modify your `pom.xml`
-
-```xml
-</dependencies>
-    <dependency>
-        <groupId>com.ibm.ram.guards</groupId>
-        <artifactId>ibmid-resource-server-spring-boot-starter</artifactId>
-        <version>2.0.12-beta</version>
-    </dependency>
-    <dependency>
-        <groupId>org.projectlombok</groupId>
-        <artifactId>lombok</artifactId>
-        <optional>true</optional>
-    </dependency>
-</dependencies>
-<repositories>
-    <repository>
-        <id>eswchina-generic-local</id>
-        <name>eswchina generic local</name>
-        <url>https://na.artifactory.swg-devops.com/artifactory/eswchina-generic-local</url>
-        <snapshots>
-            <enabled>false</enabled>
-        </snapshots>
-    </repository>
-</repositories>
-```
-
->>>>>>> 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
@@ -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