171 Commits

Author SHA1 Message Date
Shawn Pearce
1065a871cc SideBySide2: Add syntax highlighting for 18 more languages
Include more languages into the CM3 mapping supported by Gerrit:

* coffeescript
* d
* diff
* dtd
* erlang
* gas
* gfm (GitHub Flavored Markdown)
* haskell
* lua
* markdown
* php
* pig
* r
* scheme
* smalltalk
* tcl
* verilog
* yaml

Change-Id: Ie3cc3657183a475fb71a71e0fe35be848deb985f
(cherry picked from commit 5478148f6f25db215424f51d6a5e88f7bf78f164)
2014-07-16 03:58:21 +00:00
David Pursehouse
e1b1b715d3 Update gwtorm to 1.13
- Add transaction support for Jdbc dialects

- Only bind LIMIT variable in SQL when dialect supports it

Also note that the groupID of the component has been changed to
com.google.gerrit

Change-Id: Ie89c1bcc9643e909becff7a0fef37880440f50e3
2014-07-09 06:01:06 +00:00
David Pursehouse
519e127c4d Merge branch 'stable-2.8' into stable-2.9
* stable-2.8:
  Update 2.8.6 release notes with recent fixes
  Update SSHD to 0.11.1-atlassian-1
  Expose Atlassian's maven repository
  Update gwtorm to 1.7.1
  Buck: Strip SNAPSHOT suffix in artifact names only for GERRIT repositories

Conflicts:
	lib/BUCK
	tools/download_file.py

Change-Id: Ia315d2da7a884f8466b461234183d78ef833675f
2014-07-02 10:53:09 +09:00
David Ostrovsky
f69698ce9b Update SSHD to 0.11.1-atlassian-1
Use custom build of SSHD library from Atlassian's maven repository,
that fixes sporadic handshake failures [1].

[1] https://issues.apache.org/jira/browse/SSHD-330

Change-Id: I4258f515ac10e04c8c8f1850f060b9dbad6d876f
2014-07-01 10:20:33 +09:00
David Ostrovsky
4488bd6857 Expose Atlassian's maven repository
Change-Id: Ie6c8ff50f4ed6460aa7cbdea707d97fdd1f86a40
2014-07-01 10:20:09 +09:00
David Pursehouse
45946f19ce Update gwtorm to 1.7.1
Change-Id: Ia9ba26bdda20a053bc3a267c5c9efad37e76ab77
2014-07-01 10:18:57 +09:00
David Ostrovsky
a3bed28ef7 Buck: Strip SNAPSHOT suffix in artifact names only for GERRIT repositories
Maven artifact names on Google bucket replacing SNAPSHOT suffix with
timestamp. 731967591ef98ab3c94691ba9dc0f217630dda76 changed this by
preserving the SNAPSHOT suffix. This broke fetching of gwtorm and
gwtjsonrpc and was reverted by 731967591ef98ab3c94691ba9dc0f217630dda76.

This change fixes this for both worlds: stripping it for GERRIT and
GERRIT_API Maven repositories but preserving it for the rest.

Test plan:

maven_jar() is working as expected for the both worlds:

* gwtorm:gwtorm:1.10-SNAPSHOT-20140310.015132-1 (repo = GERRIT)
* org.eclipse.jgit:org.eclipse.jgit:3.4.0-SNAPSHOT (repo = MAVEN_LOCAL)

Change-Id: I5357abe9ad6a40538c444ad70016c8c6d75d8ff3
2014-06-30 22:38:10 +09:00
Edwin Kempin
c96c284b28 Upgrade gwtorm to 1.11
This version of gwtorm contains an important bug-fix that ensures that
"LIMIT ?" is not omitted in generated queries [1]. This can improve the
performance of such queries by a large factor.

[1] https://gerrit-review.googlesource.com/57216

Change-Id: Ibd0d3918629b2901288de6dd2e85489e4503091a
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
2014-05-26 17:14:00 +02:00
Edwin Kempin
e12d850f3b Upgrade jgit to v3.4.0.201405051725-m7
This jgit milestone contains a bug-fix that fixes
MissingObjectExceptions in Gerrit.

[1] https://git.eclipse.org/r/21094

Bug: issue 2025
Change-Id: I57e95d09e87a0eca53735638da2a0ebbf30d9349
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
2014-05-09 15:52:07 +02:00
David Ostrovsky
a1ffd908d7 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
2014-04-24 18:14:41 +09:00
David Ostrovsky
30539fa2c8 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
2014-04-24 17:49:56 +09:00
Shawn Pearce
d363fa34cd Merge branch 'stable-2.8' into stable-2.9
* stable-2.8:
  SideBySide2: Fix failure to load from "ISE EditIterator out of bounds"
  Remove "Click to" from topic edit button's tooltip
  Fix: wrongly throw 'commit already exists' exception
  Update sshd to 0.11.0
  Bump SSHD version to 0.10.1 and enable nio2 backend

Conflicts:
	gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Topic.ui.xml

Change-Id: I63c1e12bbd413a8e212de5b2a8cf71fa2a2ce52d
2014-04-23 21:23:51 -07:00
David Pursehouse
c31e17f005 Update sshd to 0.11.0
Fixes a few issues including a null pointer exception [1] that causes
ssh commands to hang.

It also adds server driven rekeying after 1G bytes of data transferred,
which is a useful security feature.

[1] https://issues.apache.org/jira/browse/SSHD-307

Change-Id: I441995eaf76e4fe53f7991f5aef00e062900791b
2014-04-23 10:39:42 +09:00
David Ostrovsky
b9c66ea380 Bump SSHD version to 0.10.1 and enable nio2 backend
46f8488a78742799a4f5f781279c8955460e7964 removed nio2 backend because of
a bug [1].  Given that the bug is fixed and released, enable it again.

Another problem was also fixed and released [2].

Upgrade to the official version 0.10.1 makes Gerrit's own custom patch of
SSHD and hosting it on Google bucket unnecessary.

[1] https://issues.apache.org/jira/browse/SSHD-252
[2] https://issues.apache.org/jira/browse/SSHD-255

Bug: Issue 2406
Change-Id: I6668f6194427f153e1982e14b3936d2f3132fa7d
2014-04-23 10:39:23 +09:00
David Ostrovsky
2919972ce4 Enable disabled gwtui tests
a283507bccbd408540ae1baf75eb80eb59dce031 disabled EditIteratorTest due
to gwt-test-utils uncompatibility with new GWT 2.6 release.

After fixing the compatibility problem in [1] the tests can be enabled
again.

[1] https://github.com/gwt-test-utils/gwt-test-utils/issues/62

Change-Id: I1f93e6422a1ae60d66f4d8b4abac23b6a1acb4f9
2014-03-10 06:22:39 +00:00
Shawn Pearce
65df1358a1 Merge "Validate email address when adding email or creating account" 2014-03-08 00:36:40 +00:00
Saša Živkov
ceca56fa87 Bump JGit version to 3.3.0
Change-Id: I30c94c7b98529c503a2baf1cf3b6efcb36b60513
2014-03-07 16:38:59 +01:00
Shawn Pearce
5492217ea1 Merge "Bump GWT version to 2.6.0" 2014-03-06 20:29:54 +00:00
David Ostrovsky
56d89b458a Bump GWT version to 2.6.0
Change-Id: I3353e086112bd1bc4ac9bb2adc35110324c70059
2014-03-05 06:44:24 +00:00
David Ostrovsky
51b373679e CM3: Add support for dark themes
84a66d82d36d554c1844acff11d1a62f10c174ed added support for light and
dark themes, but dark themes weren't enabled, as diff styles have
to be adjusted to correspond with dark colors.

101a8c4b65ebee4d54afddad10db05f5b9698ba9 reverted the preparation
for dark themes support.

This change enables support for subset of dark themes and switch
dynamicaly the diff styles to dark colors, when dark theme was
selected.

Change-Id: Ic220baf8f19366c04520b61e893a0d11912805ef
2014-03-04 19:51:49 +01:00
David Ostrovsky
fbf6b7dabd Download commands: Add JGit archive
Since JGit 3.1 archive command was implemented. Add it to download
drop down as new line.

The following libraries are introduced in this change:

* jgit-archive (Apache 2)
* commons-compress (Apache 2)
* tukaani-xz (Public domain)

Change-Id: I5f61aac8c434414c73585a9320e84f4430dd111d
2014-03-03 23:34:46 +00:00
Dave Borowitz
5598c86c74 Update gwtjsonrpc to 1.5
Change-Id: Ic1dc85f87afedb2506e8264a0ca4fd5e749a5600
2014-02-24 14:49:26 -08:00
Shawn Pearce
070cc0ee52 Update JGit to 3.2.0.201312181205-r.61-gf2f24a3
This fixes a long standing bug in the copy and rename detection
code where a copied file that is also updating its mode loses its
copy status and breaks the diff display.

Change-Id: I15c4d61ff1489e2c9b17e3b9ca76d9dcc98e26a8
2014-02-18 17:00:14 -08:00
Edwin Kempin
a9abdf4589 Validate email address when adding email or creating account
This checks that the email address has a valid format.

Change-Id: I1f8d95dd9b02e720996bd15cca093ca55b5e4597
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
2014-02-07 10:02:33 +01:00
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
David Ostrovsky
6b53357fa6 Bump JGit version to 3.2.0.201312181205-r
(cherry picked from commit af0e80b95452a413b51a849ca002e778c2b95f23)
Change-Id: Ib8a26e39d8be17854701250eb32f1cc91615ac17
2014-01-30 17:07:44 +01: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