Skip to content

Commit cde89e6

Browse files
davidodavido
committed
Merge branch 'stable-2.11'
* stable-2.11: Add built-in documentation. Force ticket service off Restore anonymous repositories browse capability Minor refactoring of gitewb config URLs Top menu improvements Get rid of hacked Wicket version Change-Id: I03b48683138d5faf04f5405b65405df8b24e3ae7
2 parents 002bbf4 + 2b89e88 commit cde89e6

File tree

11 files changed

+479
-116
lines changed

11 files changed

+479
-116
lines changed

‎BUCK‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,44 @@ gerrit_plugin(
99
'Gerrit-ReloadMode: restart',
1010
],
1111
deps = [
12-
'//lib/commons:httpcore',
13-
'//lib/commons:net',
14-
'//lib/commons:codec',
12+
':gitblit-properties-jar',
13+
'//lib/httpcomponents:httpcore',
14+
'//plugins/gitblit/lib:confluence-core',
15+
'//plugins/gitblit/lib:force-partner-api',
16+
'//plugins/gitblit/lib:freemarker',
1517
'//plugins/gitblit/lib:gitblit-jar',
16-
'//plugins/gitblit/lib:wicket',
17-
'//plugins/gitblit/lib:wicket-extensions',
18-
'//plugins/gitblit/lib:wicketstuff',
19-
'//plugins/gitblit/lib:javax-mail',
2018
'//plugins/gitblit/lib:groovy',
21-
'//plugins/gitblit/lib:beust-jcommander',
19+
'//plugins/gitblit/lib:ivy',
20+
'//plugins/gitblit/lib:javax-mail',
2221
'//plugins/gitblit/lib:jdom',
23-
'//plugins/gitblit/lib:lucene-core',
22+
'//plugins/gitblit/lib:jsoup',
23+
'//plugins/gitblit/lib:libpam4j',
2424
'//plugins/gitblit/lib:lucene-highlighter',
2525
'//plugins/gitblit/lib:lucene-memory',
2626
'//plugins/gitblit/lib:markdownpapers',
27+
'//plugins/gitblit/lib:mediawiki-core',
28+
'//plugins/gitblit/lib:pf4j',
2729
'//plugins/gitblit/lib:rome',
30+
'//plugins/gitblit/lib:textile-core',
31+
'//plugins/gitblit/lib:tika',
32+
'//plugins/gitblit/lib:tracwiki-core',
33+
'//plugins/gitblit/lib:twiki-core',
2834
'//plugins/gitblit/lib:unboundid',
29-
':gitblit-properties-jar',
35+
'//plugins/gitblit/lib:waffle-jna',
36+
'//plugins/gitblit/lib:wicket',
37+
'//plugins/gitblit/lib:wicket-extensions',
38+
'//plugins/gitblit/lib:wikitext-core',
39+
],
40+
provided_deps = [
41+
'//lib/commons:codec',
42+
'//lib/commons:net',
43+
'//plugins/gitblit/lib:lucene-core',
3044
]
3145
)
3246

3347
prebuilt_jar(
3448
name = 'gitblit-properties-jar',
35-
binary_jar = genfile('gitblit-properties.zip'),
36-
deps = [':gitblit-properties'],
49+
binary_jar = ':gitblit-properties',
3750
)
3851

3952
genrule(

‎README.md‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,8 @@ repository aren't enough as they are missing some specific
1414
build parameters and constraints (i.e. shaded-jar) that are
1515
needed for a Gerrit plugin to work properly.
1616

17-
### Wicket
18-
You need to clone and build a modified version of Wicket that
19-
is currently published on GitHub under the GerritCodeReview
20-
organisation: https://github.com/GerritCodeReview/wicket.git
21-
22-
$ git clone https://github.com/GerritCodeReview/wicket.git
23-
$ git checkout wicket-1.4.23-gerrit
24-
$ mvn clean install -DskipTests
25-
2617
### Gitblit
18+
2719
You need to clone Gitblit from GitHub and build it locally
2820
using the installMaven ANT target.
2921

@@ -32,6 +24,7 @@ using the installMaven ANT target.
3224
$ ant -DresourceFolderPrefix=static installMaven
3325

3426
### Gitblit plugin
27+
3528
You are ready now to clone and build the Gitblit plugin: the
3629
Wicket and Giblit dependencies will be taken from your local
3730
Maven repository.
@@ -46,10 +39,11 @@ the following configuration to your Gerrit config.
4639
[gitweb]
4740
type = custom
4841
linkname = Gitblit
49-
url = plugins/
50-
revision = gitblit/commit/?r=${project}&h=${commit}
51-
project = gitblit/summary/?r=${project}
52-
branch = gitblit/log/?r=${project}&h=${branch}
53-
filehistory = gitblit/history/?f=${file}&r=${project}&h=${branch}
54-
file = gitblit/blob/?r=${project}&h=${commit}&f=${file}
55-
roottree = gitblit/tree/?r=${project}&h=${commit}
42+
url = plugins/gitblit/
43+
revision = commit/?r=${project}&h=${commit}
44+
project = summary/?r=${project}
45+
branch = log/?r=${project}&h=${branch}
46+
filehistory = history/?f=${file}&r=${project}&h=${branch}
47+
file = blob/?r=${project}&h=${commit}&f=${file}
48+
roottree = tree/?r=${project}&h=${commit}
49+

‎lib/BUCK‎

Lines changed: 119 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,53 @@
11
include_defs('//lib/maven.defs')
22
GERRITFORGE = 'http://gerritforge.com/snapshot'
33

4+
maven_jar(
5+
name = 'pf4j',
6+
id = 'ro.fortsoft.pf4j:pf4j:0.9.0',
7+
sha1 = 'ff412cadfee820c50bf02723187eda6165d70379',
8+
license = 'Apache2.0',
9+
)
10+
411
maven_jar(
512
name = 'gitblit-jar',
6-
id = 'com.gitblit:gitblit:1.4.0-SNAPSHOT',
7-
sha1 = '5d1a6df0ed4ee0517e1f61cdf92b7fb47b4b1119',
13+
id = 'com.gitblit:gitblit:1.7.0-SNAPSHOT',
14+
sha1 = 'bf24e3a78f5421908326ec4e5a522a0bc7af3903',
815
license = 'Apache2.0',
916
repository = GERRITFORGE,
1017
)
1118

1219
maven_jar(
1320
name = 'wicket',
14-
id = 'org.apache.wicket:wicket:1.4.21-selfload',
15-
sha1 = 'b822e4ce05232f39cc60adc59d3866452f919d6d',
21+
id = 'org.apache.wicket:wicket:1.4.23',
22+
sha1 = '304d9e23e52e9488308644093663b568952abd0b',
1623
license = 'Apache2.0',
17-
repository = GERRITFORGE,
1824
)
1925

2026
maven_jar(
2127
name = 'wicket-auth-roles',
22-
id = 'org.apache.wicket:wicket-auth-roles:1.4.21',
28+
id = 'org.apache.wicket:wicket-auth-roles:1.4.23',
2329
sha1 = '1b130dbf5578ace37507430a4a523f6594bf34fa',
2430
license = 'Apache2.0',
2531
)
2632

2733
maven_jar(
2834
name = 'wicket-extensions',
29-
id = 'org.apache.wicket:wicket-extensions:1.4.21',
30-
sha1 = 'fac510c7ee4399a29b927405ec3de40b67d105d8',
31-
license = 'Apache2.0',
32-
)
33-
34-
maven_jar(
35-
name = 'wicketstuff',
36-
id = 'org.wicketstuff:googlecharts:1.4.21',
37-
sha1 = '73d7540267afc3a0e91ca6148d3073e050dba180',
35+
id = 'org.apache.wicket:wicket-extensions:1.4.23',
36+
sha1 = '9ca61ca2273289d648dbb430e9033693c9b5eed3',
3837
license = 'Apache2.0',
3938
)
4039

4140
maven_jar(
4241
name = 'javax-mail',
43-
id = 'javax.mail:mail:1.4',
44-
sha1 = '1aa1579ae5ecd41920c4f355b0a9ef40b68315dd',
42+
id = 'com.sun.mail:javax.mail:1.5.1',
43+
sha1 = '9724dd44f1abbba99c9858aa05fc91d53f59e7a5',
4544
license = 'Apache2.0',
4645
)
4746

4847
maven_jar(
4948
name = 'groovy',
50-
id = 'org.codehaus.groovy:groovy-all:1.8.8',
51-
sha1 = '98a489343d3c30da817d36cbea5de11ed07bef31',
52-
license = 'Apache2.0',
53-
)
54-
55-
maven_jar(
56-
name = 'beust-jcommander',
57-
id = 'com.beust:jcommander:1.17',
58-
sha1 = '219a3540f3b27d7cc3b1d91d6ea046cd8723290e',
49+
id = 'org.codehaus.groovy:groovy-all:2.4.1',
50+
sha1 = 'a9ca9c9de09361ec2a18d2c058d2524fbd8eae0c',
5951
license = 'Apache2.0',
6052
)
6153

@@ -66,25 +58,24 @@ maven_jar(
6658
license = 'Apache2.0',
6759
)
6860

69-
# Unfortunately an older version than used by Gerrit itself
7061
maven_jar(
7162
name = 'lucene-core',
72-
id = 'org.apache.lucene:lucene-core:3.6.0',
73-
sha1 = '8a0429de6b7c9918841fa2c441a6ef4cc07f2a18',
63+
id = 'org.apache.lucene:lucene-core:4.10.2',
64+
sha1 = 'c01e3d675d277e0a93e7890d03cc3246b2cdecaa',
7465
license = 'Apache2.0',
7566
)
7667

7768
maven_jar(
7869
name = 'lucene-highlighter',
79-
id = 'org.apache.lucene:lucene-highlighter:3.6.0',
80-
sha1 = '9ee691f1dcc60f093df433c165d6a686c6d24553',
70+
id = 'org.apache.lucene:lucene-highlighter:4.10.2',
71+
sha1 = '7ced704190e1e5b9a9b32edec6dba9116d69ae72',
8172
license = 'Apache2.0',
8273
)
8374

8475
maven_jar(
8576
name = 'lucene-memory',
86-
id = 'org.apache.lucene:lucene-memory:3.6.1',
87-
sha1 = '8c7ca5572edea50973dc0d26cf75c27047eebe7e',
77+
id = 'org.apache.lucene:lucene-memory:4.10.2',
78+
sha1 = 'c381123b510dd790e27445430ab8203e5a27f5bc',
8879
license = 'Apache2.0',
8980
)
9081

@@ -97,15 +88,105 @@ maven_jar(
9788

9889
maven_jar(
9990
name = 'rome',
100-
id = 'rome:rome:1.0-selfload',
101-
sha1 = 'e8d80293c9c13b557f4e570d3e12afcaf64ac6d4',
91+
id = 'rome:rome:1.0',
92+
sha1 = '022b33347f315833e9348cec2751af1a5d5656e4',
10293
license = 'Apache2.0',
103-
repository = GERRITFORGE
10494
)
10595

10696
maven_jar(
10797
name = 'unboundid',
108-
id = 'com.unboundid:unboundid-ldapsdk:2.3.0',
109-
sha1 = '6fde8d9fb4ee3e7e3d7e764e3ea57195971e2eb2',
98+
id = 'com.unboundid:unboundid-ldapsdk:2.3.8',
99+
sha1 = '1788564d03f0b786a695f4de67b4cb55eda45e14',
100+
license = 'Apache2.0',
101+
)
102+
103+
maven_jar(
104+
name = 'jsoup',
105+
id = 'org.jsoup:jsoup:1.7.3',
106+
sha1 = '92568d7167ce1bf9eb1fd815b022d5a2c113547a',
107+
license = 'Apache2.0',
108+
)
109+
110+
maven_jar(
111+
name = 'tika',
112+
id = 'org.apache.tika:tika-core:1.5',
113+
sha1 = '194ca0fb3d73b07737524806fbc3bec89063c03a',
114+
license = 'Apache2.0',
115+
)
116+
117+
maven_jar(
118+
name = 'wikitext-core',
119+
id = 'org.fusesource.wikitext:wikitext-core:1.4',
120+
sha1 = 'b877ee61d064c01cbf9834ab1b7146cd44acad65',
121+
license = 'Apache2.0',
122+
)
123+
124+
maven_jar(
125+
name = 'twiki-core',
126+
id = 'org.fusesource.wikitext:twiki-core:1.4',
127+
sha1 = '00c392027ae056d555040af2d1e0ed217fa94712',
128+
license = 'Apache2.0',
129+
)
130+
131+
maven_jar(
132+
name = 'textile-core',
133+
id = 'org.fusesource.wikitext:textile-core:1.4',
134+
sha1 = '9169c4a2865232c7b22137d759fb7ee2cbf019de',
135+
license = 'Apache2.0',
136+
)
137+
138+
maven_jar(
139+
name = 'tracwiki-core',
140+
id = 'org.fusesource.wikitext:tracwiki-core:1.4',
141+
sha1 = 'e2c8a5597695dc82256f2a97a505783e5ab5b0cb',
142+
license = 'Apache2.0',
143+
)
144+
145+
maven_jar(
146+
name = 'mediawiki-core',
147+
id = 'org.fusesource.wikitext:mediawiki-core:1.4',
148+
sha1 = '30d1b5551bbf97a17abc22d51fe8dd3b4d27f1ab',
149+
license = 'Apache2.0',
150+
)
151+
152+
maven_jar(
153+
name = 'confluence-core',
154+
id = 'org.fusesource.wikitext:confluence-core:1.4',
155+
sha1 = '08210b4af6f055ada934753facd27d7abf9d01a8',
156+
license = 'Apache2.0',
157+
)
158+
159+
maven_jar(
160+
name = 'ivy',
161+
id = 'org.apache.ivy:ivy:2.2.0',
162+
sha1 = 'f9d1e83e82fc085093510f7d2e77d81d52bc2081',
163+
license = 'Apache2.0',
164+
)
165+
166+
maven_jar(
167+
name = 'force-partner-api',
168+
id = 'com.force.api:force-partner-api:24.0.0',
169+
sha1 = 'ce3cd3e2ccd51735f27a83e90018123e8bd10314',
170+
license = 'Apache2.0',
171+
)
172+
173+
maven_jar(
174+
name = 'freemarker',
175+
id = 'org.freemarker:freemarker:2.3.22',
176+
sha1 = '473d784b3cd2dcb6d49a287ded0542b7862c7d68',
177+
license = 'Apache2.0',
178+
)
179+
180+
maven_jar(
181+
name = 'waffle-jna',
182+
id = 'com.github.dblock.waffle:waffle-jna:1.7.3',
183+
sha1 = '94ba74d3fa15bb61d4901b062b8fd5046c9e99b9',
184+
license = 'Apache2.0',
185+
)
186+
187+
maven_jar(
188+
name = 'libpam4j',
189+
id = 'org.kohsuke:libpam4j:1.8',
190+
sha1 = '548d4a1177adad8242fe03a6930c335669d669ad',
110191
license = 'Apache2.0',
111192
)

0 commit comments

Comments
 (0)