146 Commits

Author SHA1 Message Date
David Ostrovsky
07df95936f Buck: add local_jar() to link direct to local Maven targets
Change-Id: Ief0224e334e3e9ec040f4d4bca6060775c3e56f1
2014-02-03 18:17:31 +01:00
Dave Borowitz
02bf1cd82a Upgrade guava to 16.0
Change-Id: I810574fe5f6ed5c397b595092105d970eebfc3a2
2014-01-30 20:28:00 +00:00
Shawn Pearce
d573026720 Merge "Update GWT version to 2.6.0-rc3" 2014-01-24 05:14:02 +00:00
David Pursehouse
9918e069c4 Upgrade H2 to version 1.3.174
This version includes a fix for an LOB deadlock between reading
and updating LOB columns.

Bug: Issue 2365
Change-Id: I845d645ee4bc095ffb04f38a03dc00a4de7ff243
2014-01-24 00:58:17 +00:00
David Ostrovsky
a283507bcc Update GWT version to 2.6.0-rc3
GWT 2.6.0 has Java 7 support and other new features [1].

Internal Jetty version, shipped with GWT was updated to 8.1. This
version collides with the version that is used internally by Gerrit
(9.1).  To resolve the conflict, GWT's own Jetty version is stripped
from the gwt-dev.jar with maven_jar() method and Gerrit's own Jetty
used instead. Missing Jetty artifacts, needed for the GWT to run in
dev mode:

* jetty-webapp
* jetty-xml

are included now as dependency of gerrit-gwtdebug project.

New GWT version updates a number of dependencies that are used in
Gerrit [3]. Update them too.

EditIteratorTest test is failing with NSME Exception in gwt-test-utils
framework, so deactivate it for now [2].

[1] http://www.gwtproject.org/release-notes.html#Release_Notes_2_6_0_RC1
[2] https://code.google.com/p/gwt-test-utils/issues/detail?id=179
[3]
* Guava 15.0
* Protobuf 2.5.0
* ASM 4.1

Change-Id: I0fa96da6465d52febeae65168b0bd1c2913f6c7e
2014-01-23 06:39:08 +01:00
Shawn Pearce
101a8c4b65 Only pack CM3 themes selectable by the user
This avoids packing too many CSS rules, which bloats the download
to the browser and may slow down rendering while the browser picks
matching CSS classes.

Change-Id: I8888bc9daa9693ff2598ccfe29d150fa3fac0916
2014-01-21 15:07:10 -08:00
Shawn Pearce
7b083ddcc8 Merge "SideBySide2: Add preference for a subset of supported CM3 themes" 2014-01-21 22:36:44 +00:00
David Ostrovsky
84a66d82d3 SideBySide2: Add preference for a subset of supported CM3 themes
Add support for CM3 themes. CM3 has built in support for themes.
Unfortunately we can not use all of them out of the box, because
we set statically background colors on diff styles.  However we
can use light themes. Especially "eclipse" theme looks very sexy
for Java developers that use this IDE and are acquainted with its
look and feel.

Integrate all supported themes in Buck tool chain, so that we are
prepared to extend the support for dark themes. To do that we must
dynamically assign background colors for different diff styles per
theme.

Change-Id: Ic97c237d789dc4daeff6b8bb4f7606da83f5d532
2014-01-21 14:36:20 -08:00
Shawn Pearce
7511ad7a1d Update parboiled to 1.1.6
Change-Id: I3ddd2e46593170fa48c6efdfbc26aeb5467a568e
2014-01-21 08:28:25 -08:00
Shawn Pearce
c36651beba Merge "Buck: Add gerrit api Maven repository" 2014-01-17 19:42:43 +00:00
Shawn Pearce
a74ec02f8d Update parboiled to 1.1.4
Change-Id: I59365316b77bcc35a477f6fb32fe23884e1feaa9
2014-01-17 09:57:27 -08:00
David Ostrovsky
a270797e7a Buck: Add gerrit api Maven repository
This change allows standalone Buck plugins to build against released Gerrit
plugin API.

Change-Id: I41375cad0f1b3bda285268e54056275d7661a472
2014-01-17 09:05:00 +01:00
Shawn Pearce
906efd9d07 Merge branch 'stable-2.8'
* stable-2.8:
  Codemirror: Add support for Groovy mode
  Codemirror: Add support for Clojure mode
  Codemirror: Add support for Lisp mode
  Codemirror: Add support for ruby mode
  Codemirror: Add support for perl mode

Conflicts:
	gerrit-server/src/main/java/com/google/gerrit/server/DefaultFileExtensionRegistry.java

Change-Id: Icf61f85ea50b02d63a222973d0781afe67e03ee6
2014-01-16 14:05:37 -08:00
David Ostrovsky
59da23e4ca Codemirror: Add support for Groovy mode
Change-Id: I7654e4c9911a3c6da9023155440445a4e777516b
2014-01-16 21:34:34 +01:00
David Ostrovsky
893b5b13b7 Codemirror: Add support for Clojure mode
Change-Id: Ie814a7f7b5a97554617889b439f02aec065b8189
2014-01-16 21:34:34 +01:00
David Ostrovsky
d225f608a8 Codemirror: Add support for Lisp mode
Change-Id: I653b8a385029bd89516206ac67e022915d5713c1
2014-01-16 21:34:34 +01:00
David Ostrovsky
1f9e50cdb7 Codemirror: Add support for ruby mode
Change-Id: I0077bf99ec9960beb6d40911b65ee92af523b093
2014-01-16 21:34:34 +01:00
David Ostrovsky
22fa35d6cf Codemirror: Add support for perl mode
Bug: issue 2398
Change-Id: Ie7c2b4583a71ad9646ef745df156bcb31ae1f9a4
2014-01-16 21:34:32 +01:00
David Ostrovsky
8853263cf8 Codemirror: Add support for ruby mode
Change-Id: I0077bf99ec9960beb6d40911b65ee92af523b093
2014-01-15 21:40:41 +01:00
David Ostrovsky
5576dae781 Codemirror: Add support for perl mode
Bug: issue 2398
Change-Id: Ie7c2b4583a71ad9646ef745df156bcb31ae1f9a4
2014-01-15 20:55:01 +01:00
David Ostrovsky
731967591e Buck: Preserve SNAPSHOT suffix in Maven artifact names
Drop the code that removes SNAPSHOT suffix in artifact name. This prevents
Gitblit plugin from fetching its custom artifact from Gerritforge Maven
repository, making from the right name:

  com/gitblit/gitblit/1.4.0-SNAPSHOT/gitblit-1.4.0-SNAPSHOT.jar

the broken artifact name:

  com/gitblit/gitblit/1.4.0-SNAPSHOT/gitblit-1.4.0.jar

Change-Id: Ib16f032a9fda3ef61570a85d97659cd3ce02f5f2
2014-01-11 12:54:52 +00:00
Shawn Pearce
cbf1364f37 Merge "Bump Jetty version to stable 9.1 and Servlet API to 3.1" 2014-01-10 23:24:36 +00:00
Shawn Pearce
3dec27bf84 Merge "Buck: Preserve SNAPSHOT suffix in Maven artifact names" 2014-01-10 23:18:26 +00:00
Shawn Pearce
9c1bbb0a6d Merge "Bump JGit version to 3.2.0.201312181205-r" 2014-01-08 23:03:52 +00:00
Shawn Pearce
a42c0bb09a Simplify documentation indexer
Write the index entirely in RAM. Its only a few hundred KiB, which
trivially fits in memory.

Compress it twice in memory, once to build the ZIP that is unpacked
at runtime, and again to package it into a JAR for linking with
the runtime. This saves a build step in the BUCK rules.

Move the ZIP under the server package name, to reduce any risk
of collision with another concept of "index.zip".

Change-Id: I74e59712e9855ac79c5220ff0a6b30ecbc3d152f
2014-01-08 14:01:42 -08:00
David Ostrovsky
cd409d549e Buck: Preserve SNAPSHOT suffix in Maven artifact names
Drop the code that removes SNAPSHOT suffix in artifact name. This prevents
Gitblit plugin from fetching its custom artifact from Gerritforge Maven
repository, making from the right name:

  com/gitblit/gitblit/1.4.0-SNAPSHOT/gitblit-1.4.0-SNAPSHOT.jar

the broken artifact name:

  com/gitblit/gitblit/1.4.0-SNAPSHOT/gitblit-1.4.0.jar

Change-Id: Ib16f032a9fda3ef61570a85d97659cd3ce02f5f2
2014-01-05 20:34:27 +01:00
David Ostrovsky
af0e80b954 Bump JGit version to 3.2.0.201312181205-r
Change-Id: Ib8a26e39d8be17854701250eb32f1cc91615ac17
2014-01-05 20:11:01 +01:00
David Ostrovsky
e01d9b7f20 Bump Jetty version to stable 9.1 and Servlet API to 3.1
Change-Id: Ic6a374afa978e66ec1a04a2b39801da158ba31d7
2014-01-04 22:28:10 +01:00
Saša Živkov
17bb675699 Merge "Update org.pegdown:pegdown to 1.2.1" 2014-01-02 09:40:00 +00:00
Edwin Kempin
100af098ef Update org.pegdown:pegdown to 1.2.1
Change-Id: I1a4974b621d689ffd41073e1f1b140352c45aa1b
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
2013-12-30 10:32:35 +01:00
Yuxuan 'fishy' Wang
b71ac62312 Fix the documentation title in the search results.
In 61698b14e0 I changed the section title style, which caused an extra "= " in
front of the documentation titles in the Lucene index. Use a regular expression
to strip it out.

Change-Id: I550bcd32ee9e4475c8f71db1ab466895339d91f2
2013-12-27 15:40:08 -08:00
David Ostrovsky
71f734b5c1 Switch to Lucene 4.6 in code
This change introduces new index schema version.
Change-Id: Ib05e2769692eb61e9adc2d7053140cad42ee5781
2013-12-27 10:08:19 -08:00
David Ostrovsky
20d672e49f Bump Lucene version to 4.6.0
Also remove unused artifacts from the Buck file.

Gerrit gitblit plugin must ship Lucene binaries in shaded jar, because
the versions of Lucene that Gerrit and Gitblit ship are different.

This change and this pull request [1] harmonize the Lucene versions in Gerrit
and Gitblit distributions.

[1] https://github.com/gitblit/gitblit/pull/124

Change-Id: Ib94a288b60445d73f617174d58f69e4fe91b4d36
2013-12-27 10:08:18 -08:00
David Pursehouse
7275ab2aff Update gwtjsonrpc to 1.4
Change-Id: If2b9414c9efd73c29333bb1e8cec2230cd8b5f7f
2013-12-12 16:25:48 +09:00
David Pursehouse
b636df8177 Update gwtorm to 1.8
Change-Id: Id65589a87b62b72a64cc8a7d80ea9bbf612950ef
2013-12-09 14:15:03 +09:00
David Ostrovsky
bc62245ec6 Buck: unsign all jgit jars
Change-Id: I25749b80f2060f3322844cd2b94075acd3874e51
(cherry picked from commit 0b579f89efe2e9889b84f5eb609a9afd422cca44)
2013-12-07 14:39:34 +00:00
David Ostrovsky
c34d3607ba Install open ssl jar into Gerrit site for bouncycastle crypto provider
937d527ac0e4ee685fccb60ae604406a6638daec upgraded bouncy castle to 1.49.

The old JAR artifact was renamed and split to number of files. For Gerrit
two libraries must be downloaded and be available under `$gerrit_site/lib`:

* bcprov-jdk15on-149.jar
* bcpkix-jdk15on-149.jar

Update download logic to support a basic concept of required dependencies,
ensuring BC provider is downloaded if the SSL library is installed by init.

Change-Id: I60092ebe136f78a5649fe8512737275f50195a34
2013-11-30 10:30:43 -08:00
Shawn Pearce
ab2319061d Merge "Update Buck" 2013-11-30 02:11:54 +00:00
Shawn Pearce
4e1a8bc63d Update Buck
Buck changed export_deps from a boolean to be exported_deps, a list of
dependencies that are to be added to deps and also exported.  This
allows libraries to have dependencies for implementation use only, but
not expose them to callers for linkage.

exported_deps aren't transparently transitive anymore.  This mostly
impacts the plugin-api:lib rule.

This is the first time Gerrit is using upstream Buck with no patches.

- Java memory settings for Buck can now be supplied in a project
  specific file using `.buckjavaargs` in the root directory.  The file
  replaces the `.buckrc` previously supported by Gerrit's fork.

- Temporary directories for java_application() invoked from genrule()
  is now supplied as part of the arguments using $TMP.  This removes
  one of the patches Gerrit had for Buck.

- Unit tests use the system temporary directory during testing.  This
  can be faster if the temporary directory is a tmpfs.  Unfortunately
  not all passing tests clean up after themselves, making it possible
  to exhaust system memory and swap with useless tmpfs contents.
  Using the system temporary directory for tests removes another patch
  Gerrit had on top of Buck.

Change-Id: I3a9fe4aab0a33a8673df727e618122027a742638
2013-11-29 10:50:59 -08:00
David Ostrovsky
937d527ac0 Bump bouncycastle verison to 1.49
Many bugs were fixed since version 1.44 that we are using[1].

JARs artifacts were renamed.

[1] http://www.bouncycastle.org/releasenotes.html

Change-Id: Ie2b22328c77b0100dfff61139b737894b88e7664
2013-11-29 08:49:06 +01:00
Shawn Pearce
3f7e5a3892 Update CodeMirror3
Upstream fixed an issue with line numbers
disappearing after a skip bar.

Change-Id: Ia7765f6956d7fc85d83b94fb6ec14a9d3ea4e42b
(cherry picked from commit 4bbf8b01672a7d1dddb34b3af535d4c4c7805523)
2013-11-25 22:45:18 +00:00
Shawn Pearce
b112635e9a Merge changes Ie3606db7,Ifa6a8eb4
* changes:
  Fix warnings when generating JavaDoc
  Buck: generate javadocs for plugin and extension API
2013-11-24 21:10:09 +00:00
David Ostrovsky
bb360ebe06 Buck: generate javadocs for plugin and extension API
buck build api

generates now javadocs.

  buck build api_install

installs all plugin/extension related artifacts with javadocs in the
local Maven repository.

Change-Id: Ifa6a8eb469f388e16449576ff2bff01a5dce67dd
2013-11-24 02:04:51 +01:00
Shawn Pearce
4bbf8b0167 Update CodeMirror3
Upstream fixed an issue with line numbers
disappearing after a skip bar.

Change-Id: Ia7765f6956d7fc85d83b94fb6ec14a9d3ea4e42b
2013-11-23 10:05:35 -08:00
Shawn Pearce
4e8a96f708 Merge branch 'stable-2.8'
* stable-2.8:
  SideBySide2: Revise SkipBar and disable horizontal scroll on LineWidgets
  Update CodeMirror3
2013-11-15 10:11:30 -08:00
Shawn Pearce
30ea943624 Update CodeMirror3
- Fixes hiding of the first line
- Fixes random moving of line number gutters

Change-Id: Iae501b7b85798fe3e164467d1b6ffb55e85bdddf
2013-11-15 09:52:01 -08:00
Shawn Pearce
445a70549e Merge "Bump args4j version to 2.0.26" 2013-11-15 08:05:28 +00:00
David Ostrovsky
985752f232 Bump args4j version to 2.0.26
New version has features which be useful for Gerrit core and plugins:

* new hidden attribute, specifying to hide it in help message
* new depends attribute, specifying the dependent option(s)
* multiValued attribute was removed

Change-Id: Ic7e9f37231cb83940db50fe3b9efe8ad972108cf
2013-11-15 09:58:39 +01:00
David Ostrovsky
8e78797190 Bump Jetty version to 9.0.6.v20130930
Change-Id: Id7306c3a2b9b3f59d24de1b93c114d7a284a3515
2013-11-15 09:24:17 +01:00
Shawn Pearce
4c62f72ff4 Merge branch 'stable-2.8'
* stable-2.8:
  Bump SSHD version to 0.9.0.201311081
  Add REST API to toggle starred change state

Change-Id: Ic8d7a1802f6d6319f8f1012f9fe0c7f0c030f60a
2013-11-08 21:36:02 -08:00