Skip to content

Instantly share code, notes, and snippets.

@nnutter
Last active January 1, 2016 05:29
Show Gist options
  • Save nnutter/8098967 to your computer and use it in GitHub Desktop.
Save nnutter/8098967 to your computer and use it in GitHub Desktop.
$ git log --oneline -n 1
f95fcd3 Uniform "Next" step action button with other screns.
$ git diff
diff --git a/github-oauth/pom.xml b/github-oauth/pom.xml
index f3acf76..9310483 100644
--- a/github-oauth/pom.xml
+++ b/github-oauth/pom.xml
@@ -65,7 +65,7 @@ limitations under the License.
<dependency>
<groupId>com.google.gerrit</groupId>
<artifactId>gerrit-plugin-api</artifactId>
- <version>${project.version}</version>
+ <version>2.8</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -107,7 +107,7 @@ limitations under the License.
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>github-api</artifactId>
- <version>1.44-SNAPSHOT</version>
+ <version>1.48-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
diff --git a/github-plugin/pom.xml b/github-plugin/pom.xml
index a40b2fc..bfe0991 100644
--- a/github-plugin/pom.xml
+++ b/github-plugin/pom.xml
@@ -29,7 +29,7 @@ limitations under the License.
<properties>
<Gerrit-ApiType>plugin</Gerrit-ApiType>
- <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
+ <Gerrit-ApiVersion>2.8</Gerrit-ApiVersion>
<gerrit_src>/Users/lucamilanesio/Documents/workspace-gerrit/gerrithub/gerrit</gerrit_src>
</properties>
$ mvn install -U | grep -v 'We have a duplicate'
[INFO] Scanning for projects...
[WARNING]
[WARNING] Some problems were encountered while building the effective model for com.googlesource.gerrit.plugins.github:github-plugin:jar:2.8-SNAPSHOT
[WARNING] 'dependencies.dependency.(groupId:artifactId:type:classifier)' must be unique: javax.servlet:javax.servlet-api:jar -> duplicate declaration of version 3.0.1 @ line 147, column 17
[WARNING]
[WARNING] It is highly recommended to fix these problems because they threaten the stability of your build.
[WARNING]
[WARNING] For this reason, future Maven versions might no longer support building such malformed projects.
[WARNING]
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Build Order:
[INFO]
[INFO] Gerrit Code Review - GitHub integration
[INFO] Gerrit Code Review - GitHub OAuth login
[INFO] Gerrit Code Review - GitHub plugin
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building Gerrit Code Review - GitHub integration 2.8-SNAPSHOT
[INFO] ------------------------------------------------------------------------ [96/9966]
[INFO] Building Gerrit Code Review - GitHub integration 2.8-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO]
[INFO] --- maven-install-plugin:2.3:install (default-install) @ github-parent ---
[INFO] Installing /home/vagrant/github/pom.xml to /home/vagrant/.m2/repository/com/googlesource/gerrit/plugins/github/github-parent/2.8-SNAPSHOT/github-parent-2.8-SNAPSHOT.pom
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building Gerrit Code Review - GitHub OAuth login 2.8-SNAPSHOT
[INFO] ------------------------------------------------------------------------
Downloading: http://repo.jenkins-ci.org/public/org/kohsuke/github-api/1.48-SNAPSHOT/maven-metadata.xml
[INFO]
[INFO] --- maven-resources-plugin:2.3:resources (default-resources) @ github-oauth ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory /home/vagrant/github/github-oauth/src/main/resources
[INFO]
[INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ github-oauth ---
[INFO] Nothing to compile - all classes are up to date
[INFO]
[INFO] --- maven-resources-plugin:2.3:testResources (default-testResources) @ github-oauth ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory /home/vagrant/github/github-oauth/src/test/resources
[INFO]
[INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ github-oauth ---
[INFO] No sources to compile
[INFO]
[INFO] --- maven-surefire-plugin:2.10:test (default-test) @ github-oauth ---
[INFO] No tests to run.
[INFO] Surefire report directory: /home/vagrant/github/github-oauth/target/surefire-reports
-------------------------------------------------------
T E S T S
-------------------------------------------------------
Results :
Tests run: 0, Failures: 0, Errors: 0, Skipped: 0
[INFO]
[INFO] --- maven-jar-plugin:2.2:jar (default-jar) @ github-oauth ---
[INFO]
[INFO] --- maven-shade-plugin:1.6:shade (default) @ github-oauth ---
[INFO] Including org.kohsuke:github-api:jar:1.48-SNAPSHOT in the shaded jar.
[INFO] Excluding commons-lang:commons-lang:jar:2.6 from the shaded jar.
[INFO] Excluding commons-codec:commons-codec:jar:1.7 from the shaded jar.
[INFO] Including com.fasterxml.jackson.core:jackson-databind:jar:2.2.3 in the shaded jar.
[INFO] Including com.fasterxml.jackson.core:jackson-annotations:jar:2.2.3 in the shaded jar.
[INFO] Including com.fasterxml.jackson.core:jackson-core:jar:2.2.3 in the shaded jar.
[INFO] Including commons-io:commons-io:jar:1.4 in the shaded jar. [48/9966]
[INFO] Including org.apache.httpcomponents:httpclient:jar:4.2.5 in the shaded jar.
[INFO] Including org.apache.httpcomponents:httpcore:jar:4.2.4 in the shaded jar.
[INFO] Including commons-logging:commons-logging:jar:1.1.1 in the shaded jar.
[INFO] Replacing original artifact with shaded artifact.
[INFO] Replacing /home/vagrant/github/github-oauth/target/github-oauth-2.8-SNAPSHOT.jar with /home/vagrant/github/github-oauth/target/github-oauth-2.8-SNAPSHOT-shaded.jar
[INFO]
[INFO] --- maven-install-plugin:2.3:install (default-install) @ github-oauth ---
[INFO] Installing /home/vagrant/github/github-oauth/target/github-oauth-2.8-SNAPSHOT.jar to /home/vagrant/.m2/repository/com/googlesource/gerrit/plugins/github/github-oauth/2.8-SNAPSHOT/github-oauth-2.8-SNAPSHOT.jar
[INFO] Installing /home/vagrant/github/github-oauth/dependency-reduced-pom.xml to /home/vagrant/.m2/repository/com/googlesource/gerrit/plugins/github/github-oauth/2.8-SNAPSHOT/github-oauth-2.8-SNAPSHOT.pom
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building Gerrit Code Review - GitHub plugin 2.8-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[WARNING] The artifact org.apache.commons:commons-io:jar:1.3.2 has been relocated to commons-io:commons-io:jar:1.3.2
[INFO]
[INFO] --- maven-resources-plugin:2.3:resources (default-resources) @ github-plugin ---
[WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent!
[INFO] Copying 42 resources
[INFO]
[INFO] --- maven-compiler-plugin:2.3.2:compile (default-compile) @ github-plugin ---
[INFO] Compiling 19 source files to /home/vagrant/github/github-plugin/target/classes
[INFO] -------------------------------------------------------------
[ERROR] COMPILATION ERROR :
[INFO] -------------------------------------------------------------
[ERROR] /home/vagrant/github/github-plugin/src/main/java/com/googlesrouce/gerrit/plugins/github/git/PullRequestImportJob.java:[213,27] error: no suitable method found for getOrRegisterAccount(ReviewDb,GitUser)
[ERROR] method PullRequestImportJob.getOrRegisterAccount(ReviewDb,String,String,String) is not applicable
(actual and formal argument lists differ in length)
method PullRequestImportJob.getOrRegisterAccount(ReviewDb,GHUser) is not applicable
(actual argument GitUser cannot be converted to GHUser by method invocation conversion)
method PullRequestImportJob.getOrRegisterAccount(ReviewDb,Authorship) is not applicable
(actual argument GitUser cannot be converted to Authorship by method invocation conversion)
/home/vagrant/github/github-plugin/src/main/java/com/googlesrouce/gerrit/plugins/github/git/PullRequestCreateChange.java:[217,8] error: no suitable constructor found for Change(Key,com.google.gerrit.reviewdb.client.Change.Id,com.google.gerrit.reviewdb.client.Account.Id,NameKey)
[ERROR] constructor Change.Change(Key,com.google.gerrit.reviewdb.client.Change.Id,com.google.gerrit.reviewdb.client.Account.Id,NameKey,Timestamp) is not applicable
(actual and formal argument lists differ in length)
constructor Change.Change() is not applicable
(actual and formal argument lists differ in length)
/home/vagrant/github/github-plugin/src/main/java/com/googlesrouce/gerrit/plugins/github/git/PullRequestCreateChange.java:[269,8] error: no suitable constructor found for ChangeMessage(Key,com.google.gerrit.reviewdb.client.Account.Id,<null>)
[ERROR] constructor ChangeMessage.ChangeMessage(Key,com.google.gerrit.reviewdb.client.Account.Id,Timestamp,com.google.gerrit.reviewdb.client.PatchSet.Id) is not applicable
(actual and formal argument lists differ in length)
constructor ChangeMessage.ChangeMessage() is not applicable
(actual and formal argument lists differ in length)
/home/vagrant/github/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/PullRequestListController.java:[152,59] error: method listPullRequests in class GHRepository cannot be applied to given types;
[INFO] 4 errors
[INFO] -------------------------------------------------------------
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
[INFO] Gerrit Code Review - GitHub integration ........... SUCCESS [1.215s]
[INFO] Gerrit Code Review - GitHub OAuth login ........... SUCCESS [7.165s]
[INFO] Gerrit Code Review - GitHub plugin ................ FAILURE [4.101s]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 12.954s
[INFO] Finished at: Mon Dec 23 09:27:14 CST 2013
[INFO] Final Memory: 19M/46M
[INFO] ------------------------------------------------------------------------
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile (default-compile) on project github-plugin: Compilation failure: Compilation failure:
[ERROR] /home/vagrant/github/github-plugin/src/main/java/com/googlesrouce/gerrit/plugins/github/git/PullRequestImportJob.java:[213,27] error: no suitable method found for getOrRegisterAccount(ReviewDb,GitUser)
[ERROR] method PullRequestImportJob.getOrRegisterAccount(ReviewDb,String,String,String) is not applicable
[ERROR] (actual and formal argument lists differ in length)
[ERROR] method PullRequestImportJob.getOrRegisterAccount(ReviewDb,GHUser) is not applicable
[ERROR] (actual argument GitUser cannot be converted to GHUser by method invocation conversion)
[ERROR] method PullRequestImportJob.getOrRegisterAccount(ReviewDb,Authorship) is not applicable
[ERROR] (actual argument GitUser cannot be converted to Authorship by method invocation conversion)
[ERROR] /home/vagrant/github/github-plugin/src/main/java/com/googlesrouce/gerrit/plugins/github/git/PullRequestCreateChange.java:[217,8] error: no suitable constructor found for Change(Key,com.google.gerrit.reviewdb.client.Change.Id,com.google.gerrit.reviewdb.client.Account.Id,NameKey)
[ERROR] constructor Change.Change(Key,com.google.gerrit.reviewdb.client.Change.Id,com.google.gerrit.reviewdb.client.Account.Id,NameKey,Timestamp) is not applicable
[ERROR] (actual and formal argument lists differ in length)
[ERROR] constructor Change.Change() is not applicable
[ERROR] (actual and formal argument lists differ in length)
[ERROR] /home/vagrant/github/github-plugin/src/main/java/com/googlesrouce/gerrit/plugins/github/git/PullRequestCreateChange.java:[269,8] error: no suitable constructor found for ChangeMessage(Key,com.google.gerrit.reviewdb.client.Account.Id,<null>)
[ERROR] constructor ChangeMessage.ChangeMessage(Key,com.google.gerrit.reviewdb.client.Account.Id,Timestamp,com.google.gerrit.reviewdb.client.PatchSet.Id) is not applicable
[ERROR] (actual and formal argument lists differ in length)
[ERROR] constructor ChangeMessage.ChangeMessage() is not applicable
[ERROR] (actual and formal argument lists differ in length)
[ERROR] /home/vagrant/github/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/PullRequestListController.java:[152,59] error: method listPullRequests in class GHRepository cannot be applied to given types;
[ERROR] -> [Help 1]
[ERROR]
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException
[ERROR]
[ERROR] After correcting the problems, you can resume the build with the command
[ERROR] mvn <goals> -rf :github-plugin
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment