blob: 21e2081945fa194bd983f0eaf8077487ed56f6cb (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
|
#!/usr/bin/env sh
# Guard the classpath boundary needed to migrate YaCy's embedded server from
# Jetty 9 to Jetty 12 while Solr 9's Jetty client is relocated into a private
# package and kept out of YaCy source code.
set -eu
repo_root=$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)
cd "$repo_root"
fail() {
echo "FAIL: $*" >&2
exit 1
}
if grep -R -n -E \
--include='*.java' \
'(Http2SolrClient|CloudHttp2SolrClient|ConcurrentUpdateHttp2SolrClient|LBHttp2SolrClient|JettySolrRunner)' \
source >/dev/null 2>&1; then
grep -R -n -E \
--include='*.java' \
'(Http2SolrClient|CloudHttp2SolrClient|ConcurrentUpdateHttp2SolrClient|LBHttp2SolrClient|JettySolrRunner)' \
source >&2
fail "YaCy source must not use Solr's Jetty-backed clients or runner"
fi
if grep -E \
'name="(jetty-deploy|jetty-jmx)"' \
ivy.xml >/dev/null 2>&1; then
fail "ivy.xml contains a forbidden direct Jetty dependency"
fi
grep -E 'name="jetty-client".*conf="solr9-bridge->master"' ivy.xml >/dev/null 2>&1 || \
fail "jetty-client must only be a direct input of the Solr 9 bridge"
grep -E 'org="org.eclipse.jetty" name="jetty-io"' ivy.xml >/dev/null 2>&1 || \
fail "jetty-io must be an explicit dependency because YaCy imports its API"
for artifact in http2-client http2-common http2-http-client-transport; do
grep -E "org=\"org.eclipse.jetty.http2\" name=\"$artifact\".*conf=\"solr9-bridge->master\"" ivy.xml >/dev/null 2>&1 || \
fail "$artifact must only be an input of the Solr 9 bridge"
done
for artifact in slf4j-api slf4j-jdk14; do
grep -E "name=\"$artifact\" rev=\"1.7.36\" conf=\"solr9-bridge->master\"" ivy.xml >/dev/null 2>&1 || \
fail "$artifact 1.7.36 must only be an input of the Solr 9 bridge"
done
grep -E 'org="org.eclipse.jetty.toolchain" name="jetty-servlet-api" rev="4.0.9"' ivy.xml >/dev/null 2>&1 || \
fail "Jetty's EE8 Servlet 4 API must be an explicit dependency"
grep -E 'exclude org="javax.servlet" module="javax.servlet-api"' ivy.xml >/dev/null 2>&1 || \
fail "transitive javax.servlet-api artifacts must be excluded"
expected_jetty_version=$(sed -n \
's/.*org="org.eclipse.jetty" name="jetty-server" rev="\([^"]*\)".*/\1/p' \
ivy.xml)
[ -n "$expected_jetty_version" ] || \
fail "could not determine the public Jetty version from jetty-server in ivy.xml"
[ "$(printf '%s\n' "$expected_jetty_version" | wc -l | tr -d ' ')" -eq 1 ] || \
fail "jetty-server must declare exactly one public Jetty version"
if [ -d lib ]; then
public_jetty_count=0
for artifact in lib/jetty-*.jar; do
[ -e "$artifact" ] || continue
case $(basename "$artifact") in
jetty-servlet-api-*.jar)
# Jetty's Servlet 4 toolchain has its own version line.
continue
;;
esac
public_jetty_count=$((public_jetty_count + 1))
case $(basename "$artifact") in
*-"$expected_jetty_version".jar) ;;
*) fail "public Jetty artifact is not on version $expected_jetty_version: $artifact" ;;
esac
done
[ "$public_jetty_count" -gt 0 ] || \
fail "no public Jetty $expected_jetty_version artifacts found"
case "$expected_jetty_version" in
12.*)
for artifact in lib/jetty-continuation-*.jar; do
[ -e "$artifact" ] || continue
fail "Jetty 9-only artifact remains on the Jetty 12 classpath: $artifact"
done
;;
esac
servlet_api_count=0
for artifact in lib/*servlet-api-*.jar; do
[ -e "$artifact" ] || continue
servlet_api_count=$((servlet_api_count + 1))
[ "$(basename "$artifact")" = "jetty-servlet-api-4.0.9.jar" ] || \
fail "unexpected Servlet API artifact: $artifact"
done
[ "$servlet_api_count" -eq 1 ] || \
fail "expected exactly one public Servlet API artifact, found $servlet_api_count"
jar tf lib/jetty-servlet-api-4.0.9.jar | grep '^javax/servlet/resources/web-app_4_0.xsd$' >/dev/null 2>&1 || \
fail "Jetty Servlet API is missing the EE8 web.xml schema"
for pattern in \
'jetty-deploy-*.jar' \
'jetty-jmx-*.jar' \
'solr-core-*.jar' \
'solr-solrj-*.jar' \
'solr-scripting-*.jar' \
'http2-*.jar' \
'slf4j-*-1.7.36.jar'; do
for artifact in lib/$pattern; do
[ -e "$artifact" ] || continue
fail "forbidden resolved artifact: $artifact"
done
done
for artifact in \
solr-core-9.0.0 \
solr-solrj-9.0.0 \
solr-scripting-9.0.0 \
jetty-client-9.4.58.v20250814 \
jetty-http-9.4.58.v20250814 \
jetty-io-9.4.58.v20250814 \
jetty-util-9.4.58.v20250814 \
http2-client-9.4.58.v20250814 \
http2-common-9.4.58.v20250814 \
http2-http-client-transport-9.4.58.v20250814 \
slf4j-api-1.7.36 \
slf4j-jdk14-1.7.36; do
jar="lib/solr9-bridge-$artifact.jar"
[ -f "$jar" ] || fail "missing generated bridge artifact: $jar"
if jar tf "$jar" | grep '^org/eclipse/jetty/' >/dev/null 2>&1; then
fail "unrelocated Jetty class in $jar"
fi
if zipgrep -a -E 'org(/|\.)eclipse(/|\.)jetty' "$jar" >/dev/null 2>&1; then
fail "unrelocated Jetty reference in $jar"
fi
if jar tf "$jar" | grep '^org/slf4j/' >/dev/null 2>&1; then
fail "unrelocated SLF4J class in $jar"
fi
if zipgrep -a -E 'org(/|\.)slf4j' "$jar" >/dev/null 2>&1; then
fail "unrelocated SLF4J reference in $jar"
fi
done
fi
echo "PASS: Solr 9 uses only the relocated Jetty client and SLF4J 1.7 island."
|
