From 04199962f8c7cd3b08164d0d3cd220e2b4cecd07 Mon Sep 17 00:00:00 2001 From: matej ferenc Date: Sat, 10 Oct 2015 20:41:34 +0200 Subject: [PATCH 1/5] BugFix --- gradle.properties | 2 +- .../org/springframework/social/facebook/api/UserOperations.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 4947c135f..13647a262 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ springVersion=4.1.6.RELEASE springSocialVersion=1.1.0.RELEASE springSnapshotVersion=latest.integration hamcrestVersion=1.3 -version=2.0.1.RELEASE +version=2.0.2.SNAPSHOT jacksonVersion=2.4.5 jspApiVersion=2.2.1 servletApiVersion=3.0.1 diff --git a/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/UserOperations.java b/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/UserOperations.java index 5af17fc39..44396dc9d 100644 --- a/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/UserOperations.java +++ b/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/UserOperations.java @@ -104,7 +104,7 @@ public interface UserOperations { PagedList search(String query); static final String[] PROFILE_FIELDS = { - "id", "about", "age_range", "address", "bio", "birthday", "context", "cover", "currency", "devices", "education", "email", + "id", "about", "age_range", "bio", "birthday", "context", "cover", "currency", "devices", "education", "email", "favorite_athletes", "favorite_teams", "first_name", "gender", "hometown", "inspirational_people", "installed", "install_type", "is_verified", "languages", "last_name", "link", "locale", "location", "meeting_for", "middle_name", "name", "name_format", "political", "quotes", "payment_pricepoints", "relationship_status", "religion", "security_settings", "significant_other", From 0bc5d5eac563f8bab0a069fc429596c9d8b67d20 Mon Sep 17 00:00:00 2001 From: Matej Ferenc Date: Sun, 11 Oct 2015 16:52:06 +0200 Subject: [PATCH 2/5] nexus deployment --- build.gradle | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/build.gradle b/build.gradle index 4eec68bec..89353b309 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,11 @@ +apply plugin: 'maven' + buildscript { repositories { maven { url 'http://repo.spring.io/plugins-release' } + maven { + url "http://modelzuzana.com:8080/nexus/content/groups/public" + } } dependencies { classpath 'org.springframework.build.gradle:docbook-reference-plugin:0.2.8' @@ -294,3 +299,18 @@ task updateRootDocs << { } build.dependsOn('updateRootDocs') + + + +uploadArchives { + repositories { + mavenDeployer { + repository(url: "http://modelzuzana.com:8080/nexus/content/repositories/snapshots") { + authentication(userName: "deployment", password: "neviempresne") + } + pom.version = "2.0.2.SNAPSHOT" + pom.artifactId = "spring-social-facebook" + pom.groupId = "org.springframework.social" + } + } +} \ No newline at end of file From a7fea5bd485baef7628be45c6d783cdd183cfa7a Mon Sep 17 00:00:00 2001 From: Matej Ferenc Date: Sun, 11 Oct 2015 18:51:38 +0200 Subject: [PATCH 3/5] playing around with nexus --- build.gradle | 37 ++++++++++++++++++++++++++++--------- gradle.properties | 2 +- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 89353b309..84ffa56e0 100644 --- a/build.gradle +++ b/build.gradle @@ -301,16 +301,35 @@ task updateRootDocs << { build.dependsOn('updateRootDocs') - -uploadArchives { +apply plugin: 'maven-publish' +publishing { + publications { + mavenJava(MavenPublication) { + artifact myJar + } + } repositories { - mavenDeployer { - repository(url: "http://modelzuzana.com:8080/nexus/content/repositories/snapshots") { - authentication(userName: "deployment", password: "neviempresne") + maven { + url "http://modelzuzana.com:8080/nexus/content/repositories/snapshots" + credentials { + username "deployment" + password "neviempresne" } - pom.version = "2.0.2.SNAPSHOT" - pom.artifactId = "spring-social-facebook" - pom.groupId = "org.springframework.social" } } -} \ No newline at end of file +} +//uploadArchives { +// repositories { +// mavenDeployer { +// repository(url: "http://modelzuzana.com:8080/nexus/content/repositories/releases") { +// authentication(userName: "deployment", password: "neviempresne") +// } +// pom.version = "$version" +// pom.artifactId = "spring-social-facebook" +// pom.groupId = "org.springframework.social" +// } +// } +//} + +task myJar(type: Jar) + diff --git a/gradle.properties b/gradle.properties index 13647a262..2facefac5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ springVersion=4.1.6.RELEASE springSocialVersion=1.1.0.RELEASE springSnapshotVersion=latest.integration hamcrestVersion=1.3 -version=2.0.2.SNAPSHOT +version=12.0.2.SNAPSHOT jacksonVersion=2.4.5 jspApiVersion=2.2.1 servletApiVersion=3.0.1 From d7e8e6d0627b5c25a11af1dec044eb7f03d56c03 Mon Sep 17 00:00:00 2001 From: Matej Ferenc Date: Sun, 11 Oct 2015 19:03:36 +0200 Subject: [PATCH 4/5] version change --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2facefac5..719ead91a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ springVersion=4.1.6.RELEASE springSocialVersion=1.1.0.RELEASE springSnapshotVersion=latest.integration hamcrestVersion=1.3 -version=12.0.2.SNAPSHOT +version=12.0.2-SNAPSHOT jacksonVersion=2.4.5 jspApiVersion=2.2.1 servletApiVersion=3.0.1 From b58876a18e836715c39896b905f894e0bfd3c784 Mon Sep 17 00:00:00 2001 From: Matej Ferenc Date: Mon, 12 Oct 2015 15:54:18 +0200 Subject: [PATCH 5/5] setting up our nexus repo --- build.gradle | 39 +-------------------------------------- publish-maven.gradle | 9 +++++++++ 2 files changed, 10 insertions(+), 38 deletions(-) diff --git a/build.gradle b/build.gradle index 84ffa56e0..9ac35688e 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,6 @@ apply plugin: 'maven' buildscript { repositories { maven { url 'http://repo.spring.io/plugins-release' } - maven { - url "http://modelzuzana.com:8080/nexus/content/groups/public" - } } dependencies { classpath 'org.springframework.build.gradle:docbook-reference-plugin:0.2.8' @@ -298,38 +295,4 @@ task updateRootDocs << { } } -build.dependsOn('updateRootDocs') - - -apply plugin: 'maven-publish' -publishing { - publications { - mavenJava(MavenPublication) { - artifact myJar - } - } - repositories { - maven { - url "http://modelzuzana.com:8080/nexus/content/repositories/snapshots" - credentials { - username "deployment" - password "neviempresne" - } - } - } -} -//uploadArchives { -// repositories { -// mavenDeployer { -// repository(url: "http://modelzuzana.com:8080/nexus/content/repositories/releases") { -// authentication(userName: "deployment", password: "neviempresne") -// } -// pom.version = "$version" -// pom.artifactId = "spring-social-facebook" -// pom.groupId = "org.springframework.social" -// } -// } -//} - -task myJar(type: Jar) - +build.dependsOn('updateRootDocs') \ No newline at end of file diff --git a/publish-maven.gradle b/publish-maven.gradle index 5ea006bc0..742b2ab7c 100644 --- a/publish-maven.gradle +++ b/publish-maven.gradle @@ -7,6 +7,15 @@ ext.optional = { optionalDeps << it } ext.provided = { providedDeps << it } install { + repositories { + maven { + url "http://modelzuzana.com:8080/nexus/content/repositories/snapshots" + credentials { + username "deployment" + password "neviempresne" + } + } + } repositories.mavenInstaller { customizePom(pom, project) }