Merge ~vpa1977/ubuntu/+source/jtreg7:jtreg7-vendor into ubuntu/+source/jtreg7:ubuntu/devel
- Git
- lp:~vpa1977/ubuntu/+source/jtreg7
- jtreg7-vendor
- Merge into ubuntu/devel
Status: | Work in progress | ||||
---|---|---|---|---|---|
Proposed branch: | ~vpa1977/ubuntu/+source/jtreg7:jtreg7-vendor | ||||
Merge into: | ubuntu/+source/jtreg7:ubuntu/devel | ||||
Prerequisite: | ~vpa1977/ubuntu/+source/jtreg7:jtreg7-vendored-sources | ||||
Diff against target: |
4290 lines (+3741/-49) 67 files modified
debian/changelog (+15/-0) debian/compat (+1/-0) debian/component-scripts/build-components.sh (+25/-0) debian/component-scripts/clean-components.sh (+24/-0) debian/component-scripts/setup-component.sh (+14/-0) debian/control (+29/-11) debian/copyright (+697/-5) debian/gbp-export.sh (+3/-0) debian/gbp-import.sh (+3/-0) debian/jansi1/maven.ignoreRules (+64/-0) debian/jansi1/maven.rules (+23/-0) debian/jansi1/poms (+4/-0) debian/jansi1/rules (+14/-0) debian/jline3/maven.ignoreRules (+64/-0) debian/jline3/maven.rules (+23/-0) debian/jline3/poms (+10/-0) debian/jline3/rules (+13/-0) debian/jtreg7.install (+1/-1) debian/jtreg7.links (+0/-20) debian/junit4/maven.ignoreRules (+64/-0) debian/junit4/maven.rules (+23/-0) debian/junit4/poms (+1/-0) debian/junit4/rules (+8/-0) debian/junit5/maven.ignoreRules (+5/-0) debian/junit5/maven.rules (+2/-0) debian/junit5/poms (+21/-0) debian/junit5/rules (+8/-0) debian/libhamcrest-java/maven.ignoreRules (+64/-0) debian/libhamcrest-java/maven.rules (+23/-0) debian/libhamcrest-java/poms (+2/-0) debian/libhamcrest-java/rules (+7/-0) debian/maven.properties (+6/-0) debian/opentest4j-reporting/maven.ignoreRules (+64/-0) debian/opentest4j-reporting/maven.rules (+23/-0) debian/opentest4j-reporting/poms (+2/-0) debian/opentest4j-reporting/rules (+10/-0) debian/patches/jline3-01-ignore-warnings.patch (+31/-0) debian/patches/jline3-02-ignore-remote-modules.patch (+59/-0) debian/patches/junit4-Version.patch (+18/-0) debian/patches/junit4-exclude-dependency-sources.patch (+30/-0) debian/patches/junit4-hamcrest-compatibility.patch (+24/-0) debian/patches/junit4-java17-compatibility.patch (+50/-0) debian/patches/junit5-15-deprecated.patch (+16/-0) debian/patches/junit5-16-maven-build.patch (+1117/-0) debian/patches/junit5-17-backward-compatibility.patch (+49/-0) debian/patches/libhamcrest-java-04-gradle-build.patch (+70/-0) debian/patches/libhamcrest-java-05-backward-compatibility.patch (+23/-0) debian/patches/libhamcrest-java-06-type-inference-fix.patch (+116/-0) debian/patches/opentest4j-reporting-01-gradle-compatibility.patch (+45/-0) debian/patches/picocli-0001-Adjust-build-to-work-without-asciidoctor.patch (+391/-0) debian/patches/series (+15/-0) debian/patches/testng-build-with-gradle.patch (+129/-0) debian/picocli/maven.ignoreRules (+1/-0) debian/picocli/maven.rules (+3/-0) debian/picocli/poms (+3/-0) debian/picocli/rules (+19/-0) debian/rules (+17/-6) debian/source/lintian-overrides (+2/-0) debian/testng/maven.ignoreRules (+6/-0) debian/testng/maven.rules (+6/-0) debian/testng/poms (+1/-0) debian/testng/rules (+16/-0) debian/univocity-parsers/maven.ignoreRules (+63/-0) debian/univocity-parsers/maven.rules (+23/-0) debian/univocity-parsers/poms (+1/-0) debian/univocity-parsers/rules (+8/-0) debian/watch (+29/-6) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Pushkar Kulkarni (community) | Approve | ||
git-ubuntu import | Pending | ||
Review via email: mp+453477@code.launchpad.net |
Commit message
Description of the change
Please do not merge, this MP for documentation purpose - documenting changes in the jtreg7 backport.
Changes:
- d/watch: build MUT original tarball.
- d/component-
- d/copyright: include bundled components copyrights.
The d/rules call d/component-scripts to run make -f debian/rules binary for each of the bundled components during the package build.
The maven repository output files are copied into debian/
debian/
debian/
- d1547b1... by Vladimir Petko
-
fix Files-Excluded, use component names
- ec0bd7a... by Vladimir Petko
-
update watch file to use gz compression
- 9675e01... by Vladimir Petko
-
use ~us1 suffix for backport
- 7ad91da... by Vladimir Petko
-
add component tarball import/export scripts
- 2109887... by Vladimir Petko
-
add more file exclusions
- 31d43d4... by Vladimir Petko
-
correct upstream branch
- 35e1495... by Vladimir Petko
-
New upstream version 7.3.1+1~us1
- 294403d... by Vladimir Petko
-
remove redunant definition
- fc49edc... by Vladimir Petko
-
suppress lintian warnings
- 4bbdca9... by Vladimir Petko
-
add copyright exclusions
Unmerged commits
- 7cea988... by Vladimir Petko
-
changelog
changelog: do not fix the bug
- 4bbdca9... by Vladimir Petko
-
add copyright exclusions
- fc49edc... by Vladimir Petko
-
suppress lintian warnings
- 294403d... by Vladimir Petko
-
remove redunant definition
- 31d43d4... by Vladimir Petko
-
correct upstream branch
- 2109887... by Vladimir Petko
-
add more file exclusions
- 7ad91da... by Vladimir Petko
-
add component tarball import/export scripts
- 9675e01... by Vladimir Petko
-
use ~us1 suffix for backport
- ec0bd7a... by Vladimir Petko
-
update watch file to use gz compression
- d1547b1... by Vladimir Petko
-
fix Files-Excluded, use component names
Preview Diff
1 | diff --git a/debian/changelog b/debian/changelog |
2 | index 72a29c7..48675d6 100644 |
3 | --- a/debian/changelog |
4 | +++ b/debian/changelog |
5 | @@ -1,3 +1,18 @@ |
6 | +jtreg7 (7.3.1+1~us1-0ubuntu1) UNRELEASED; urgency=medium |
7 | + |
8 | + * Vendor jtreg7 dependencies: jansi1, jline3, junit4, junit5, |
9 | + libhamcrest-java, picocli, testng7, univocity-parsers to allow |
10 | + backports (LP: 2039219). |
11 | + - d/watch: build MUT original tarball. |
12 | + - d/component-scripts: add scripts to build the bundled components. |
13 | + - d/copyright: include bundled components copyrights. |
14 | + * d/control: downgrade debhelper compatibility level to 11 for |
15 | + backports. |
16 | + * d/rules: fix man page generation by using the version option. |
17 | + * Repack original tarball to drop excluded files. |
18 | + |
19 | + -- Vladimir Petko <vladimir.petko@canonical.com> Thu, 12 Oct 2023 09:57:47 +1300 |
20 | + |
21 | jtreg7 (7.3.1+1-1) unstable; urgency=medium |
22 | |
23 | * New upstream release 7.3.1 build 1. |
24 | diff --git a/debian/compat b/debian/compat |
25 | new file mode 100644 |
26 | index 0000000..b4de394 |
27 | --- /dev/null |
28 | +++ b/debian/compat |
29 | @@ -0,0 +1 @@ |
30 | +11 |
31 | diff --git a/debian/component-scripts/build-components.sh b/debian/component-scripts/build-components.sh |
32 | new file mode 100755 |
33 | index 0000000..1be77a8 |
34 | --- /dev/null |
35 | +++ b/debian/component-scripts/build-components.sh |
36 | @@ -0,0 +1,25 @@ |
37 | +#!/bin/sh |
38 | +if [ -z ${DH_VERBOSE+x} ]; then |
39 | + set -e |
40 | +else |
41 | + set -ex |
42 | +fi |
43 | + |
44 | +package=$1 |
45 | +shift |
46 | +package_dir=`pwd` |
47 | + |
48 | +for component in $@; do |
49 | + # mh_* only work from the current directory. |
50 | + # in order to give it context copy debian/ into component directory |
51 | + # this includes the local maven repo |
52 | + debian/component-scripts/setup-component.sh ${package} ${component} |
53 | + |
54 | + cd ${component} |
55 | + |
56 | + make -f debian/rules binary |
57 | + |
58 | + cd ${package_dir} |
59 | + mkdir -p ${component}/debian/${package}/usr/share/maven-repo |
60 | + rsync -Lav ${component}/debian/${package}/usr/share/maven-repo ${package_dir}/debian/built-components |
61 | +done |
62 | \ No newline at end of file |
63 | diff --git a/debian/component-scripts/clean-components.sh b/debian/component-scripts/clean-components.sh |
64 | new file mode 100755 |
65 | index 0000000..1631a50 |
66 | --- /dev/null |
67 | +++ b/debian/component-scripts/clean-components.sh |
68 | @@ -0,0 +1,24 @@ |
69 | +#!/bin/sh |
70 | +if [ -z ${DH_VERBOSE+x} ]; then |
71 | + set -e |
72 | +else |
73 | + set -ex |
74 | +fi |
75 | + |
76 | +package=$1 |
77 | +shift |
78 | +package_dir=`pwd` |
79 | + |
80 | +for component in $@; do |
81 | + # mh_* only work from the current directory. |
82 | + # in order to give it context copy debian/ into component directory |
83 | + # this includes the local maven repo |
84 | + |
85 | + debian/component-scripts/setup-component.sh ${package} ${component} |
86 | + |
87 | + (cd ${component} && make -f debian/rules clean) |
88 | + |
89 | + rm -rf ${component}/debian |
90 | +done |
91 | + |
92 | +rm -rf debian/built-components |
93 | diff --git a/debian/component-scripts/setup-component.sh b/debian/component-scripts/setup-component.sh |
94 | new file mode 100755 |
95 | index 0000000..0579503 |
96 | --- /dev/null |
97 | +++ b/debian/component-scripts/setup-component.sh |
98 | @@ -0,0 +1,14 @@ |
99 | +#!/bin/sh |
100 | + |
101 | +package=$1 |
102 | +component=$2 |
103 | + |
104 | +mkdir -p ${component}/debian/ |
105 | +cp debian/control ${component}/debian |
106 | +cp debian/changelog ${component}/debian |
107 | +cp debian/compat ${component}/debian |
108 | +cp debian/maven.properties ${component}/debian |
109 | +cp debian/${component}/poms ${component}/debian/${package}.poms |
110 | +cp debian/${component}/maven.rules ${component}/debian/ |
111 | +cp debian/${component}/maven.ignoreRules ${component}/debian/ |
112 | +cp debian/${component}/rules ${component}/debian/ |
113 | diff --git a/debian/control b/debian/control |
114 | index 45557d8..eec6f4a 100644 |
115 | --- a/debian/control |
116 | +++ b/debian/control |
117 | @@ -1,25 +1,46 @@ |
118 | Source: jtreg7 |
119 | Section: java |
120 | Priority: optional |
121 | -Maintainer: Vladimir Petko <vladimir.petko@canonical.com> |
122 | +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
123 | +XSBC-Original-Maintainer: Vladimir Petko <vladimir.petko@canonical.com> |
124 | Uploaders: Matthias Klose <doko@debian.org> |
125 | Build-Depends: |
126 | ant, |
127 | - debhelper-compat (=13), |
128 | + debhelper (>=11), |
129 | default-jdk, |
130 | help2man, |
131 | javahelp2, |
132 | javahelper, |
133 | - libjtharness-java (>= 6.0), |
134 | - libxalan2-java, |
135 | - libhamcrest-java, |
136 | - libtestng7-java, |
137 | libasmtools-java, |
138 | libjcommander-java, |
139 | libslf4j-java, |
140 | - junit5, |
141 | libguice-java, |
142 | - zip |
143 | + libjline2-java, |
144 | + zip, |
145 | + libhawtjni-runtime-java (>= 1.16), |
146 | + libjansi-native-java (>= 1.7), |
147 | + maven-repo-helper, |
148 | + maven-debian-helper, |
149 | + gradle-debian-helper (>= 1.4), |
150 | + groovy (>= 2.4.10), |
151 | + libjna-java, |
152 | + libjuniversalchardet-java, |
153 | + libmaven-bundle-plugin-java, |
154 | + libmaven-dependency-plugin-java, |
155 | + libmaven-source-plugin-java, |
156 | + libbuild-helper-maven-plugin-java, |
157 | + junit, |
158 | + libeasymock-java, |
159 | + libjmock-java, |
160 | + rsync, |
161 | + libmaven-shade-plugin-java, |
162 | + libopentest4j-java, |
163 | + libassertj-core-java, |
164 | + libjtharness-java (>= 6.0), |
165 | + libyaml-snake-java, |
166 | + libapiguardian-java, |
167 | + libfindbugs-java, |
168 | + libbsh-java, |
169 | Standards-Version: 4.6.2 |
170 | Homepage: https://openjdk.java.net/jtreg |
171 | Rules-Requires-Root: no |
172 | @@ -32,13 +53,10 @@ Depends: |
173 | javahelp2, |
174 | libjtharness-java (>= 6.0), |
175 | libxalan2-java, |
176 | - libhamcrest-java, |
177 | libasmtools-java, |
178 | libjcommander-java, |
179 | libslf4j-java, |
180 | - junit5, |
181 | libguice-java, |
182 | - libtestng7-java |
183 | Conflicts: jtreg, jtreg6 |
184 | Description: Regression Test Harness for the OpenJDK platform |
185 | jtreg is the test harness used by the OpenJDK test framework. |
186 | diff --git a/debian/copyright b/debian/copyright |
187 | index 52a94db..4bd36a8 100644 |
188 | --- a/debian/copyright |
189 | +++ b/debian/copyright |
190 | @@ -1,9 +1,49 @@ |
191 | Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ |
192 | -# Exclude directories containing |
193 | -# - Intellij IDEA plugin |
194 | -# - Github Actions |
195 | -# - checkstyle |
196 | -Files-Excluded: plugins .github make/checkstyle |
197 | +Files-Excluded: |
198 | + plugins |
199 | + .github |
200 | + make/checkstyle |
201 | +Files-Excluded-jline3: |
202 | + mvnw |
203 | + mvnw.cmd |
204 | + .mvn |
205 | + *.jar |
206 | + *.zip |
207 | + demo/*.exe |
208 | +Files-Excluded-junit4: |
209 | + lib |
210 | + mvnw |
211 | + mvnw.cmd |
212 | + .mvn |
213 | + *.jar |
214 | + *.zip |
215 | + apache-maven |
216 | + .classpath |
217 | + .project |
218 | + .settings |
219 | + .travis.yml |
220 | + src/site |
221 | +Files-Excluded-junit5: |
222 | + gradlew* |
223 | + gradle/wrapper |
224 | + documentation |
225 | +Files-Excluded-libhamcrest-java: |
226 | + gradlew* |
227 | + gradle/wrapper |
228 | + docs/javadoc |
229 | +Files-Excluded-opentest4j-reporting: |
230 | + gradlew* |
231 | + gradle |
232 | + .github/* |
233 | +Files-Excluded-picocli: |
234 | + docs |
235 | + gradle/wrapper |
236 | + gradlew* |
237 | +Files-Excluded-testng: |
238 | + .gitignore |
239 | + .gitattributes |
240 | + .github/* |
241 | + gradle/* |
242 | Upstream-Name: jtreg |
243 | Source: https://github.com/openjdk/jtreg/ |
244 | |
245 | @@ -55,6 +95,72 @@ License: GPL-2 with Classpath exception |
246 | the library, but you are not obligated to do so. If you do not wish to do |
247 | so, delete this exception statement from your version. |
248 | |
249 | +Files: jansi1/* |
250 | +Copyright: 2009-2017 the original author(s) |
251 | +License: Apache-2.0 |
252 | + |
253 | +Files: jline3/* |
254 | +Copyright: 2000-2005, Dieter Wimberger |
255 | + 2002-2017, Guillaume Nodet |
256 | + 2002-2016, Matti Rintanikkola |
257 | + 2002-2016, Jason Dillon |
258 | +License: BSD-3-clause |
259 | + |
260 | +Files: jline3/builtins/* |
261 | + jline3/reader/src/main/java/org/jline/reader/EOFError.java |
262 | + jline3/reader/src/main/java/org/jline/reader/SyntaxError.java |
263 | + jline3/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/AnsiOutputStream.java |
264 | +Copyright: 2002-2016, Guillaume Nodet |
265 | +License: Apache-2.0 |
266 | + |
267 | +Files: junit4/* |
268 | +Copyright: 2006-2020 Junit contributors |
269 | +License: EPL-1 |
270 | + |
271 | +Files: junit5/* |
272 | +Copyright: 2015-2019, Sam Brannen |
273 | + 2015-2019, Marc Philipp |
274 | + 2016-2019, Christian Stein |
275 | + 2015-2017, Johannes Link |
276 | + 2016-2018, Matthias Merdes |
277 | + 2016-2018, Konstantin Lutovich |
278 | + 2016-2017, Stefan Bechtold |
279 | + 2016-2017, Stefan Birkner |
280 | + 2016-2017, Jonathan Bluett-Duncan |
281 | + 2015-2016, Jens Schauder |
282 | + 2016-2018, Nicolai Parlog |
283 | +License: EPL-2.0 |
284 | + |
285 | +Files: libhamcrest-java/* |
286 | +Copyright: 2000-2006, www.hamcrest.org |
287 | +License: BSD-3-clause |
288 | + |
289 | +Files: opentest4j-reporting/* |
290 | +Copyright: 2021-2022, Marc Philipp <mail@marcphilipp.de> |
291 | +License: Apache-2.0 |
292 | + |
293 | +Files: picocli/* |
294 | +Copyright: 2017-2018, Remko Popma <rpopma@apache.org> |
295 | + 2017, Jim White |
296 | + 2017, Robert Zenz |
297 | +License: Apache-2.0 |
298 | + |
299 | +Files: picocli/src/main/java/picocli/CommandLine.java |
300 | +Copyright: 2017-2018, Remko Popma <rpopma@apache.org> |
301 | + 2007, Burt Beckwith |
302 | +License: Apache-2.0 |
303 | +Comment: |
304 | + File contains code snippet released under Apache-2.0 on a blog, |
305 | + http://www.nearinfinity.com/blogs/seth_schroeder/groovy_cosine_similarity_in_grails.html |
306 | + |
307 | +Files: testng/* |
308 | +Copyright: 2013, Cedric Beust |
309 | +License: Apache-2.0 |
310 | + |
311 | +Files: univocity-parsers/* |
312 | +Copyright: 2013-2019, Univocity Software Pty Ltd |
313 | +License: Apache-2.0 |
314 | + |
315 | Files: debian/* |
316 | Copyright: 2023 Canonical Ltd. |
317 | 2011 Guillaume Mazoyer <respawneral@gmail.com> |
318 | @@ -74,3 +180,589 @@ License: GPL-2+ |
319 | . |
320 | On Debian systems, the complete text of the GNU General |
321 | Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". |
322 | + |
323 | +Files: debian/jansi1/* |
324 | +Copyright: 2010, Miguel Landaeta <nomadium@debian.org> |
325 | + 2016-2017, Markus Koschany <apo@debian.org> |
326 | +License: Apache-2.0 |
327 | + |
328 | +Files: debian/jline3/* |
329 | +Copyright: 2019, Saif Abdul Cassim <saif.15@cse.mrt.ac.lk> |
330 | + 2020, Samyak Jain <samyak.jn11@gmail.com> |
331 | +License: BSD-3-clause |
332 | +Comment: |
333 | + The Debian packaging is licensed under the same terms as the upstream project. |
334 | + |
335 | +Files: debian/junit4/* |
336 | +Copyright: 2007, Florian Weimer |
337 | + 2008-2012, Michael Koch, Varun Hiremath, Damien Raude-Morvan, Ludovic |
338 | + Claude, Torsten Werner, Jakub Adam, Niels Thykier |
339 | + 2013-2020, tony mancill, Emmanuel Bourg, Markus Koschany |
340 | +License: EPL-1 |
341 | + |
342 | +Files: debian/junit5/* |
343 | +Copyright: 2019, Emmanuel Bourg |
344 | +License: EPL-2.0 |
345 | + |
346 | +Files: debian/libhamcrest-java/* |
347 | +Copyright: 2008, Varun Hiremath <varun@debian.org> |
348 | +License: GPL |
349 | + On Debian systems, the complete text of the GPL License can be |
350 | + found in `/usr/share/common-licenses/GPL'. |
351 | + |
352 | +Files: debian/opentest4j-reporting/* |
353 | +Copyright: 2022, Emmanuel Bourg <ebourg@apache.org> |
354 | +License: Apache-2.0 |
355 | + |
356 | +Files: debian/picocli/* |
357 | +Copyright: 2018, Miroslav Kravec <kravec.miroslav@gmail.com> |
358 | + 2021-2022, tony mancill <tmancill@debian.org> |
359 | +License: Apache-2.0 |
360 | + |
361 | +Files: debian/testng/* |
362 | +Copyright: 2013, Eugene Zhukov <jevgeni.zh@gmail.com> |
363 | + 2023, Canonical Ltd. |
364 | +License: Apache-2.0 |
365 | + |
366 | +Files: debian/univocity-parsers/* |
367 | +Copyright: 2019, Emmanuel Bourg <ebourg@apache.org> |
368 | +License: Apache-2.0 |
369 | + |
370 | +License: Apache-2.0 |
371 | + Licensed under the Apache License, Version 2.0 (the "License"); |
372 | + you may not use this file except in compliance with the License. |
373 | + You may obtain a copy of the License at |
374 | + . |
375 | + http://www.apache.org/licenses/LICENSE-2.0 |
376 | + . |
377 | + Unless required by applicable law or agreed to in writing, software |
378 | + distributed under the License is distributed on an "AS IS" BASIS, |
379 | + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
380 | + See the License for the specific language governing permissions and |
381 | + limitations under the License. |
382 | + . |
383 | + The full text of the Apache 2.0 license is distributed in |
384 | + /usr/share/common-licenses/Apache-2.0 on Debian systems. |
385 | + |
386 | +License: BSD-3-clause |
387 | + Redistribution and use in source and binary forms, with or |
388 | + without modification, are permitted provided that the following |
389 | + conditions are met: |
390 | + . |
391 | + Redistributions of source code must retain the above copyright |
392 | + notice, this list of conditions and the following disclaimer. |
393 | + . |
394 | + Redistributions in binary form must reproduce the above copyright |
395 | + notice, this list of conditions and the following disclaimer |
396 | + in the documentation and/or other materials provided with |
397 | + the distribution. |
398 | + . |
399 | + Neither the name of JLine nor the names of its contributors |
400 | + may be used to endorse or promote products derived from this |
401 | + software without specific prior written permission. |
402 | + . |
403 | + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
404 | + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, |
405 | + BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY |
406 | + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO |
407 | + EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE |
408 | + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, |
409 | + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
410 | + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
411 | + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED |
412 | + AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
413 | + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING |
414 | + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED |
415 | + OF THE POSSIBILITY OF SUCH DAMAGE. |
416 | + |
417 | +License: EPL-1 |
418 | + Eclipse Public License - v 1.0 |
419 | + . |
420 | + THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC |
421 | + LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM |
422 | + CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. |
423 | + . |
424 | + 1. DEFINITIONS |
425 | + . |
426 | + "Contribution" means: |
427 | + . |
428 | + a) in the case of the initial Contributor, the initial code and |
429 | + documentation distributed under this Agreement, and |
430 | + b) in the case of each subsequent Contributor: |
431 | + . |
432 | + i) changes to the Program, and |
433 | + . |
434 | + ii) additions to the Program; |
435 | + . |
436 | + where such changes and/or additions to the Program originate from and are |
437 | + distributed by that particular Contributor. A Contribution 'originates' |
438 | + from a Contributor if it was added to the Program by such Contributor |
439 | + itself or anyone acting on such Contributor's behalf. Contributions do |
440 | + not include additions to the Program which: (i) are separate modules of |
441 | + software distributed in conjunction with the Program under their own |
442 | + license agreement, and (ii) are not derivative works of the Program. |
443 | + . |
444 | + "Contributor" means any person or entity that distributes the Program. |
445 | + . |
446 | + "Licensed Patents " mean patent claims licensable by a Contributor which are |
447 | + necessarily infringed by the use or sale of its Contribution alone or when |
448 | + combined with the Program. |
449 | + . |
450 | + "Program" means the Contributions distributed in accordance with this Agreement. |
451 | + . |
452 | + "Recipient" means anyone who receives the Program under this Agreement, |
453 | + including all Contributors. |
454 | + . |
455 | + 2. GRANT OF RIGHTS |
456 | + . |
457 | + a) Subject to the terms of this Agreement, each Contributor hereby grants |
458 | + Recipient a non-exclusive, worldwide, royalty-free copyright license to |
459 | + reproduce, prepare derivative works of, publicly display, publicly perform, |
460 | + distribute and sublicense the Contribution of such Contributor, if any, and |
461 | + such derivative works, in source code and object code form. |
462 | + . |
463 | + b) Subject to the terms of this Agreement, each Contributor hereby grants |
464 | + Recipient a non-exclusive, worldwide, royalty-free patent license under |
465 | + Licensed Patents to make, use, sell, offer to sell, import and otherwise |
466 | + transfer the Contribution of such Contributor, if any, in source code and |
467 | + object code form. This patent license shall apply to the combination of the |
468 | + Contribution and the Program if, at the time the Contribution is added by the |
469 | + Contributor, such addition of the Contribution causes such combination to be |
470 | + covered by the Licensed Patents. The patent license shall not apply to any |
471 | + other combinations which include the Contribution. No hardware per se is |
472 | + licensed hereunder. |
473 | + . |
474 | + c) Recipient understands that although each Contributor grants the |
475 | + licenses to its Contributions set forth herein, no assurances are provided by |
476 | + any Contributor that the Program does not infringe the patent or other |
477 | + intellectual property rights of any other entity. Each Contributor disclaims |
478 | + any liability to Recipient for claims brought by any other entity based on |
479 | + infringement of intellectual property rights or otherwise. As a condition to |
480 | + exercising the rights and licenses granted hereunder, each Recipient hereby |
481 | + assumes sole responsibility to secure any other intellectual property rights |
482 | + needed, if any. For example, if a third party patent license is required to |
483 | + allow Recipient to distribute the Program, it is Recipient's responsibility to |
484 | + acquire that license before distributing the Program. |
485 | + . |
486 | + d) Each Contributor represents that to its knowledge it has sufficient |
487 | + copyright rights in its Contribution, if any, to grant the copyright license |
488 | + set forth in this Agreement. |
489 | + . |
490 | + 3. REQUIREMENTS |
491 | + . |
492 | + A Contributor may choose to distribute the Program in object code form under |
493 | + its own license agreement, provided that: |
494 | + . |
495 | + a) it complies with the terms and conditions of this Agreement; and |
496 | + . |
497 | + b) its license agreement: |
498 | + . |
499 | + i) effectively disclaims on behalf of all Contributors all warranties and |
500 | + conditions, express and implied, including warranties or conditions of title |
501 | + and non-infringement, and implied warranties or conditions of merchantability |
502 | + and fitness for a particular purpose; |
503 | + . |
504 | + ii) effectively excludes on behalf of all Contributors all liability for |
505 | + damages, including direct, indirect, special, incidental and consequential |
506 | + damages, such as lost profits; |
507 | + . |
508 | + iii) states that any provisions which differ from this Agreement are |
509 | + offered by that Contributor alone and not by any other party; and |
510 | + . |
511 | + iv) states that source code for the Program is available from such |
512 | + Contributor, and informs licensees how to obtain it in a reasonable manner on |
513 | + or through a medium customarily used for software exchange. |
514 | + . |
515 | + When the Program is made available in source code form: |
516 | + . |
517 | + a) it must be made available under this Agreement; and |
518 | + . |
519 | + b) a copy of this Agreement must be included with each copy of the |
520 | + Program. |
521 | + . |
522 | + Contributors may not remove or alter any copyright notices contained within the |
523 | + Program. |
524 | + . |
525 | + Each Contributor must identify itself as the originator of its Contribution, if |
526 | + any, in a manner that reasonably allows subsequent Recipients to identify the |
527 | + originator of the Contribution. |
528 | + . |
529 | + 4. COMMERCIAL DISTRIBUTION |
530 | + . |
531 | + Commercial distributors of software may accept certain responsibilities with |
532 | + respect to end users, business partners and the like. While this license is |
533 | + intended to facilitate the commercial use of the Program, the Contributor who |
534 | + includes the Program in a commercial product offering should do so in a manner |
535 | + which does not create potential liability for other Contributors. Therefore, if |
536 | + a Contributor includes the Program in a commercial product offering, such |
537 | + Contributor ("Commercial Contributor") hereby agrees to defend and indemnify |
538 | + every other Contributor ("Indemnified Contributor") against any losses, damages |
539 | + and costs (collectively "Losses") arising from claims, lawsuits and other legal |
540 | + actions brought by a third party against the Indemnified Contributor to the |
541 | + extent caused by the acts or omissions of such Commercial Contributor in |
542 | + connection with its distribution of the Program in a commercial product |
543 | + offering. The obligations in this section do not apply to any claims or Losses |
544 | + relating to any actual or alleged intellectual property infringement. In order |
545 | + to qualify, an Indemnified Contributor must: a) promptly notify the Commercial |
546 | + Contributor in writing of such claim, and b) allow the Commercial Contributor |
547 | + to control, and cooperate with the Commercial Contributor in, the defense and |
548 | + any related settlement negotiations. The Indemnified Contributor may |
549 | + participate in any such claim at its own expense. |
550 | + . |
551 | + For example, a Contributor might include the Program in a commercial product |
552 | + offering, Product X. That Contributor is then a Commercial Contributor. If that |
553 | + Commercial Contributor then makes performance claims, or offers warranties |
554 | + related to Product X, those performance claims and warranties are such |
555 | + Commercial Contributor's responsibility alone. Under this section, the |
556 | + Commercial Contributor would have to defend claims against the other |
557 | + Contributors related to those performance claims and warranties, and if a court |
558 | + requires any other Contributor to pay any damages as a result, the Commercial |
559 | + Contributor must pay those damages. |
560 | + . |
561 | + 5. NO WARRANTY |
562 | + . |
563 | + EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN |
564 | + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR |
565 | + IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, |
566 | + NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each |
567 | + Recipient is solely responsible for determining the appropriateness of using |
568 | + and distributing the Program and assumes all risks associated with its exercise |
569 | + of rights under this Agreement, including but not limited to the risks and |
570 | + costs of program errors, compliance with applicable laws, damage to or loss of |
571 | + data, programs or equipment, and unavailability or interruption of operations. |
572 | + . |
573 | + 6. DISCLAIMER OF LIABILITY |
574 | + . |
575 | + EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY |
576 | + CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
577 | + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST |
578 | + PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
579 | + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY |
580 | + WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS |
581 | + GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. |
582 | + . |
583 | + 7. GENERAL |
584 | + . |
585 | + If any provision of this Agreement is invalid or unenforceable under applicable |
586 | + law, it shall not affect the validity or enforceability of the remainder of the |
587 | + terms of this Agreement, and without further action by the parties hereto, such |
588 | + provision shall be reformed to the minimum extent necessary to make such |
589 | + provision valid and enforceable. |
590 | + . |
591 | + If Recipient institutes patent litigation against any |
592 | + entity (including a cross-claim or counterclaim in a lawsuit) alleging that the |
593 | + Program itself (excluding combinations of the Program with other software or |
594 | + hardware) infringes such Recipient's patent(s), then such Recipient's rights |
595 | + granted under Section 2(b) shall terminate as of the date such litigation is |
596 | + filed. |
597 | + . |
598 | + All Recipient's rights under this Agreement shall terminate if it fails to |
599 | + comply with any of the material terms or conditions of this Agreement and does |
600 | + not cure such failure in a reasonable period of time after becoming aware of |
601 | + such noncompliance. If all Recipient's rights under this Agreement terminate, |
602 | + Recipient agrees to cease use and distribution of the Program as soon as |
603 | + reasonably practicable. However, Recipient's obligations under this Agreement |
604 | + and any licenses granted by Recipient relating to the Program shall continue |
605 | + and survive. |
606 | + . |
607 | + Everyone is permitted to copy and distribute copies of this Agreement, but in |
608 | + order to avoid inconsistency the Agreement is copyrighted and may only be |
609 | + modified in the following manner. The Agreement Steward reserves the right to |
610 | + publish new versions (including revisions) of this Agreement from time to time. |
611 | + No one other than the Agreement Steward has the right to modify this Agreement. |
612 | + The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to |
613 | + serve as the Agreement Steward to a suitable separate entity. Each new version |
614 | + of the Agreement will be given a distinguishing version number. The Program |
615 | + (including Contributions) may always be distributed subject to the version of |
616 | + the Agreement under which it was received. In addition, after a new version of |
617 | + the Agreement is published, Contributor may elect to distribute the Program |
618 | + (including its Contributions) under the new version. Except as expressly stated |
619 | + in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to |
620 | + the intellectual property of any Contributor under this Agreement, whether |
621 | + expressly, by implication, estoppel or otherwise. All rights in the Program not |
622 | + expressly granted under this Agreement are reserved. |
623 | + . |
624 | + This Agreement is governed by the laws of the State of New York and the |
625 | + intellectual property laws of the United States of America. No party to this |
626 | + Agreement will bring a legal action under this Agreement more than one year |
627 | + after the cause of action arose. Each party waives its rights to a jury trial |
628 | + in any resulting litigation. |
629 | + |
630 | +License: EPL-2.0 |
631 | + Eclipse Public License - v 2.0 |
632 | + . |
633 | + THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE |
634 | + PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION |
635 | + OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. |
636 | + . |
637 | + 1. DEFINITIONS |
638 | + . |
639 | + "Contribution" means: |
640 | + . |
641 | + a) in the case of the initial Contributor, the initial content |
642 | + Distributed under this Agreement, and |
643 | + . |
644 | + b) in the case of each subsequent Contributor: |
645 | + i) changes to the Program, and |
646 | + ii) additions to the Program; |
647 | + where such changes and/or additions to the Program originate from |
648 | + and are Distributed by that particular Contributor. A Contribution |
649 | + "originates" from a Contributor if it was added to the Program by |
650 | + such Contributor itself or anyone acting on such Contributor's behalf. |
651 | + Contributions do not include changes or additions to the Program that |
652 | + are not Modified Works. |
653 | + . |
654 | + "Contributor" means any person or entity that Distributes the Program. |
655 | + . |
656 | + "Licensed Patents" mean patent claims licensable by a Contributor which |
657 | + are necessarily infringed by the use or sale of its Contribution alone |
658 | + or when combined with the Program. |
659 | + . |
660 | + "Program" means the Contributions Distributed in accordance with this |
661 | + Agreement. |
662 | + . |
663 | + "Recipient" means anyone who receives the Program under this Agreement |
664 | + or any Secondary License (as applicable), including Contributors. |
665 | + . |
666 | + "Derivative Works" shall mean any work, whether in Source Code or other |
667 | + form, that is based on (or derived from) the Program and for which the |
668 | + editorial revisions, annotations, elaborations, or other modifications |
669 | + represent, as a whole, an original work of authorship. |
670 | + . |
671 | + "Modified Works" shall mean any work in Source Code or other form that |
672 | + results from an addition to, deletion from, or modification of the |
673 | + contents of the Program, including, for purposes of clarity any new file |
674 | + in Source Code form that contains any contents of the Program. Modified |
675 | + Works shall not include works that contain only declarations, |
676 | + interfaces, types, classes, structures, or files of the Program solely |
677 | + in each case in order to link to, bind by name, or subclass the Program |
678 | + or Modified Works thereof. |
679 | + . |
680 | + "Distribute" means the acts of a) distributing or b) making available |
681 | + in any manner that enables the transfer of a copy. |
682 | + . |
683 | + "Source Code" means the form of a Program preferred for making |
684 | + modifications, including but not limited to software source code, |
685 | + documentation source, and configuration files. |
686 | + . |
687 | + "Secondary License" means either the GNU General Public License, |
688 | + Version 2.0, or any later versions of that license, including any |
689 | + exceptions or additional permissions as identified by the initial |
690 | + Contributor. |
691 | + . |
692 | + 2. GRANT OF RIGHTS |
693 | + . |
694 | + a) Subject to the terms of this Agreement, each Contributor hereby |
695 | + grants Recipient a non-exclusive, worldwide, royalty-free copyright |
696 | + license to reproduce, prepare Derivative Works of, publicly display, |
697 | + publicly perform, Distribute and sublicense the Contribution of such |
698 | + Contributor, if any, and such Derivative Works. |
699 | + . |
700 | + b) Subject to the terms of this Agreement, each Contributor hereby |
701 | + grants Recipient a non-exclusive, worldwide, royalty-free patent |
702 | + license under Licensed Patents to make, use, sell, offer to sell, |
703 | + import and otherwise transfer the Contribution of such Contributor, |
704 | + if any, in Source Code or other form. This patent license shall |
705 | + apply to the combination of the Contribution and the Program if, at |
706 | + the time the Contribution is added by the Contributor, such addition |
707 | + of the Contribution causes such combination to be covered by the |
708 | + Licensed Patents. The patent license shall not apply to any other |
709 | + combinations which include the Contribution. No hardware per se is |
710 | + licensed hereunder. |
711 | + . |
712 | + c) Recipient understands that although each Contributor grants the |
713 | + licenses to its Contributions set forth herein, no assurances are |
714 | + provided by any Contributor that the Program does not infringe the |
715 | + patent or other intellectual property rights of any other entity. |
716 | + Each Contributor disclaims any liability to Recipient for claims |
717 | + brought by any other entity based on infringement of intellectual |
718 | + property rights or otherwise. As a condition to exercising the |
719 | + rights and licenses granted hereunder, each Recipient hereby |
720 | + assumes sole responsibility to secure any other intellectual |
721 | + property rights needed, if any. For example, if a third party |
722 | + patent license is required to allow Recipient to Distribute the |
723 | + Program, it is Recipient's responsibility to acquire that license |
724 | + before distributing the Program. |
725 | + . |
726 | + d) Each Contributor represents that to its knowledge it has |
727 | + sufficient copyright rights in its Contribution, if any, to grant |
728 | + the copyright license set forth in this Agreement. |
729 | + . |
730 | + e) Notwithstanding the terms of any Secondary License, no |
731 | + Contributor makes additional grants to any Recipient (other than |
732 | + those set forth in this Agreement) as a result of such Recipient's |
733 | + receipt of the Program under the terms of a Secondary License |
734 | + (if permitted under the terms of Section 3). |
735 | + . |
736 | + 3. REQUIREMENTS |
737 | + . |
738 | + 3.1 If a Contributor Distributes the Program in any form, then: |
739 | + . |
740 | + a) the Program must also be made available as Source Code, in |
741 | + accordance with section 3.2, and the Contributor must accompany |
742 | + the Program with a statement that the Source Code for the Program |
743 | + is available under this Agreement, and informs Recipients how to |
744 | + obtain it in a reasonable manner on or through a medium customarily |
745 | + used for software exchange; and |
746 | + . |
747 | + b) the Contributor may Distribute the Program under a license |
748 | + different than this Agreement, provided that such license: |
749 | + i) effectively disclaims on behalf of all other Contributors all |
750 | + warranties and conditions, express and implied, including |
751 | + warranties or conditions of title and non-infringement, and |
752 | + implied warranties or conditions of merchantability and fitness |
753 | + for a particular purpose; |
754 | + . |
755 | + ii) effectively excludes on behalf of all other Contributors all |
756 | + liability for damages, including direct, indirect, special, |
757 | + incidental and consequential damages, such as lost profits; |
758 | + . |
759 | + iii) does not attempt to limit or alter the recipients' rights |
760 | + in the Source Code under section 3.2; and |
761 | + . |
762 | + iv) requires any subsequent distribution of the Program by any |
763 | + party to be under a license that satisfies the requirements |
764 | + of this section 3. |
765 | + . |
766 | + 3.2 When the Program is Distributed as Source Code: |
767 | + . |
768 | + a) it must be made available under this Agreement, or if the |
769 | + Program (i) is combined with other material in a separate file or |
770 | + files made available under a Secondary License, and (ii) the initial |
771 | + Contributor attached to the Source Code the notice described in |
772 | + Exhibit A of this Agreement, then the Program may be made available |
773 | + under the terms of such Secondary Licenses, and |
774 | + . |
775 | + b) a copy of this Agreement must be included with each copy of |
776 | + the Program. |
777 | + . |
778 | + 3.3 Contributors may not remove or alter any copyright, patent, |
779 | + trademark, attribution notices, disclaimers of warranty, or limitations |
780 | + of liability ("notices") contained within the Program from any copy of |
781 | + the Program which they Distribute, provided that Contributors may add |
782 | + their own appropriate notices. |
783 | + . |
784 | + 4. COMMERCIAL DISTRIBUTION |
785 | + . |
786 | + Commercial distributors of software may accept certain responsibilities |
787 | + with respect to end users, business partners and the like. While this |
788 | + license is intended to facilitate the commercial use of the Program, |
789 | + the Contributor who includes the Program in a commercial product |
790 | + offering should do so in a manner which does not create potential |
791 | + liability for other Contributors. Therefore, if a Contributor includes |
792 | + the Program in a commercial product offering, such Contributor |
793 | + ("Commercial Contributor") hereby agrees to defend and indemnify every |
794 | + other Contributor ("Indemnified Contributor") against any losses, |
795 | + damages and costs (collectively "Losses") arising from claims, lawsuits |
796 | + and other legal actions brought by a third party against the Indemnified |
797 | + Contributor to the extent caused by the acts or omissions of such |
798 | + Commercial Contributor in connection with its distribution of the Program |
799 | + in a commercial product offering. The obligations in this section do not |
800 | + apply to any claims or Losses relating to any actual or alleged |
801 | + intellectual property infringement. In order to qualify, an Indemnified |
802 | + Contributor must: a) promptly notify the Commercial Contributor in |
803 | + writing of such claim, and b) allow the Commercial Contributor to control, |
804 | + and cooperate with the Commercial Contributor in, the defense and any |
805 | + related settlement negotiations. The Indemnified Contributor may |
806 | + participate in any such claim at its own expense. |
807 | + . |
808 | + For example, a Contributor might include the Program in a commercial |
809 | + product offering, Product X. That Contributor is then a Commercial |
810 | + Contributor. If that Commercial Contributor then makes performance |
811 | + claims, or offers warranties related to Product X, those performance |
812 | + claims and warranties are such Commercial Contributor's responsibility |
813 | + alone. Under this section, the Commercial Contributor would have to |
814 | + defend claims against the other Contributors related to those performance |
815 | + claims and warranties, and if a court requires any other Contributor to |
816 | + pay any damages as a result, the Commercial Contributor must pay |
817 | + those damages. |
818 | + . |
819 | + 5. NO WARRANTY |
820 | + . |
821 | + EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT |
822 | + PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" |
823 | + BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR |
824 | + IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF |
825 | + TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR |
826 | + PURPOSE. Each Recipient is solely responsible for determining the |
827 | + appropriateness of using and distributing the Program and assumes all |
828 | + risks associated with its exercise of rights under this Agreement, |
829 | + including but not limited to the risks and costs of program errors, |
830 | + compliance with applicable laws, damage to or loss of data, programs |
831 | + or equipment, and unavailability or interruption of operations. |
832 | + . |
833 | + 6. DISCLAIMER OF LIABILITY |
834 | + . |
835 | + EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT |
836 | + PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS |
837 | + SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
838 | + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST |
839 | + PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
840 | + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
841 | + ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE |
842 | + EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE |
843 | + POSSIBILITY OF SUCH DAMAGES. |
844 | + . |
845 | + 7. GENERAL |
846 | + . |
847 | + If any provision of this Agreement is invalid or unenforceable under |
848 | + applicable law, it shall not affect the validity or enforceability of |
849 | + the remainder of the terms of this Agreement, and without further |
850 | + action by the parties hereto, such provision shall be reformed to the |
851 | + minimum extent necessary to make such provision valid and enforceable. |
852 | + . |
853 | + If Recipient institutes patent litigation against any entity |
854 | + (including a cross-claim or counterclaim in a lawsuit) alleging that the |
855 | + Program itself (excluding combinations of the Program with other software |
856 | + or hardware) infringes such Recipient's patent(s), then such Recipient's |
857 | + rights granted under Section 2(b) shall terminate as of the date such |
858 | + litigation is filed. |
859 | + . |
860 | + All Recipient's rights under this Agreement shall terminate if it |
861 | + fails to comply with any of the material terms or conditions of this |
862 | + Agreement and does not cure such failure in a reasonable period of |
863 | + time after becoming aware of such noncompliance. If all Recipient's |
864 | + rights under this Agreement terminate, Recipient agrees to cease use |
865 | + and distribution of the Program as soon as reasonably practicable. |
866 | + However, Recipient's obligations under this Agreement and any licenses |
867 | + granted by Recipient relating to the Program shall continue and survive. |
868 | + . |
869 | + Everyone is permitted to copy and distribute copies of this Agreement, |
870 | + but in order to avoid inconsistency the Agreement is copyrighted and |
871 | + may only be modified in the following manner. The Agreement Steward |
872 | + reserves the right to publish new versions (including revisions) of |
873 | + this Agreement from time to time. No one other than the Agreement |
874 | + Steward has the right to modify this Agreement. The Eclipse Foundation |
875 | + is the initial Agreement Steward. The Eclipse Foundation may assign the |
876 | + responsibility to serve as the Agreement Steward to a suitable separate |
877 | + entity. Each new version of the Agreement will be given a distinguishing |
878 | + version number. The Program (including Contributions) may always be |
879 | + Distributed subject to the version of the Agreement under which it was |
880 | + received. In addition, after a new version of the Agreement is published, |
881 | + Contributor may elect to Distribute the Program (including its |
882 | + Contributions) under the new version. |
883 | + . |
884 | + Except as expressly stated in Sections 2(a) and 2(b) above, Recipient |
885 | + receives no rights or licenses to the intellectual property of any |
886 | + Contributor under this Agreement, whether expressly, by implication, |
887 | + estoppel or otherwise. All rights in the Program not expressly granted |
888 | + under this Agreement are reserved. Nothing in this Agreement is intended |
889 | + to be enforceable by any entity that is not a Contributor or Recipient. |
890 | + No third-party beneficiary rights are created under this Agreement. |
891 | + . |
892 | + Exhibit A - Form of Secondary Licenses Notice |
893 | + . |
894 | + "This Source Code may also be made available under the following |
895 | + Secondary Licenses when the conditions for such availability set forth |
896 | + in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), |
897 | + version(s), and exceptions or additional permissions here}." |
898 | + . |
899 | + Simply including a copy of this Agreement, including this Exhibit A |
900 | + is not sufficient to license the Source Code under Secondary Licenses. |
901 | + . |
902 | + If it is not possible or desirable to put the notice in a particular |
903 | + file, then You may include the notice in a location (such as a LICENSE |
904 | + file in a relevant directory) where a recipient would be likely to |
905 | + look for such a notice. |
906 | + . |
907 | + You may add additional accurate notices of copyright ownership. |
908 | diff --git a/debian/gbp-export.sh b/debian/gbp-export.sh |
909 | new file mode 100755 |
910 | index 0000000..50cb40a |
911 | --- /dev/null |
912 | +++ b/debian/gbp-export.sh |
913 | @@ -0,0 +1,3 @@ |
914 | +#!/bin/sh |
915 | + |
916 | +gbp export-orig --component=jansi1 --component=jline3 --component=junit4 --component=junit5 --component=libhamcrest-java --component=opentest4j-reporting --component=picocli --component=testng --component=univocity-parsers --upstream-branch=jtreg7-upstream --compression=gzip |
917 | diff --git a/debian/gbp-import.sh b/debian/gbp-import.sh |
918 | new file mode 100755 |
919 | index 0000000..7c10a29 |
920 | --- /dev/null |
921 | +++ b/debian/gbp-import.sh |
922 | @@ -0,0 +1,3 @@ |
923 | +#!/bin/sh |
924 | + |
925 | +gbp import-orig --component=jansi1 --component=jline3 --component=junit4 --component=junit5 --component=libhamcrest-java --component=opentest4j-reporting --component=picocli --component=testng --component=univocity-parsers --debian-branch=jtreg7 --upstream-branch=jtreg7-upstream $* |
926 | diff --git a/debian/jansi1/maven.ignoreRules b/debian/jansi1/maven.ignoreRules |
927 | new file mode 100644 |
928 | index 0000000..9cf2270 |
929 | --- /dev/null |
930 | +++ b/debian/jansi1/maven.ignoreRules |
931 | @@ -0,0 +1,64 @@ |
932 | +# Maven ignore rules - ignore some Maven dependencies and plugins |
933 | +# Format of this file is: |
934 | +# [group] [artifact] [type] [version] [classifier] [scope] |
935 | +# where each element can be either |
936 | +# - the exact string, for example org.apache for the group, or 3.1 |
937 | +# for the version. In this case, the element is simply matched |
938 | +# and left as it is |
939 | +# - * (the star character, alone). In this case, anything will |
940 | +# match and be left as it is. For example, using * on the |
941 | +# position of the artifact field will match any artifact id |
942 | +# All elements much match before a rule can be applied |
943 | +# Example rule: match jar with groupid= junit, artifactid= junit |
944 | +# and version starting with 3., this dependency is then removed |
945 | +# from the POM |
946 | +# junit junit jar s/3\\..*/3.x/ |
947 | + |
948 | +org.apache.maven.plugins maven-javadoc-plugin * * * * |
949 | +org.apache.maven.plugins maven-site-plugin * * * * |
950 | +org.apache.maven.plugins maven-surefire-plugin * * * * |
951 | +org.apache.maven.plugins maven-dependency-plugin * * * * |
952 | +org.apache.maven.plugins maven-enforcer-plugin * * * * |
953 | +org.apache.maven.plugins maven-javadoc-plugin * * * * |
954 | +org.apache.maven.plugins maven-source-plugin * * * * |
955 | + |
956 | +org.apache.sshd sshd-core * * * * |
957 | + |
958 | +org.codehaus.mojo exec-maven-plugin * * * * |
959 | +org.fusesource.jansi jansi-linux32 * * * * |
960 | +org.fusesource.jansi jansi-linux64 * * * * |
961 | +org.fusesource.jansi jansi-osx * * * * |
962 | +org.fusesource.jansi jansi-windows32 * * * * |
963 | +org.fusesource.jansi jansi-windows64 * * * * |
964 | +org.fusesource.jansi jansi-freebsd32 * * * * |
965 | +org.fusesource.jansi jansi-freebsd64 * * * * |
966 | +org.fusesource.mvnplugins fuse-jxr-skin * * * * |
967 | +org.fusesource.mvnplugins maven-uberize-plugin * * * * |
968 | +org.fusesource.mvnplugins fuse-javadoc-skin * * * * |
969 | +org.springframework.boot:spring-boot-starter * * * * |
970 | + |
971 | +com.univocity univocity-output-tester |
972 | +org.apache.maven.plugins maven-assembly-plugin |
973 | +org.apache.maven.plugins maven-enforcer-plugin |
974 | +org.apache.maven.plugins maven-javadoc-plugin |
975 | +org.apache.maven.plugins maven-source-plugin |
976 | +org.hsqldb hsqldb |
977 | +org.sonatype.plugins nexus-staging-maven-plugin |
978 | +org.testng testng |
979 | + |
980 | + |
981 | +org.apache.maven.doxia doxia-module-markdown * * * * |
982 | +org.apache.maven.plugins maven-enforcer-plugin * * * * |
983 | +org.apache.maven.plugins maven-release-plugin * * * * |
984 | +org.apache.maven.plugins maven-source-plugin * * * * |
985 | +org.codehaus.mojo animal-sniffer-maven-plugin * * * * |
986 | +com.google.code.maven-replacer-plugin replacer * * * * |
987 | +* maven-site-plugin * * * * |
988 | +com.github.stephenc.wagon wagon-gitsite * * * * |
989 | +* maven-project-info-reports-plugin * * * * |
990 | + |
991 | +org.jetbrains.kotlin kotlin-maven-plugin |
992 | +org.jetbrains.kotlin kotlin-stdlib |
993 | +org.junit.platform junit-platform-jfr |
994 | +org.junit.platform junit-platform-testkit |
995 | +org.mockito mockito-junit-jupiter |
996 | \ No newline at end of file |
997 | diff --git a/debian/jansi1/maven.rules b/debian/jansi1/maven.rules |
998 | new file mode 100644 |
999 | index 0000000..aafd0db |
1000 | --- /dev/null |
1001 | +++ b/debian/jansi1/maven.rules |
1002 | @@ -0,0 +1,23 @@ |
1003 | +jmock jmock * s/.*/1.x/ * * |
1004 | +junit junit jar s/4\..*/4.x/ * * |
1005 | +org.fusesource.hawtjni hawtjni-runtime jar s/.*/debian/ * * |
1006 | +org.fusesource.jansi example jar s/.*/debian/ * * |
1007 | +org.fusesource.jansi jansi-project pom s/.*/debian/ * * |
1008 | +org.fusesource.jansi jansi jar s/.*/debian/ * * |
1009 | +org.fusesource.jansi jansi jar s/.*/debian/ * * |
1010 | +org.jline jline jar s/.*/debian/ * * |
1011 | +jline jline jar * * * |
1012 | +org.opentest4j.reporting s/schema/open-test-reporting-schema/ * s/.*/debian/ * * |
1013 | +org.opentest4j.reporting s/events/open-test-reporting-events/ * s/.*/debian/ * * |
1014 | +com.univocity univocity-parsers jar s/.*/debian/ * * |
1015 | + |
1016 | +org.hamcrest s/hamcrest-core/hamcrest/ * s/.*/debian/ * * |
1017 | + |
1018 | +org.junit.platform * * ${platform.version} * * |
1019 | +org.junit.jupiter * * ${platform.version} * * |
1020 | + |
1021 | +com.google.inject guice jar s/.*/debian/ s/no_aop// * |
1022 | +org.yaml snakeyaml bundle s/1\..*/1.x/ * * |
1023 | +org.yaml snakeyaml s/jar/bundle/ s/1\..*/1.x/ * * |
1024 | +s/ant/org.apache.ant/ * * s/.*/debian/ * * |
1025 | +org.assertj assertj-core jar s/.*/debian/ * * |
1026 | diff --git a/debian/jansi1/poms b/debian/jansi1/poms |
1027 | new file mode 100644 |
1028 | index 0000000..0fd643c |
1029 | --- /dev/null |
1030 | +++ b/debian/jansi1/poms |
1031 | @@ -0,0 +1,4 @@ |
1032 | +# jansi1 |
1033 | +pom.xml --no-parent --has-package-version |
1034 | +jansi/pom.xml --has-package-version --java-lib --usj-name=jansi1 |
1035 | +example/pom.xml --ignore |
1036 | \ No newline at end of file |
1037 | diff --git a/debian/jansi1/rules b/debian/jansi1/rules |
1038 | new file mode 100755 |
1039 | index 0000000..b230ca6 |
1040 | --- /dev/null |
1041 | +++ b/debian/jansi1/rules |
1042 | @@ -0,0 +1,14 @@ |
1043 | +#!/usr/bin/make -f |
1044 | + |
1045 | +%: |
1046 | + dh $@ |
1047 | + |
1048 | +override_dh_auto_configure: |
1049 | + dh_auto_configure $@ |
1050 | + rsync -Lav ../debian/built-components/ debian/ || true |
1051 | + |
1052 | +override_dh_auto_install: |
1053 | + dh_auto_install |
1054 | + rm -Rf debian/libjansi1-java/usr/share/maven-repo/org/fusesource/jansi/jansi/1.18 |
1055 | + rm -Rf debian/libjansi1-java/usr/share/maven-repo/org/fusesource/jansi/jansi-project/1.18 |
1056 | + rm -Rf debian/libjansi1-java/usr/share/java/jansi1-1.18.jar |
1057 | diff --git a/debian/jline3/maven.ignoreRules b/debian/jline3/maven.ignoreRules |
1058 | new file mode 100644 |
1059 | index 0000000..9cf2270 |
1060 | --- /dev/null |
1061 | +++ b/debian/jline3/maven.ignoreRules |
1062 | @@ -0,0 +1,64 @@ |
1063 | +# Maven ignore rules - ignore some Maven dependencies and plugins |
1064 | +# Format of this file is: |
1065 | +# [group] [artifact] [type] [version] [classifier] [scope] |
1066 | +# where each element can be either |
1067 | +# - the exact string, for example org.apache for the group, or 3.1 |
1068 | +# for the version. In this case, the element is simply matched |
1069 | +# and left as it is |
1070 | +# - * (the star character, alone). In this case, anything will |
1071 | +# match and be left as it is. For example, using * on the |
1072 | +# position of the artifact field will match any artifact id |
1073 | +# All elements much match before a rule can be applied |
1074 | +# Example rule: match jar with groupid= junit, artifactid= junit |
1075 | +# and version starting with 3., this dependency is then removed |
1076 | +# from the POM |
1077 | +# junit junit jar s/3\\..*/3.x/ |
1078 | + |
1079 | +org.apache.maven.plugins maven-javadoc-plugin * * * * |
1080 | +org.apache.maven.plugins maven-site-plugin * * * * |
1081 | +org.apache.maven.plugins maven-surefire-plugin * * * * |
1082 | +org.apache.maven.plugins maven-dependency-plugin * * * * |
1083 | +org.apache.maven.plugins maven-enforcer-plugin * * * * |
1084 | +org.apache.maven.plugins maven-javadoc-plugin * * * * |
1085 | +org.apache.maven.plugins maven-source-plugin * * * * |
1086 | + |
1087 | +org.apache.sshd sshd-core * * * * |
1088 | + |
1089 | +org.codehaus.mojo exec-maven-plugin * * * * |
1090 | +org.fusesource.jansi jansi-linux32 * * * * |
1091 | +org.fusesource.jansi jansi-linux64 * * * * |
1092 | +org.fusesource.jansi jansi-osx * * * * |
1093 | +org.fusesource.jansi jansi-windows32 * * * * |
1094 | +org.fusesource.jansi jansi-windows64 * * * * |
1095 | +org.fusesource.jansi jansi-freebsd32 * * * * |
1096 | +org.fusesource.jansi jansi-freebsd64 * * * * |
1097 | +org.fusesource.mvnplugins fuse-jxr-skin * * * * |
1098 | +org.fusesource.mvnplugins maven-uberize-plugin * * * * |
1099 | +org.fusesource.mvnplugins fuse-javadoc-skin * * * * |
1100 | +org.springframework.boot:spring-boot-starter * * * * |
1101 | + |
1102 | +com.univocity univocity-output-tester |
1103 | +org.apache.maven.plugins maven-assembly-plugin |
1104 | +org.apache.maven.plugins maven-enforcer-plugin |
1105 | +org.apache.maven.plugins maven-javadoc-plugin |
1106 | +org.apache.maven.plugins maven-source-plugin |
1107 | +org.hsqldb hsqldb |
1108 | +org.sonatype.plugins nexus-staging-maven-plugin |
1109 | +org.testng testng |
1110 | + |
1111 | + |
1112 | +org.apache.maven.doxia doxia-module-markdown * * * * |
1113 | +org.apache.maven.plugins maven-enforcer-plugin * * * * |
1114 | +org.apache.maven.plugins maven-release-plugin * * * * |
1115 | +org.apache.maven.plugins maven-source-plugin * * * * |
1116 | +org.codehaus.mojo animal-sniffer-maven-plugin * * * * |
1117 | +com.google.code.maven-replacer-plugin replacer * * * * |
1118 | +* maven-site-plugin * * * * |
1119 | +com.github.stephenc.wagon wagon-gitsite * * * * |
1120 | +* maven-project-info-reports-plugin * * * * |
1121 | + |
1122 | +org.jetbrains.kotlin kotlin-maven-plugin |
1123 | +org.jetbrains.kotlin kotlin-stdlib |
1124 | +org.junit.platform junit-platform-jfr |
1125 | +org.junit.platform junit-platform-testkit |
1126 | +org.mockito mockito-junit-jupiter |
1127 | \ No newline at end of file |
1128 | diff --git a/debian/jline3/maven.rules b/debian/jline3/maven.rules |
1129 | new file mode 100644 |
1130 | index 0000000..aafd0db |
1131 | --- /dev/null |
1132 | +++ b/debian/jline3/maven.rules |
1133 | @@ -0,0 +1,23 @@ |
1134 | +jmock jmock * s/.*/1.x/ * * |
1135 | +junit junit jar s/4\..*/4.x/ * * |
1136 | +org.fusesource.hawtjni hawtjni-runtime jar s/.*/debian/ * * |
1137 | +org.fusesource.jansi example jar s/.*/debian/ * * |
1138 | +org.fusesource.jansi jansi-project pom s/.*/debian/ * * |
1139 | +org.fusesource.jansi jansi jar s/.*/debian/ * * |
1140 | +org.fusesource.jansi jansi jar s/.*/debian/ * * |
1141 | +org.jline jline jar s/.*/debian/ * * |
1142 | +jline jline jar * * * |
1143 | +org.opentest4j.reporting s/schema/open-test-reporting-schema/ * s/.*/debian/ * * |
1144 | +org.opentest4j.reporting s/events/open-test-reporting-events/ * s/.*/debian/ * * |
1145 | +com.univocity univocity-parsers jar s/.*/debian/ * * |
1146 | + |
1147 | +org.hamcrest s/hamcrest-core/hamcrest/ * s/.*/debian/ * * |
1148 | + |
1149 | +org.junit.platform * * ${platform.version} * * |
1150 | +org.junit.jupiter * * ${platform.version} * * |
1151 | + |
1152 | +com.google.inject guice jar s/.*/debian/ s/no_aop// * |
1153 | +org.yaml snakeyaml bundle s/1\..*/1.x/ * * |
1154 | +org.yaml snakeyaml s/jar/bundle/ s/1\..*/1.x/ * * |
1155 | +s/ant/org.apache.ant/ * * s/.*/debian/ * * |
1156 | +org.assertj assertj-core jar s/.*/debian/ * * |
1157 | diff --git a/debian/jline3/poms b/debian/jline3/poms |
1158 | new file mode 100644 |
1159 | index 0000000..0414809 |
1160 | --- /dev/null |
1161 | +++ b/debian/jline3/poms |
1162 | @@ -0,0 +1,10 @@ |
1163 | +pom.xml --no-parent --has-package-version |
1164 | +builtins/pom.xml --java-lib --has-package-version --usj-name=jline3-builtins |
1165 | +demo/pom.xml --ignore |
1166 | +jline/pom.xml --java-lib --has-package-version --usj-name=jline3 |
1167 | +reader/pom.xml --java-lib --has-package-version --usj-name=jline3-reader |
1168 | +remote-ssh/pom.xml --ignore |
1169 | +remote-telnet/pom.xml --ignore |
1170 | +terminal/pom.xml --java-lib --has-package-version --usj-name=jline3-terminal |
1171 | +terminal-jansi/pom.xml --java-lib --has-package-version --usj-name=jline3-terminal-jansi |
1172 | +terminal-jna/pom.xml --java-lib --has-package-version --usj-name=jline3-terminal-jna |
1173 | diff --git a/debian/jline3/rules b/debian/jline3/rules |
1174 | new file mode 100755 |
1175 | index 0000000..ae952ed |
1176 | --- /dev/null |
1177 | +++ b/debian/jline3/rules |
1178 | @@ -0,0 +1,13 @@ |
1179 | +#!/usr/bin/make -f |
1180 | + |
1181 | +%: |
1182 | + dh $@ |
1183 | + |
1184 | +override_dh_auto_configure: |
1185 | + dh_auto_configure $@ |
1186 | + rsync -Lav ../debian/built-components/ debian/ || true |
1187 | + |
1188 | +override_dh_auto_build: |
1189 | + dh_auto_build -- source:jar package -DskipTests |
1190 | + |
1191 | +override_dh_auto_test: |
1192 | diff --git a/debian/jtreg7.install b/debian/jtreg7.install |
1193 | index 2929df1..b6eac4a 100644 |
1194 | --- a/debian/jtreg7.install |
1195 | +++ b/debian/jtreg7.install |
1196 | @@ -1,4 +1,4 @@ |
1197 | -build/images/jtreg/lib/jtreg.jar /usr/share/java |
1198 | +build/images/jtreg/lib/*.jar /usr/share/jtreg/lib |
1199 | build/images/jtreg/doc/jtreg/tag-spec.html /usr/share/doc/jtreg |
1200 | build/images/jtreg/doc/jtreg/usage.txt /usr/share/doc/jtreg |
1201 | build/images/jtreg/bin/jtdiff /usr/share/jtreg/bin |
1202 | diff --git a/debian/jtreg7.links b/debian/jtreg7.links |
1203 | index 2abc5db..4616239 100644 |
1204 | --- a/debian/jtreg7.links |
1205 | +++ b/debian/jtreg7.links |
1206 | @@ -1,22 +1,2 @@ |
1207 | usr/share/jtreg/bin/jtreg /usr/bin/jtreg |
1208 | usr/share/jtreg/bin/jtdiff /usr/bin/jtdiff |
1209 | - |
1210 | -usr/share/java/hamcrest-core.jar /usr/share/jtreg/lib/hamcrest-core.jar |
1211 | -usr/share/java/javatest.jar /usr/share/jtreg/lib/javatest.jar |
1212 | -usr/share/java/jcommander.jar /usr/share/jtreg/lib/jcommander.jar |
1213 | -usr/share/java/jh.jar /usr/share/jtreg/lib/jh.jar |
1214 | -usr/share/java/jtreg.jar /usr/share/jtreg/lib/jtreg.jar |
1215 | -usr/share/java/junit-platform-console-standalone.jar /usr/share/jtreg/lib/junit-platform-console-standalone.jar |
1216 | -usr/share/java/testng.jar /usr/share/jtreg/lib/testng.jar |
1217 | -usr/share/java/asmtools.jar /usr/share/jtreg/lib/asmtools.jar |
1218 | -usr/share/java/guice.jar /usr/share/jtreg/lib/guice.jar |
1219 | - |
1220 | -usr/share/java/hamcrest-core.jar /usr/share/jtreg/share/java/hamcrest-core.jar |
1221 | -usr/share/java/javatest.jar /usr/share/jtreg/share/java/javatest.jar |
1222 | -usr/share/java/jcommander.jar /usr/share/jtreg/share/java/jcommander.jar |
1223 | -usr/share/java/jh.jar /usr/share/jtreg/share/java/jh.jar |
1224 | -usr/share/java/jtreg.jar /usr/share/jtreg/share/java/jtreg.jar |
1225 | -usr/share/java/junit-platform-console-standalone.jar /usr/share/jtreg/share/java/junit-platform-console-standalone.jar |
1226 | -usr/share/java/testng.jar /usr/share/jtreg/share/java/testng.jar |
1227 | -usr/share/java/asmtools.jar /usr/share/jtreg/share/java/asmtools.jar |
1228 | -usr/share/java/guice.jar /usr/share/jtreg/share/java/guice.jar |
1229 | diff --git a/debian/junit4/maven.ignoreRules b/debian/junit4/maven.ignoreRules |
1230 | new file mode 100644 |
1231 | index 0000000..9cf2270 |
1232 | --- /dev/null |
1233 | +++ b/debian/junit4/maven.ignoreRules |
1234 | @@ -0,0 +1,64 @@ |
1235 | +# Maven ignore rules - ignore some Maven dependencies and plugins |
1236 | +# Format of this file is: |
1237 | +# [group] [artifact] [type] [version] [classifier] [scope] |
1238 | +# where each element can be either |
1239 | +# - the exact string, for example org.apache for the group, or 3.1 |
1240 | +# for the version. In this case, the element is simply matched |
1241 | +# and left as it is |
1242 | +# - * (the star character, alone). In this case, anything will |
1243 | +# match and be left as it is. For example, using * on the |
1244 | +# position of the artifact field will match any artifact id |
1245 | +# All elements much match before a rule can be applied |
1246 | +# Example rule: match jar with groupid= junit, artifactid= junit |
1247 | +# and version starting with 3., this dependency is then removed |
1248 | +# from the POM |
1249 | +# junit junit jar s/3\\..*/3.x/ |
1250 | + |
1251 | +org.apache.maven.plugins maven-javadoc-plugin * * * * |
1252 | +org.apache.maven.plugins maven-site-plugin * * * * |
1253 | +org.apache.maven.plugins maven-surefire-plugin * * * * |
1254 | +org.apache.maven.plugins maven-dependency-plugin * * * * |
1255 | +org.apache.maven.plugins maven-enforcer-plugin * * * * |
1256 | +org.apache.maven.plugins maven-javadoc-plugin * * * * |
1257 | +org.apache.maven.plugins maven-source-plugin * * * * |
1258 | + |
1259 | +org.apache.sshd sshd-core * * * * |
1260 | + |
1261 | +org.codehaus.mojo exec-maven-plugin * * * * |
1262 | +org.fusesource.jansi jansi-linux32 * * * * |
1263 | +org.fusesource.jansi jansi-linux64 * * * * |
1264 | +org.fusesource.jansi jansi-osx * * * * |
1265 | +org.fusesource.jansi jansi-windows32 * * * * |
1266 | +org.fusesource.jansi jansi-windows64 * * * * |
1267 | +org.fusesource.jansi jansi-freebsd32 * * * * |
1268 | +org.fusesource.jansi jansi-freebsd64 * * * * |
1269 | +org.fusesource.mvnplugins fuse-jxr-skin * * * * |
1270 | +org.fusesource.mvnplugins maven-uberize-plugin * * * * |
1271 | +org.fusesource.mvnplugins fuse-javadoc-skin * * * * |
1272 | +org.springframework.boot:spring-boot-starter * * * * |
1273 | + |
1274 | +com.univocity univocity-output-tester |
1275 | +org.apache.maven.plugins maven-assembly-plugin |
1276 | +org.apache.maven.plugins maven-enforcer-plugin |
1277 | +org.apache.maven.plugins maven-javadoc-plugin |
1278 | +org.apache.maven.plugins maven-source-plugin |
1279 | +org.hsqldb hsqldb |
1280 | +org.sonatype.plugins nexus-staging-maven-plugin |
1281 | +org.testng testng |
1282 | + |
1283 | + |
1284 | +org.apache.maven.doxia doxia-module-markdown * * * * |
1285 | +org.apache.maven.plugins maven-enforcer-plugin * * * * |
1286 | +org.apache.maven.plugins maven-release-plugin * * * * |
1287 | +org.apache.maven.plugins maven-source-plugin * * * * |
1288 | +org.codehaus.mojo animal-sniffer-maven-plugin * * * * |
1289 | +com.google.code.maven-replacer-plugin replacer * * * * |
1290 | +* maven-site-plugin * * * * |
1291 | +com.github.stephenc.wagon wagon-gitsite * * * * |
1292 | +* maven-project-info-reports-plugin * * * * |
1293 | + |
1294 | +org.jetbrains.kotlin kotlin-maven-plugin |
1295 | +org.jetbrains.kotlin kotlin-stdlib |
1296 | +org.junit.platform junit-platform-jfr |
1297 | +org.junit.platform junit-platform-testkit |
1298 | +org.mockito mockito-junit-jupiter |
1299 | \ No newline at end of file |
1300 | diff --git a/debian/junit4/maven.rules b/debian/junit4/maven.rules |
1301 | new file mode 100644 |
1302 | index 0000000..aafd0db |
1303 | --- /dev/null |
1304 | +++ b/debian/junit4/maven.rules |
1305 | @@ -0,0 +1,23 @@ |
1306 | +jmock jmock * s/.*/1.x/ * * |
1307 | +junit junit jar s/4\..*/4.x/ * * |
1308 | +org.fusesource.hawtjni hawtjni-runtime jar s/.*/debian/ * * |
1309 | +org.fusesource.jansi example jar s/.*/debian/ * * |
1310 | +org.fusesource.jansi jansi-project pom s/.*/debian/ * * |
1311 | +org.fusesource.jansi jansi jar s/.*/debian/ * * |
1312 | +org.fusesource.jansi jansi jar s/.*/debian/ * * |
1313 | +org.jline jline jar s/.*/debian/ * * |
1314 | +jline jline jar * * * |
1315 | +org.opentest4j.reporting s/schema/open-test-reporting-schema/ * s/.*/debian/ * * |
1316 | +org.opentest4j.reporting s/events/open-test-reporting-events/ * s/.*/debian/ * * |
1317 | +com.univocity univocity-parsers jar s/.*/debian/ * * |
1318 | + |
1319 | +org.hamcrest s/hamcrest-core/hamcrest/ * s/.*/debian/ * * |
1320 | + |
1321 | +org.junit.platform * * ${platform.version} * * |
1322 | +org.junit.jupiter * * ${platform.version} * * |
1323 | + |
1324 | +com.google.inject guice jar s/.*/debian/ s/no_aop// * |
1325 | +org.yaml snakeyaml bundle s/1\..*/1.x/ * * |
1326 | +org.yaml snakeyaml s/jar/bundle/ s/1\..*/1.x/ * * |
1327 | +s/ant/org.apache.ant/ * * s/.*/debian/ * * |
1328 | +org.assertj assertj-core jar s/.*/debian/ * * |
1329 | diff --git a/debian/junit4/poms b/debian/junit4/poms |
1330 | new file mode 100644 |
1331 | index 0000000..311fc9d |
1332 | --- /dev/null |
1333 | +++ b/debian/junit4/poms |
1334 | @@ -0,0 +1 @@ |
1335 | +pom.xml --no-parent --java-lib --has-package-version --usj-name=junit4 |
1336 | \ No newline at end of file |
1337 | diff --git a/debian/junit4/rules b/debian/junit4/rules |
1338 | new file mode 100755 |
1339 | index 0000000..ed9ea9f |
1340 | --- /dev/null |
1341 | +++ b/debian/junit4/rules |
1342 | @@ -0,0 +1,8 @@ |
1343 | +#!/usr/bin/make -f |
1344 | + |
1345 | +%: |
1346 | + dh $@ --with javahelper |
1347 | + |
1348 | +override_dh_auto_configure: |
1349 | + dh_auto_configure $@ |
1350 | + rsync -Lav ../debian/built-components/ debian/ || true |
1351 | diff --git a/debian/junit5/maven.ignoreRules b/debian/junit5/maven.ignoreRules |
1352 | new file mode 100644 |
1353 | index 0000000..0743145 |
1354 | --- /dev/null |
1355 | +++ b/debian/junit5/maven.ignoreRules |
1356 | @@ -0,0 +1,5 @@ |
1357 | +org.jetbrains.kotlin kotlin-maven-plugin |
1358 | +org.jetbrains.kotlin kotlin-stdlib |
1359 | +org.junit.platform junit-platform-jfr |
1360 | +org.junit.platform junit-platform-testkit |
1361 | +org.mockito mockito-junit-jupiter |
1362 | \ No newline at end of file |
1363 | diff --git a/debian/junit5/maven.rules b/debian/junit5/maven.rules |
1364 | new file mode 100644 |
1365 | index 0000000..879d1ec |
1366 | --- /dev/null |
1367 | +++ b/debian/junit5/maven.rules |
1368 | @@ -0,0 +1,2 @@ |
1369 | +junit junit * s/.*/4.x/ * * |
1370 | +* * * ${platform.version} * * |
1371 | \ No newline at end of file |
1372 | diff --git a/debian/junit5/poms b/debian/junit5/poms |
1373 | new file mode 100644 |
1374 | index 0000000..79d92a1 |
1375 | --- /dev/null |
1376 | +++ b/debian/junit5/poms |
1377 | @@ -0,0 +1,21 @@ |
1378 | +# junit5 |
1379 | + |
1380 | +pom.xml |
1381 | +junit-bom/pom.xml |
1382 | +junit-jupiter/pom.xml --java-lib |
1383 | +junit-jupiter-api/pom.xml --java-lib |
1384 | +junit-jupiter-engine/pom.xml --java-lib |
1385 | +junit-jupiter-migrationsupport/pom.xml --java-lib |
1386 | +junit-jupiter-params/pom.xml --java-lib |
1387 | +junit-platform-commons/pom.xml --java-lib |
1388 | +junit-platform-console/pom.xml --java-lib |
1389 | +junit-platform-console-standalone/pom.xml --java-lib |
1390 | +junit-platform-engine/pom.xml --java-lib |
1391 | +junit-platform-launcher/pom.xml --java-lib |
1392 | +junit-platform-reporting/pom.xml --java-lib |
1393 | +junit-platform-runner/pom.xml --java-lib |
1394 | +junit-platform-suite/pom.xml --java-lib |
1395 | +junit-platform-suite-api/pom.xml --java-lib |
1396 | +junit-platform-suite-commons/pom.xml --java-lib |
1397 | +junit-platform-suite-engine/pom.xml --java-lib |
1398 | +junit-vintage-engine/pom.xml --java-lib |
1399 | diff --git a/debian/junit5/rules b/debian/junit5/rules |
1400 | new file mode 100755 |
1401 | index 0000000..283adf5 |
1402 | --- /dev/null |
1403 | +++ b/debian/junit5/rules |
1404 | @@ -0,0 +1,8 @@ |
1405 | +#!/usr/bin/make -f |
1406 | + |
1407 | +%: |
1408 | + dh $@ --buildsystem=maven --with javahelper |
1409 | + |
1410 | +override_dh_auto_build: |
1411 | + rsync -Lav ../debian/built-components/ debian/ || true |
1412 | + dh_auto_build $@ |
1413 | \ No newline at end of file |
1414 | diff --git a/debian/libhamcrest-java/maven.ignoreRules b/debian/libhamcrest-java/maven.ignoreRules |
1415 | new file mode 100644 |
1416 | index 0000000..9cf2270 |
1417 | --- /dev/null |
1418 | +++ b/debian/libhamcrest-java/maven.ignoreRules |
1419 | @@ -0,0 +1,64 @@ |
1420 | +# Maven ignore rules - ignore some Maven dependencies and plugins |
1421 | +# Format of this file is: |
1422 | +# [group] [artifact] [type] [version] [classifier] [scope] |
1423 | +# where each element can be either |
1424 | +# - the exact string, for example org.apache for the group, or 3.1 |
1425 | +# for the version. In this case, the element is simply matched |
1426 | +# and left as it is |
1427 | +# - * (the star character, alone). In this case, anything will |
1428 | +# match and be left as it is. For example, using * on the |
1429 | +# position of the artifact field will match any artifact id |
1430 | +# All elements much match before a rule can be applied |
1431 | +# Example rule: match jar with groupid= junit, artifactid= junit |
1432 | +# and version starting with 3., this dependency is then removed |
1433 | +# from the POM |
1434 | +# junit junit jar s/3\\..*/3.x/ |
1435 | + |
1436 | +org.apache.maven.plugins maven-javadoc-plugin * * * * |
1437 | +org.apache.maven.plugins maven-site-plugin * * * * |
1438 | +org.apache.maven.plugins maven-surefire-plugin * * * * |
1439 | +org.apache.maven.plugins maven-dependency-plugin * * * * |
1440 | +org.apache.maven.plugins maven-enforcer-plugin * * * * |
1441 | +org.apache.maven.plugins maven-javadoc-plugin * * * * |
1442 | +org.apache.maven.plugins maven-source-plugin * * * * |
1443 | + |
1444 | +org.apache.sshd sshd-core * * * * |
1445 | + |
1446 | +org.codehaus.mojo exec-maven-plugin * * * * |
1447 | +org.fusesource.jansi jansi-linux32 * * * * |
1448 | +org.fusesource.jansi jansi-linux64 * * * * |
1449 | +org.fusesource.jansi jansi-osx * * * * |
1450 | +org.fusesource.jansi jansi-windows32 * * * * |
1451 | +org.fusesource.jansi jansi-windows64 * * * * |
1452 | +org.fusesource.jansi jansi-freebsd32 * * * * |
1453 | +org.fusesource.jansi jansi-freebsd64 * * * * |
1454 | +org.fusesource.mvnplugins fuse-jxr-skin * * * * |
1455 | +org.fusesource.mvnplugins maven-uberize-plugin * * * * |
1456 | +org.fusesource.mvnplugins fuse-javadoc-skin * * * * |
1457 | +org.springframework.boot:spring-boot-starter * * * * |
1458 | + |
1459 | +com.univocity univocity-output-tester |
1460 | +org.apache.maven.plugins maven-assembly-plugin |
1461 | +org.apache.maven.plugins maven-enforcer-plugin |
1462 | +org.apache.maven.plugins maven-javadoc-plugin |
1463 | +org.apache.maven.plugins maven-source-plugin |
1464 | +org.hsqldb hsqldb |
1465 | +org.sonatype.plugins nexus-staging-maven-plugin |
1466 | +org.testng testng |
1467 | + |
1468 | + |
1469 | +org.apache.maven.doxia doxia-module-markdown * * * * |
1470 | +org.apache.maven.plugins maven-enforcer-plugin * * * * |
1471 | +org.apache.maven.plugins maven-release-plugin * * * * |
1472 | +org.apache.maven.plugins maven-source-plugin * * * * |
1473 | +org.codehaus.mojo animal-sniffer-maven-plugin * * * * |
1474 | +com.google.code.maven-replacer-plugin replacer * * * * |
1475 | +* maven-site-plugin * * * * |
1476 | +com.github.stephenc.wagon wagon-gitsite * * * * |
1477 | +* maven-project-info-reports-plugin * * * * |
1478 | + |
1479 | +org.jetbrains.kotlin kotlin-maven-plugin |
1480 | +org.jetbrains.kotlin kotlin-stdlib |
1481 | +org.junit.platform junit-platform-jfr |
1482 | +org.junit.platform junit-platform-testkit |
1483 | +org.mockito mockito-junit-jupiter |
1484 | \ No newline at end of file |
1485 | diff --git a/debian/libhamcrest-java/maven.rules b/debian/libhamcrest-java/maven.rules |
1486 | new file mode 100644 |
1487 | index 0000000..aafd0db |
1488 | --- /dev/null |
1489 | +++ b/debian/libhamcrest-java/maven.rules |
1490 | @@ -0,0 +1,23 @@ |
1491 | +jmock jmock * s/.*/1.x/ * * |
1492 | +junit junit jar s/4\..*/4.x/ * * |
1493 | +org.fusesource.hawtjni hawtjni-runtime jar s/.*/debian/ * * |
1494 | +org.fusesource.jansi example jar s/.*/debian/ * * |
1495 | +org.fusesource.jansi jansi-project pom s/.*/debian/ * * |
1496 | +org.fusesource.jansi jansi jar s/.*/debian/ * * |
1497 | +org.fusesource.jansi jansi jar s/.*/debian/ * * |
1498 | +org.jline jline jar s/.*/debian/ * * |
1499 | +jline jline jar * * * |
1500 | +org.opentest4j.reporting s/schema/open-test-reporting-schema/ * s/.*/debian/ * * |
1501 | +org.opentest4j.reporting s/events/open-test-reporting-events/ * s/.*/debian/ * * |
1502 | +com.univocity univocity-parsers jar s/.*/debian/ * * |
1503 | + |
1504 | +org.hamcrest s/hamcrest-core/hamcrest/ * s/.*/debian/ * * |
1505 | + |
1506 | +org.junit.platform * * ${platform.version} * * |
1507 | +org.junit.jupiter * * ${platform.version} * * |
1508 | + |
1509 | +com.google.inject guice jar s/.*/debian/ s/no_aop// * |
1510 | +org.yaml snakeyaml bundle s/1\..*/1.x/ * * |
1511 | +org.yaml snakeyaml s/jar/bundle/ s/1\..*/1.x/ * * |
1512 | +s/ant/org.apache.ant/ * * s/.*/debian/ * * |
1513 | +org.assertj assertj-core jar s/.*/debian/ * * |
1514 | diff --git a/debian/libhamcrest-java/poms b/debian/libhamcrest-java/poms |
1515 | new file mode 100644 |
1516 | index 0000000..b243957 |
1517 | --- /dev/null |
1518 | +++ b/debian/libhamcrest-java/poms |
1519 | @@ -0,0 +1,2 @@ |
1520 | +hamcrest/build/debian/hamcrest.pom --java-lib --artifact=hamcrest/build/libs/hamcrest-*.jar --relocate=org.hamcrest:hamcrest-core,org.hamcrest:hamcrest-all,org.hamcrest:hamcrest-library |
1521 | +hamcrest-integration/build/debian/hamcrest-integration.pom --java-lib --artifact=hamcrest-integration/build/libs/hamcrest-integration-*.jar |
1522 | diff --git a/debian/libhamcrest-java/rules b/debian/libhamcrest-java/rules |
1523 | new file mode 100755 |
1524 | index 0000000..42f9f19 |
1525 | --- /dev/null |
1526 | +++ b/debian/libhamcrest-java/rules |
1527 | @@ -0,0 +1,7 @@ |
1528 | +#!/usr/bin/make -f |
1529 | + |
1530 | +%: |
1531 | + dh $@ --buildsystem=gradle --with maven-repo-helper |
1532 | + |
1533 | +override_dh_auto_build: |
1534 | + dh_auto_build -- jar |
1535 | diff --git a/debian/maven.properties b/debian/maven.properties |
1536 | new file mode 100644 |
1537 | index 0000000..3214385 |
1538 | --- /dev/null |
1539 | +++ b/debian/maven.properties |
1540 | @@ -0,0 +1,6 @@ |
1541 | +# Include here properties to pass to Maven during the build. |
1542 | +# For example: |
1543 | +# maven.test.skip=true |
1544 | +maven.compiler.release=8 |
1545 | +maven.test.skip=true |
1546 | +project.build.sourceEncoding=UTF-8 |
1547 | diff --git a/debian/opentest4j-reporting/maven.ignoreRules b/debian/opentest4j-reporting/maven.ignoreRules |
1548 | new file mode 100644 |
1549 | index 0000000..9cf2270 |
1550 | --- /dev/null |
1551 | +++ b/debian/opentest4j-reporting/maven.ignoreRules |
1552 | @@ -0,0 +1,64 @@ |
1553 | +# Maven ignore rules - ignore some Maven dependencies and plugins |
1554 | +# Format of this file is: |
1555 | +# [group] [artifact] [type] [version] [classifier] [scope] |
1556 | +# where each element can be either |
1557 | +# - the exact string, for example org.apache for the group, or 3.1 |
1558 | +# for the version. In this case, the element is simply matched |
1559 | +# and left as it is |
1560 | +# - * (the star character, alone). In this case, anything will |
1561 | +# match and be left as it is. For example, using * on the |
1562 | +# position of the artifact field will match any artifact id |
1563 | +# All elements much match before a rule can be applied |
1564 | +# Example rule: match jar with groupid= junit, artifactid= junit |
1565 | +# and version starting with 3., this dependency is then removed |
1566 | +# from the POM |
1567 | +# junit junit jar s/3\\..*/3.x/ |
1568 | + |
1569 | +org.apache.maven.plugins maven-javadoc-plugin * * * * |
1570 | +org.apache.maven.plugins maven-site-plugin * * * * |
1571 | +org.apache.maven.plugins maven-surefire-plugin * * * * |
1572 | +org.apache.maven.plugins maven-dependency-plugin * * * * |
1573 | +org.apache.maven.plugins maven-enforcer-plugin * * * * |
1574 | +org.apache.maven.plugins maven-javadoc-plugin * * * * |
1575 | +org.apache.maven.plugins maven-source-plugin * * * * |
1576 | + |
1577 | +org.apache.sshd sshd-core * * * * |
1578 | + |
1579 | +org.codehaus.mojo exec-maven-plugin * * * * |
1580 | +org.fusesource.jansi jansi-linux32 * * * * |
1581 | +org.fusesource.jansi jansi-linux64 * * * * |
1582 | +org.fusesource.jansi jansi-osx * * * * |
1583 | +org.fusesource.jansi jansi-windows32 * * * * |
1584 | +org.fusesource.jansi jansi-windows64 * * * * |
1585 | +org.fusesource.jansi jansi-freebsd32 * * * * |
1586 | +org.fusesource.jansi jansi-freebsd64 * * * * |
1587 | +org.fusesource.mvnplugins fuse-jxr-skin * * * * |
1588 | +org.fusesource.mvnplugins maven-uberize-plugin * * * * |
1589 | +org.fusesource.mvnplugins fuse-javadoc-skin * * * * |
1590 | +org.springframework.boot:spring-boot-starter * * * * |
1591 | + |
1592 | +com.univocity univocity-output-tester |
1593 | +org.apache.maven.plugins maven-assembly-plugin |
1594 | +org.apache.maven.plugins maven-enforcer-plugin |
1595 | +org.apache.maven.plugins maven-javadoc-plugin |
1596 | +org.apache.maven.plugins maven-source-plugin |
1597 | +org.hsqldb hsqldb |
1598 | +org.sonatype.plugins nexus-staging-maven-plugin |
1599 | +org.testng testng |
1600 | + |
1601 | + |
1602 | +org.apache.maven.doxia doxia-module-markdown * * * * |
1603 | +org.apache.maven.plugins maven-enforcer-plugin * * * * |
1604 | +org.apache.maven.plugins maven-release-plugin * * * * |
1605 | +org.apache.maven.plugins maven-source-plugin * * * * |
1606 | +org.codehaus.mojo animal-sniffer-maven-plugin * * * * |
1607 | +com.google.code.maven-replacer-plugin replacer * * * * |
1608 | +* maven-site-plugin * * * * |
1609 | +com.github.stephenc.wagon wagon-gitsite * * * * |
1610 | +* maven-project-info-reports-plugin * * * * |
1611 | + |
1612 | +org.jetbrains.kotlin kotlin-maven-plugin |
1613 | +org.jetbrains.kotlin kotlin-stdlib |
1614 | +org.junit.platform junit-platform-jfr |
1615 | +org.junit.platform junit-platform-testkit |
1616 | +org.mockito mockito-junit-jupiter |
1617 | \ No newline at end of file |
1618 | diff --git a/debian/opentest4j-reporting/maven.rules b/debian/opentest4j-reporting/maven.rules |
1619 | new file mode 100644 |
1620 | index 0000000..aafd0db |
1621 | --- /dev/null |
1622 | +++ b/debian/opentest4j-reporting/maven.rules |
1623 | @@ -0,0 +1,23 @@ |
1624 | +jmock jmock * s/.*/1.x/ * * |
1625 | +junit junit jar s/4\..*/4.x/ * * |
1626 | +org.fusesource.hawtjni hawtjni-runtime jar s/.*/debian/ * * |
1627 | +org.fusesource.jansi example jar s/.*/debian/ * * |
1628 | +org.fusesource.jansi jansi-project pom s/.*/debian/ * * |
1629 | +org.fusesource.jansi jansi jar s/.*/debian/ * * |
1630 | +org.fusesource.jansi jansi jar s/.*/debian/ * * |
1631 | +org.jline jline jar s/.*/debian/ * * |
1632 | +jline jline jar * * * |
1633 | +org.opentest4j.reporting s/schema/open-test-reporting-schema/ * s/.*/debian/ * * |
1634 | +org.opentest4j.reporting s/events/open-test-reporting-events/ * s/.*/debian/ * * |
1635 | +com.univocity univocity-parsers jar s/.*/debian/ * * |
1636 | + |
1637 | +org.hamcrest s/hamcrest-core/hamcrest/ * s/.*/debian/ * * |
1638 | + |
1639 | +org.junit.platform * * ${platform.version} * * |
1640 | +org.junit.jupiter * * ${platform.version} * * |
1641 | + |
1642 | +com.google.inject guice jar s/.*/debian/ s/no_aop// * |
1643 | +org.yaml snakeyaml bundle s/1\..*/1.x/ * * |
1644 | +org.yaml snakeyaml s/jar/bundle/ s/1\..*/1.x/ * * |
1645 | +s/ant/org.apache.ant/ * * s/.*/debian/ * * |
1646 | +org.assertj assertj-core jar s/.*/debian/ * * |
1647 | diff --git a/debian/opentest4j-reporting/poms b/debian/opentest4j-reporting/poms |
1648 | new file mode 100644 |
1649 | index 0000000..bf060ad |
1650 | --- /dev/null |
1651 | +++ b/debian/opentest4j-reporting/poms |
1652 | @@ -0,0 +1,2 @@ |
1653 | +schema/build/debian/schema.pom --has-package-version --java-lib --usj-name=opentest4j-reporting-schema --artifact=schema/build/libs/schema-*.jar |
1654 | +events/build/debian/events.pom --has-package-version --java-lib --usj-name=opentest4j-reporting-events --artifact=events/build/libs/events-*.jar |
1655 | diff --git a/debian/opentest4j-reporting/rules b/debian/opentest4j-reporting/rules |
1656 | new file mode 100755 |
1657 | index 0000000..1a416de |
1658 | --- /dev/null |
1659 | +++ b/debian/opentest4j-reporting/rules |
1660 | @@ -0,0 +1,10 @@ |
1661 | +#!/usr/bin/make -f |
1662 | + |
1663 | +%: |
1664 | + dh $@ --buildsystem=gradle --with maven-repo-helper |
1665 | + |
1666 | +override_dh_auto_test: |
1667 | + |
1668 | +override_dh_auto_configure: |
1669 | + dh_auto_configure $@ |
1670 | + rsync -Lav ../debian/built-components/ debian/ || true |
1671 | \ No newline at end of file |
1672 | diff --git a/debian/patches/jline3-01-ignore-warnings.patch b/debian/patches/jline3-01-ignore-warnings.patch |
1673 | new file mode 100644 |
1674 | index 0000000..f6c1dfb |
1675 | --- /dev/null |
1676 | +++ b/debian/patches/jline3-01-ignore-warnings.patch |
1677 | @@ -0,0 +1,31 @@ |
1678 | +Description: Removed -Werror tag |
1679 | +Author: Saif Abdul Cassim <saif.15@cse.mrt.ac.lk> |
1680 | +Forwarded: not-needed |
1681 | +--- a/jline3//pom.xml |
1682 | ++++ b/jline3/pom.xml |
1683 | +@@ -306,7 +306,6 @@ |
1684 | + <showWarnings>true</showWarnings> |
1685 | + <compilerArgs> |
1686 | + <arg>-Xlint:all,-options</arg> |
1687 | +- <arg>-Werror</arg> |
1688 | + <arg>-profile</arg> |
1689 | + <arg>compact1</arg> |
1690 | + </compilerArgs> |
1691 | +--- a/jline3/jline/pom.xml |
1692 | ++++ b/jline3/jline/pom.xml |
1693 | +@@ -226,7 +226,6 @@ |
1694 | + </excludes> |
1695 | + <compilerArgs> |
1696 | + <arg>-Xlint:all,-options</arg> |
1697 | +- <arg>-Werror</arg> |
1698 | + <arg>-profile</arg> |
1699 | + <arg>compact1</arg> |
1700 | + </compilerArgs> |
1701 | +@@ -243,7 +242,6 @@ |
1702 | + </includes> |
1703 | + <compilerArgs> |
1704 | + <arg>-Xlint:all,-options</arg> |
1705 | +- <arg>-Werror</arg> |
1706 | + <arg>-profile</arg> |
1707 | + <arg>compact3</arg> |
1708 | + </compilerArgs> |
1709 | diff --git a/debian/patches/jline3-02-ignore-remote-modules.patch b/debian/patches/jline3-02-ignore-remote-modules.patch |
1710 | new file mode 100644 |
1711 | index 0000000..c3728d4 |
1712 | --- /dev/null |
1713 | +++ b/debian/patches/jline3-02-ignore-remote-modules.patch |
1714 | @@ -0,0 +1,59 @@ |
1715 | +Description: Ignore the remote-telnet and remote-ssh modules |
1716 | +Author: Saif Abdul Cassim <saif.15@cse.mrt.ac.lk> |
1717 | +Forwarded: not-needed |
1718 | +--- a/jline3/jline/pom.xml |
1719 | ++++ b/jline3/jline/pom.xml |
1720 | +@@ -98,22 +98,6 @@ |
1721 | + <overWrite>false</overWrite> |
1722 | + <outputDirectory>${project.build.directory}/generated-sources</outputDirectory> |
1723 | + </artifactItem> |
1724 | +- <artifactItem> |
1725 | +- <groupId>org.jline</groupId> |
1726 | +- <artifactId>jline-remote-ssh</artifactId> |
1727 | +- <classifier>sources</classifier> |
1728 | +- <type>jar</type> |
1729 | +- <overWrite>false</overWrite> |
1730 | +- <outputDirectory>${project.build.directory}/generated-sources</outputDirectory> |
1731 | +- </artifactItem> |
1732 | +- <artifactItem> |
1733 | +- <groupId>org.jline</groupId> |
1734 | +- <artifactId>jline-remote-telnet</artifactId> |
1735 | +- <classifier>sources</classifier> |
1736 | +- <type>jar</type> |
1737 | +- <overWrite>false</overWrite> |
1738 | +- <outputDirectory>${project.build.directory}/generated-sources</outputDirectory> |
1739 | +- </artifactItem> |
1740 | + |
1741 | + <!-- resources --> |
1742 | + <artifactItem> |
1743 | +@@ -156,22 +140,6 @@ |
1744 | + <outputDirectory>${project.build.directory}/generated-resources</outputDirectory> |
1745 | + <excludes>**/*.class</excludes> |
1746 | + </artifactItem> |
1747 | +- <artifactItem> |
1748 | +- <groupId>org.jline</groupId> |
1749 | +- <artifactId>jline-remote-ssh</artifactId> |
1750 | +- <type>jar</type> |
1751 | +- <overWrite>false</overWrite> |
1752 | +- <outputDirectory>${project.build.directory}/generated-resources</outputDirectory> |
1753 | +- <excludes>**/*.class</excludes> |
1754 | +- </artifactItem> |
1755 | +- <artifactItem> |
1756 | +- <groupId>org.jline</groupId> |
1757 | +- <artifactId>jline-remote-telnet</artifactId> |
1758 | +- <type>jar</type> |
1759 | +- <overWrite>false</overWrite> |
1760 | +- <outputDirectory>${project.build.directory}/generated-resources</outputDirectory> |
1761 | +- <excludes>**/*.class</excludes> |
1762 | +- </artifactItem> |
1763 | + </artifactItems> |
1764 | + </configuration> |
1765 | + </execution> |
1766 | +@@ -257,7 +225,6 @@ |
1767 | + <Export-Package>*;-noimport:=true</Export-Package> |
1768 | + <Import-Package> |
1769 | + com.sun.jna*, |
1770 | +- org.apache.sshd*, |
1771 | + org.fusesource.jansi;version="[1.12,2)", |
1772 | + org.fusesource.jansi.internal;version="[1.6,2)", |
1773 | + * |
1774 | diff --git a/debian/patches/junit4-Version.patch b/debian/patches/junit4-Version.patch |
1775 | new file mode 100644 |
1776 | index 0000000..70e1d1e |
1777 | --- /dev/null |
1778 | +++ b/debian/patches/junit4-Version.patch |
1779 | @@ -0,0 +1,18 @@ |
1780 | +From: Markus Koschany <apo@debian.org> |
1781 | +Date: Sun, 1 Nov 2020 19:20:34 +0100 |
1782 | +Subject: Version |
1783 | + |
1784 | +Forwarded: no |
1785 | +diff --git a/src/main/java/junit/runner/Version.java b/src/main/java/junit/runner/Version.java |
1786 | +index 9f26384..81e07de 100644 |
1787 | +--- a/junit4/src/main/java/junit/runner/Version.java |
1788 | ++++ b/junit4/src/main/java/junit/runner/Version.java |
1789 | +@@ -9,7 +9,7 @@ public class Version { |
1790 | + } |
1791 | + |
1792 | + public static String id() { |
1793 | +- return "4.13.2-SNAPSHOT"; |
1794 | ++ return "4.13.2"; |
1795 | + } |
1796 | + |
1797 | + public static void main(String[] args) { |
1798 | diff --git a/debian/patches/junit4-exclude-dependency-sources.patch b/debian/patches/junit4-exclude-dependency-sources.patch |
1799 | new file mode 100644 |
1800 | index 0000000..0f8ab78 |
1801 | --- /dev/null |
1802 | +++ b/debian/patches/junit4-exclude-dependency-sources.patch |
1803 | @@ -0,0 +1,30 @@ |
1804 | +From: Emmanuel Bourg <ebourg@apache.org> |
1805 | +Date: Sun, 1 Nov 2020 19:17:42 +0100 |
1806 | +Subject: Don't include hamcrest in the Javadoc (the source artifact isn't |
1807 | + available) |
1808 | + |
1809 | +Forwarded: not-needed |
1810 | +--- |
1811 | + pom.xml | 4 ++-- |
1812 | + 1 file changed, 2 insertions(+), 2 deletions(-) |
1813 | + |
1814 | +--- a/junit4/pom.xml |
1815 | ++++ b/junit4/pom.xml |
1816 | +@@ -314,7 +314,7 @@ |
1817 | + <minmemory>32m</minmemory> |
1818 | + <maxmemory>128m</maxmemory> |
1819 | + <failOnError>true</failOnError> |
1820 | +- <includeDependencySources>true</includeDependencySources> |
1821 | ++ <includeDependencySources>false</includeDependencySources> |
1822 | + <dependencySourceIncludes> |
1823 | + <dependencySourceInclude>org.hamcrest:hamcrest-core:*</dependencySourceInclude> |
1824 | + </dependencySourceIncludes> |
1825 | +@@ -437,7 +437,7 @@ |
1826 | + <minmemory>32m</minmemory> |
1827 | + <maxmemory>128m</maxmemory> |
1828 | + <failOnError>true</failOnError> |
1829 | +- <includeDependencySources>true</includeDependencySources> |
1830 | ++ <includeDependencySources>false</includeDependencySources> |
1831 | + <dependencySourceIncludes> |
1832 | + <dependencySourceInclude>org.hamcrest:hamcrest-core:*</dependencySourceInclude> |
1833 | + </dependencySourceIncludes> |
1834 | diff --git a/debian/patches/junit4-hamcrest-compatibility.patch b/debian/patches/junit4-hamcrest-compatibility.patch |
1835 | new file mode 100644 |
1836 | index 0000000..0544a96 |
1837 | --- /dev/null |
1838 | +++ b/debian/patches/junit4-hamcrest-compatibility.patch |
1839 | @@ -0,0 +1,24 @@ |
1840 | +Description: Fixes the compatibility with the version of Hamcrest in Debian |
1841 | +Author: Emmanuel Bourg <ebourg@apache.org> |
1842 | +Forwarded: not-needed |
1843 | +--- a/junit4/src/main/java/org/junit/matchers/JUnitMatchers.java |
1844 | ++++ b/junit4/src/main/java/org/junit/matchers/JUnitMatchers.java |
1845 | +@@ -57,7 +57,7 @@ |
1846 | + */ |
1847 | + @Deprecated |
1848 | + public static <T> Matcher<Iterable<T>> everyItem(final Matcher<T> elementMatcher) { |
1849 | +- return CoreMatchers.everyItem(elementMatcher); |
1850 | ++ return CoreMatchers.everyItem((Matcher) elementMatcher); |
1851 | + } |
1852 | + |
1853 | + /** |
1854 | +--- a/junit4/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java |
1855 | ++++ b/junit4/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java |
1856 | +@@ -109,6 +109,6 @@ |
1857 | + } |
1858 | + |
1859 | + private Matcher<Iterable<Failure>> empty() { |
1860 | +- return everyItem(nullValue(Failure.class)); |
1861 | ++ return everyItem((Matcher) nullValue(Failure.class)); |
1862 | + } |
1863 | + } |
1864 | diff --git a/debian/patches/junit4-java17-compatibility.patch b/debian/patches/junit4-java17-compatibility.patch |
1865 | new file mode 100644 |
1866 | index 0000000..cbb8ce6 |
1867 | --- /dev/null |
1868 | +++ b/debian/patches/junit4-java17-compatibility.patch |
1869 | @@ -0,0 +1,50 @@ |
1870 | +Description: Disable doclint and change the source level to fix the build failure with OpenJDK 17 |
1871 | +Author: Emmanuel Bourg <ebourg@apache.org> |
1872 | +Forwarded: https://github.com/junit-team/junit4/issues/1696 |
1873 | +Bug-Debian: https://bugs.debian.org/981830 |
1874 | +--- a/junit4/pom.xml |
1875 | ++++ b/junit4/pom.xml |
1876 | +@@ -533,14 +533,14 @@ |
1877 | + <configuration> |
1878 | + <compilerArgs> |
1879 | + <arg>-Xlint:unchecked</arg> |
1880 | +- <arg>-Xdoclint:accessibility,reference,syntax</arg> |
1881 | ++ <arg>-Xdoclint:none</arg> |
1882 | + </compilerArgs> |
1883 | + </configuration> |
1884 | + </plugin> |
1885 | + <plugin> |
1886 | + <artifactId>maven-javadoc-plugin</artifactId> |
1887 | + <configuration> |
1888 | +- <additionalparam>-Xdoclint:accessibility -Xdoclint:reference</additionalparam> |
1889 | ++ <additionalparam>-Xdoclint:none</additionalparam> |
1890 | + </configuration> |
1891 | + </plugin> |
1892 | + </plugins> |
1893 | +@@ -550,7 +550,7 @@ |
1894 | + <plugin> |
1895 | + <artifactId>maven-javadoc-plugin</artifactId> |
1896 | + <configuration> |
1897 | +- <additionalparam>-Xdoclint:accessibility -Xdoclint:reference</additionalparam> |
1898 | ++ <additionalparam>-Xdoclint:none</additionalparam> |
1899 | + </configuration> |
1900 | + </plugin> |
1901 | + </plugins> |
1902 | +@@ -570,7 +570,7 @@ |
1903 | + <plugin> |
1904 | + <artifactId>maven-javadoc-plugin</artifactId> |
1905 | + <configuration> |
1906 | +- <source>1.6</source> |
1907 | ++ <source>8</source> |
1908 | + </configuration> |
1909 | + </plugin> |
1910 | + </plugins> |
1911 | +@@ -580,7 +580,7 @@ |
1912 | + <plugin> |
1913 | + <artifactId>maven-javadoc-plugin</artifactId> |
1914 | + <configuration> |
1915 | +- <source>1.6</source> |
1916 | ++ <source>8</source> |
1917 | + </configuration> |
1918 | + </plugin> |
1919 | + </plugins> |
1920 | diff --git a/debian/patches/junit5-15-deprecated.patch b/debian/patches/junit5-15-deprecated.patch |
1921 | new file mode 100644 |
1922 | index 0000000..8704601 |
1923 | --- /dev/null |
1924 | +++ b/debian/patches/junit5-15-deprecated.patch |
1925 | @@ -0,0 +1,16 @@ |
1926 | +Description: call to AllDefaultPossibilitiesBuilder(boolean) is deprecated |
1927 | +Author: tony mancill <tmancill@debian.org> |
1928 | +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=975225 |
1929 | +Forwarded: no |
1930 | +Last-Update: 2022-02-06 |
1931 | + |
1932 | +--- a/junit5/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/DefensiveAllDefaultPossibilitiesBuilder.java |
1933 | ++++ b/junit5/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/DefensiveAllDefaultPossibilitiesBuilder.java |
1934 | +@@ -46,7 +46,6 @@ |
1935 | + |
1936 | + @SuppressWarnings("deprecation") |
1937 | + DefensiveAllDefaultPossibilitiesBuilder() { |
1938 | +- super(true); |
1939 | + annotatedBuilder = new DefensiveAnnotatedBuilder(this); |
1940 | + junit4Builder = new DefensiveJUnit4Builder(); |
1941 | + ignoredBuilder = new NullIgnoredBuilder(); |
1942 | diff --git a/debian/patches/junit5-16-maven-build.patch b/debian/patches/junit5-16-maven-build.patch |
1943 | new file mode 100644 |
1944 | index 0000000..a7a2baf |
1945 | --- /dev/null |
1946 | +++ b/debian/patches/junit5-16-maven-build.patch |
1947 | @@ -0,0 +1,1117 @@ |
1948 | +Description: Alternative build system using Maven replacing Gradle until |
1949 | + a more recent version is available in Debian |
1950 | +Author: Emmanuel Bourg <ebourg@apache.org> |
1951 | +Origin: https://github.com/ebourg/junit5-maven-build |
1952 | +Forwarded: not-needed |
1953 | +--- /dev/null |
1954 | ++++ b/junit5/junit-bom/pom.xml |
1955 | +@@ -0,0 +1,111 @@ |
1956 | ++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
1957 | ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
1958 | ++ <modelVersion>4.0.0</modelVersion> |
1959 | ++ <parent> |
1960 | ++ <groupId>org.junit</groupId> |
1961 | ++ <artifactId>junit-parent</artifactId> |
1962 | ++ <version>5.9.2</version> |
1963 | ++ <relativePath>../pom.xml</relativePath> |
1964 | ++ </parent> |
1965 | ++ <groupId>org.junit</groupId> |
1966 | ++ <artifactId>junit-bom</artifactId> |
1967 | ++ <version>5.9.2</version> |
1968 | ++ <packaging>pom</packaging> |
1969 | ++ <name>JUnit 5 (Bill of Materials)</name> |
1970 | ++ <description>This Bill of Materials POM can be used to ease dependency management when referencing multiple JUnit artifacts using Gradle or Maven.</description> |
1971 | ++ |
1972 | ++ <dependencyManagement> |
1973 | ++ <dependencies> |
1974 | ++ <dependency> |
1975 | ++ <groupId>org.junit.jupiter</groupId> |
1976 | ++ <artifactId>junit-jupiter</artifactId> |
1977 | ++ <version>${project.version}</version> |
1978 | ++ </dependency> |
1979 | ++ <dependency> |
1980 | ++ <groupId>org.junit.jupiter</groupId> |
1981 | ++ <artifactId>junit-jupiter-api</artifactId> |
1982 | ++ <version>${project.version}</version> |
1983 | ++ </dependency> |
1984 | ++ <dependency> |
1985 | ++ <groupId>org.junit.jupiter</groupId> |
1986 | ++ <artifactId>junit-jupiter-engine</artifactId> |
1987 | ++ <version>${project.version}</version> |
1988 | ++ </dependency> |
1989 | ++ <dependency> |
1990 | ++ <groupId>org.junit.jupiter</groupId> |
1991 | ++ <artifactId>junit-jupiter-migrationsupport</artifactId> |
1992 | ++ <version>${project.version}</version> |
1993 | ++ </dependency> |
1994 | ++ <dependency> |
1995 | ++ <groupId>org.junit.jupiter</groupId> |
1996 | ++ <artifactId>junit-jupiter-params</artifactId> |
1997 | ++ <version>${project.version}</version> |
1998 | ++ </dependency> |
1999 | ++ <dependency> |
2000 | ++ <groupId>org.junit.platform</groupId> |
2001 | ++ <artifactId>junit-platform-commons</artifactId> |
2002 | ++ <version>${platform.version}</version> |
2003 | ++ </dependency> |
2004 | ++ <dependency> |
2005 | ++ <groupId>org.junit.platform</groupId> |
2006 | ++ <artifactId>junit-platform-console</artifactId> |
2007 | ++ <version>${platform.version}</version> |
2008 | ++ </dependency> |
2009 | ++ <dependency> |
2010 | ++ <groupId>org.junit.platform</groupId> |
2011 | ++ <artifactId>junit-platform-engine</artifactId> |
2012 | ++ <version>${platform.version}</version> |
2013 | ++ </dependency> |
2014 | ++ <dependency> |
2015 | ++ <groupId>org.junit.platform</groupId> |
2016 | ++ <artifactId>junit-platform-jfr</artifactId> |
2017 | ++ <version>${platform.version}</version> |
2018 | ++ </dependency> |
2019 | ++ <dependency> |
2020 | ++ <groupId>org.junit.platform</groupId> |
2021 | ++ <artifactId>junit-platform-launcher</artifactId> |
2022 | ++ <version>${platform.version}</version> |
2023 | ++ </dependency> |
2024 | ++ <dependency> |
2025 | ++ <groupId>org.junit.platform</groupId> |
2026 | ++ <artifactId>junit-platform-reporting</artifactId> |
2027 | ++ <version>${platform.version}</version> |
2028 | ++ </dependency> |
2029 | ++ <dependency> |
2030 | ++ <groupId>org.junit.platform</groupId> |
2031 | ++ <artifactId>junit-platform-runner</artifactId> |
2032 | ++ <version>${platform.version}</version> |
2033 | ++ </dependency> |
2034 | ++ <dependency> |
2035 | ++ <groupId>org.junit.platform</groupId> |
2036 | ++ <artifactId>junit-platform-suite</artifactId> |
2037 | ++ <version>${platform.version}</version> |
2038 | ++ </dependency> |
2039 | ++ <dependency> |
2040 | ++ <groupId>org.junit.platform</groupId> |
2041 | ++ <artifactId>junit-platform-suite-api</artifactId> |
2042 | ++ <version>${platform.version}</version> |
2043 | ++ </dependency> |
2044 | ++ <dependency> |
2045 | ++ <groupId>org.junit.platform</groupId> |
2046 | ++ <artifactId>junit-platform-suite-commons</artifactId> |
2047 | ++ <version>${platform.version}</version> |
2048 | ++ </dependency> |
2049 | ++ <dependency> |
2050 | ++ <groupId>org.junit.platform</groupId> |
2051 | ++ <artifactId>junit-platform-suite-engine</artifactId> |
2052 | ++ <version>${platform.version}</version> |
2053 | ++ </dependency> |
2054 | ++ <dependency> |
2055 | ++ <groupId>org.junit.platform</groupId> |
2056 | ++ <artifactId>junit-platform-testkit</artifactId> |
2057 | ++ <version>${platform.version}</version> |
2058 | ++ </dependency> |
2059 | ++ <dependency> |
2060 | ++ <groupId>org.junit.vintage</groupId> |
2061 | ++ <artifactId>junit-vintage-engine</artifactId> |
2062 | ++ <version>${project.version}</version> |
2063 | ++ </dependency> |
2064 | ++ </dependencies> |
2065 | ++ </dependencyManagement> |
2066 | ++</project> |
2067 | +--- /dev/null |
2068 | ++++ b/junit5/junit-jupiter-api/pom.xml |
2069 | +@@ -0,0 +1,63 @@ |
2070 | ++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
2071 | ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
2072 | ++ <modelVersion>4.0.0</modelVersion> |
2073 | ++ <parent> |
2074 | ++ <groupId>org.junit</groupId> |
2075 | ++ <artifactId>junit-parent</artifactId> |
2076 | ++ <version>5.9.2</version> |
2077 | ++ <relativePath>../pom.xml</relativePath> |
2078 | ++ </parent> |
2079 | ++ <groupId>org.junit.jupiter</groupId> |
2080 | ++ <artifactId>junit-jupiter-api</artifactId> |
2081 | ++ <version>5.9.2</version> |
2082 | ++ <name>JUnit Jupiter API</name> |
2083 | ++ <description>Module "junit-jupiter-api" of JUnit 5.</description> |
2084 | ++ |
2085 | ++ <properties> |
2086 | ++ <kotlin.version>1.5.31</kotlin.version> |
2087 | ++ </properties> |
2088 | ++ |
2089 | ++ <dependencies> |
2090 | ++ <dependency> |
2091 | ++ <groupId>org.opentest4j</groupId> |
2092 | ++ <artifactId>opentest4j</artifactId> |
2093 | ++ <version>1.2.0</version> |
2094 | ++ </dependency> |
2095 | ++ <dependency> |
2096 | ++ <groupId>org.junit.platform</groupId> |
2097 | ++ <artifactId>junit-platform-commons</artifactId> |
2098 | ++ <version>${platform.version}</version> |
2099 | ++ </dependency> |
2100 | ++ <dependency> |
2101 | ++ <groupId>org.jetbrains.kotlin</groupId> |
2102 | ++ <artifactId>kotlin-stdlib</artifactId> |
2103 | ++ <version>${kotlin.version}</version> |
2104 | ++ <scope>provided</scope> |
2105 | ++ </dependency> |
2106 | ++ </dependencies> |
2107 | ++ |
2108 | ++ <build> |
2109 | ++ <plugins> |
2110 | ++ <plugin> |
2111 | ++ <groupId>org.jetbrains.kotlin</groupId> |
2112 | ++ <artifactId>kotlin-maven-plugin</artifactId> |
2113 | ++ <version>${kotlin.version}</version> |
2114 | ++ <executions> |
2115 | ++ <execution> |
2116 | ++ <id>compile</id> |
2117 | ++ <phase>process-sources</phase> |
2118 | ++ <goals> |
2119 | ++ <goal>compile</goal> |
2120 | ++ </goals> |
2121 | ++ <configuration> |
2122 | ++ <sourceDirs> |
2123 | ++ <source>src/main/java</source> |
2124 | ++ <source>src/main/kotlin</source> |
2125 | ++ </sourceDirs> |
2126 | ++ </configuration> |
2127 | ++ </execution> |
2128 | ++ </executions> |
2129 | ++ </plugin> |
2130 | ++ </plugins> |
2131 | ++ </build> |
2132 | ++</project> |
2133 | +--- /dev/null |
2134 | ++++ b/junit5/junit-jupiter-engine/pom.xml |
2135 | +@@ -0,0 +1,47 @@ |
2136 | ++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
2137 | ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
2138 | ++ <modelVersion>4.0.0</modelVersion> |
2139 | ++ <parent> |
2140 | ++ <groupId>org.junit</groupId> |
2141 | ++ <artifactId>junit-parent</artifactId> |
2142 | ++ <version>5.9.2</version> |
2143 | ++ <relativePath>../pom.xml</relativePath> |
2144 | ++ </parent> |
2145 | ++ <groupId>org.junit.jupiter</groupId> |
2146 | ++ <artifactId>junit-jupiter-engine</artifactId> |
2147 | ++ <version>5.9.2</version> |
2148 | ++ <name>JUnit Jupiter Engine</name> |
2149 | ++ <description>Module "junit-jupiter-engine" of JUnit 5.</description> |
2150 | ++ |
2151 | ++ <dependencies> |
2152 | ++ <dependency> |
2153 | ++ <groupId>org.junit.platform</groupId> |
2154 | ++ <artifactId>junit-platform-engine</artifactId> |
2155 | ++ <version>1.9.1</version> |
2156 | ++ </dependency> |
2157 | ++ <dependency> |
2158 | ++ <groupId>org.junit.jupiter</groupId> |
2159 | ++ <artifactId>junit-jupiter-api</artifactId> |
2160 | ++ <version>${project.version}</version> |
2161 | ++ </dependency> |
2162 | ++ |
2163 | ++ <dependency> |
2164 | ++ <groupId>org.junit.platform</groupId> |
2165 | ++ <artifactId>junit-platform-suite-api</artifactId> |
2166 | ++ <version>${platform.version}</version> |
2167 | ++ <scope>test</scope> |
2168 | ++ </dependency> |
2169 | ++ <dependency> |
2170 | ++ <groupId>org.junit.platform</groupId> |
2171 | ++ <artifactId>junit-platform-testkit</artifactId> |
2172 | ++ <version>${platform.version}</version> |
2173 | ++ <scope>test</scope> |
2174 | ++ </dependency> |
2175 | ++ <dependency> |
2176 | ++ <groupId>org.mockito</groupId> |
2177 | ++ <artifactId>mockito-junit-jupiter</artifactId> |
2178 | ++ <version>4.1.0</version> |
2179 | ++ <scope>test</scope> |
2180 | ++ </dependency> |
2181 | ++ </dependencies> |
2182 | ++</project> |
2183 | +--- /dev/null |
2184 | ++++ b/junit5/junit-jupiter-migrationsupport/pom.xml |
2185 | +@@ -0,0 +1,28 @@ |
2186 | ++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
2187 | ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
2188 | ++ <modelVersion>4.0.0</modelVersion> |
2189 | ++ <parent> |
2190 | ++ <groupId>org.junit</groupId> |
2191 | ++ <artifactId>junit-parent</artifactId> |
2192 | ++ <version>5.9.2</version> |
2193 | ++ <relativePath>../pom.xml</relativePath> |
2194 | ++ </parent> |
2195 | ++ <groupId>org.junit.jupiter</groupId> |
2196 | ++ <artifactId>junit-jupiter-migrationsupport</artifactId> |
2197 | ++ <version>5.9.2</version> |
2198 | ++ <name>JUnit Jupiter Migration Support</name> |
2199 | ++ <description>Module "junit-jupiter-migrationsupport" of JUnit 5.</description> |
2200 | ++ |
2201 | ++ <dependencies> |
2202 | ++ <dependency> |
2203 | ++ <groupId>junit</groupId> |
2204 | ++ <artifactId>junit</artifactId> |
2205 | ++ <version>4.x</version> |
2206 | ++ </dependency> |
2207 | ++ <dependency> |
2208 | ++ <groupId>org.junit.jupiter</groupId> |
2209 | ++ <artifactId>junit-jupiter-api</artifactId> |
2210 | ++ <version>${project.version}</version> |
2211 | ++ </dependency> |
2212 | ++ </dependencies> |
2213 | ++</project> |
2214 | +--- /dev/null |
2215 | ++++ b/junit5/junit-jupiter-params/pom.xml |
2216 | +@@ -0,0 +1,60 @@ |
2217 | ++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
2218 | ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
2219 | ++ <modelVersion>4.0.0</modelVersion> |
2220 | ++ <parent> |
2221 | ++ <groupId>org.junit</groupId> |
2222 | ++ <artifactId>junit-parent</artifactId> |
2223 | ++ <version>5.9.2</version> |
2224 | ++ <relativePath>../pom.xml</relativePath> |
2225 | ++ </parent> |
2226 | ++ <groupId>org.junit.jupiter</groupId> |
2227 | ++ <artifactId>junit-jupiter-params</artifactId> |
2228 | ++ <version>5.9.2</version> |
2229 | ++ <name>JUnit Jupiter Params</name> |
2230 | ++ <description>Module "junit-jupiter-params" of JUnit 5.</description> |
2231 | ++ |
2232 | ++ <dependencies> |
2233 | ++ <dependency> |
2234 | ++ <groupId>org.junit.jupiter</groupId> |
2235 | ++ <artifactId>junit-jupiter-api</artifactId> |
2236 | ++ <version>${project.version}</version> |
2237 | ++ </dependency> |
2238 | ++ |
2239 | ++ <dependency> |
2240 | ++ <groupId>com.univocity</groupId> |
2241 | ++ <artifactId>univocity-parsers</artifactId> |
2242 | ++ <version>2.9.1</version> |
2243 | ++ </dependency> |
2244 | ++ </dependencies> |
2245 | ++ |
2246 | ++ <build> |
2247 | ++ <plugins> |
2248 | ++ <plugin> |
2249 | ++ <groupId>org.apache.maven.plugins</groupId> |
2250 | ++ <artifactId>maven-shade-plugin</artifactId> |
2251 | ++ <version>3.3.0</version> |
2252 | ++ <executions> |
2253 | ++ <execution> |
2254 | ++ <phase>package</phase> |
2255 | ++ <goals> |
2256 | ++ <goal>shade</goal> |
2257 | ++ </goals> |
2258 | ++ <configuration> |
2259 | ++ <artifactSet> |
2260 | ++ <includes> |
2261 | ++ <include>com.univocity:univocity-parsers</include> |
2262 | ++ </includes> |
2263 | ++ </artifactSet> |
2264 | ++ <relocations> |
2265 | ++ <relocation> |
2266 | ++ <pattern>com.univocity</pattern> |
2267 | ++ <shadedPattern>org.junit.jupiter.params.shadow.com.univocity</shadedPattern> |
2268 | ++ </relocation> |
2269 | ++ </relocations> |
2270 | ++ </configuration> |
2271 | ++ </execution> |
2272 | ++ </executions> |
2273 | ++ </plugin> |
2274 | ++ </plugins> |
2275 | ++ </build> |
2276 | ++</project> |
2277 | +--- /dev/null |
2278 | ++++ b/junit5/junit-jupiter/pom.xml |
2279 | +@@ -0,0 +1,35 @@ |
2280 | ++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
2281 | ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
2282 | ++ <modelVersion>4.0.0</modelVersion> |
2283 | ++ <parent> |
2284 | ++ <groupId>org.junit</groupId> |
2285 | ++ <artifactId>junit-parent</artifactId> |
2286 | ++ <version>5.9.2</version> |
2287 | ++ <relativePath>../pom.xml</relativePath> |
2288 | ++ </parent> |
2289 | ++ <groupId>org.junit.jupiter</groupId> |
2290 | ++ <artifactId>junit-jupiter</artifactId> |
2291 | ++ <version>5.9.2</version> |
2292 | ++ <name>JUnit Jupiter (Aggregator)</name> |
2293 | ++ <description>Module "junit-jupiter" of JUnit 5.</description> |
2294 | ++ |
2295 | ++ <dependencies> |
2296 | ++ <dependency> |
2297 | ++ <groupId>org.junit.jupiter</groupId> |
2298 | ++ <artifactId>junit-jupiter-api</artifactId> |
2299 | ++ <version>${project.version}</version> |
2300 | ++ </dependency> |
2301 | ++ <dependency> |
2302 | ++ <groupId>org.junit.jupiter</groupId> |
2303 | ++ <artifactId>junit-jupiter-params</artifactId> |
2304 | ++ <version>${project.version}</version> |
2305 | ++ </dependency> |
2306 | ++ <dependency> |
2307 | ++ <groupId>org.junit.jupiter</groupId> |
2308 | ++ <artifactId>junit-jupiter-engine</artifactId> |
2309 | ++ <version>${project.version}</version> |
2310 | ++ <scope>runtime</scope> |
2311 | ++ </dependency> |
2312 | ++ </dependencies> |
2313 | ++ |
2314 | ++</project> |
2315 | +--- /dev/null |
2316 | ++++ b/junit5/junit-platform-commons/pom.xml |
2317 | +@@ -0,0 +1,16 @@ |
2318 | ++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
2319 | ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
2320 | ++ <modelVersion>4.0.0</modelVersion> |
2321 | ++ <parent> |
2322 | ++ <groupId>org.junit</groupId> |
2323 | ++ <artifactId>junit-parent</artifactId> |
2324 | ++ <version>5.9.2</version> |
2325 | ++ <relativePath>../pom.xml</relativePath> |
2326 | ++ </parent> |
2327 | ++ <groupId>org.junit.platform</groupId> |
2328 | ++ <artifactId>junit-platform-commons</artifactId> |
2329 | ++ <version>1.9.1</version> |
2330 | ++ <name>JUnit Platform Commons</name> |
2331 | ++ <description>Module "junit-platform-commons" of JUnit 5.</description> |
2332 | ++ |
2333 | ++</project> |
2334 | +--- /dev/null |
2335 | ++++ b/junit5/junit-platform-console-standalone/pom.xml |
2336 | +@@ -0,0 +1,106 @@ |
2337 | ++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
2338 | ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
2339 | ++ <modelVersion>4.0.0</modelVersion> |
2340 | ++ <parent> |
2341 | ++ <groupId>org.junit</groupId> |
2342 | ++ <artifactId>junit-parent</artifactId> |
2343 | ++ <version>5.9.2</version> |
2344 | ++ <relativePath>../pom.xml</relativePath> |
2345 | ++ </parent> |
2346 | ++ <groupId>org.junit.platform</groupId> |
2347 | ++ <artifactId>junit-platform-console-standalone</artifactId> |
2348 | ++ <version>1.9.1</version> |
2349 | ++ <name>JUnit Platform Console Standalone</name> |
2350 | ++ <description>Module "junit-platform-console-standalone" of JUnit 5.</description> |
2351 | ++ |
2352 | ++ <dependencies> |
2353 | ++ <dependency> |
2354 | ++ <groupId>org.junit.platform</groupId> |
2355 | ++ <artifactId>junit-platform-console</artifactId> |
2356 | ++ <version>${project.version}</version> |
2357 | ++ </dependency> |
2358 | ++ <dependency> |
2359 | ++ <groupId>org.junit.platform</groupId> |
2360 | ++ <artifactId>junit-platform-reporting</artifactId> |
2361 | ++ <version>${project.version}</version> |
2362 | ++ </dependency> |
2363 | ++ <dependency> |
2364 | ++ <groupId>org.junit.platform</groupId> |
2365 | ++ <artifactId>junit-platform-suite</artifactId> |
2366 | ++ <version>${project.version}</version> |
2367 | ++ </dependency> |
2368 | ++ <dependency> |
2369 | ++ <groupId>org.junit.jupiter</groupId> |
2370 | ++ <artifactId>junit-jupiter-engine</artifactId> |
2371 | ++ <version>${parent.version}</version> |
2372 | ++ </dependency> |
2373 | ++ <dependency> |
2374 | ++ <groupId>org.junit.jupiter</groupId> |
2375 | ++ <artifactId>junit-jupiter-params</artifactId> |
2376 | ++ <version>${parent.version}</version> |
2377 | ++ </dependency> |
2378 | ++ <dependency> |
2379 | ++ <groupId>org.junit.vintage</groupId> |
2380 | ++ <artifactId>junit-vintage-engine</artifactId> |
2381 | ++ <version>${parent.version}</version> |
2382 | ++ </dependency> |
2383 | ++ </dependencies> |
2384 | ++ |
2385 | ++ <build> |
2386 | ++ <plugins> |
2387 | ++ <plugin> |
2388 | ++ <groupId>org.apache.maven.plugins</groupId> |
2389 | ++ <artifactId>maven-jar-plugin</artifactId> |
2390 | ++ <version>3.3.0</version> |
2391 | ++ <configuration> |
2392 | ++ <archive> |
2393 | ++ <manifest> |
2394 | ++ <mainClass>org.junit.platform.console.ConsoleLauncher</mainClass> |
2395 | ++ </manifest> |
2396 | ++ </archive> |
2397 | ++ </configuration> |
2398 | ++ </plugin> |
2399 | ++ <plugin> |
2400 | ++ <groupId>org.apache.maven.plugins</groupId> |
2401 | ++ <artifactId>maven-shade-plugin</artifactId> |
2402 | ++ <version>3.3.0</version> |
2403 | ++ <executions> |
2404 | ++ <execution> |
2405 | ++ <phase>package</phase> |
2406 | ++ <goals> |
2407 | ++ <goal>shade</goal> |
2408 | ++ </goals> |
2409 | ++ <configuration> |
2410 | ++ <artifactSet> |
2411 | ++ <includes> |
2412 | ++ <include>*:*</include> |
2413 | ++ </includes> |
2414 | ++ <excludes> |
2415 | ++ <exclude>com.univocity:univocity-parsers</exclude> |
2416 | ++ <exclude>info.picocli:picocli</exclude> |
2417 | ++ <exclude>org.opentest4j.reporting:open-test-reporting-events</exclude> |
2418 | ++ </excludes> |
2419 | ++ </artifactSet> |
2420 | ++ <filters> |
2421 | ++ <filter> |
2422 | ++ <artifact>*:*</artifact> |
2423 | ++ <excludes> |
2424 | ++ <exclude>**/module-info.class</exclude> |
2425 | ++ <exclude>**/package-info.class</exclude> |
2426 | ++ <exclude>META-INF/LICENSE-open-test-reporting.md</exclude> |
2427 | ++ <exclude>META-INF/maven/**</exclude> |
2428 | ++ <exclude>org/opentest4j/reporting/schema/*</exclude> |
2429 | ++ </excludes> |
2430 | ++ </filter> |
2431 | ++ </filters> |
2432 | ++ <transformers> |
2433 | ++ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> |
2434 | ++ </transformers> |
2435 | ++ </configuration> |
2436 | ++ </execution> |
2437 | ++ </executions> |
2438 | ++ </plugin> |
2439 | ++ </plugins> |
2440 | ++ </build> |
2441 | ++ |
2442 | ++</project> |
2443 | +--- /dev/null |
2444 | ++++ b/junit5/junit-platform-console/pom.xml |
2445 | +@@ -0,0 +1,71 @@ |
2446 | ++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
2447 | ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
2448 | ++ <modelVersion>4.0.0</modelVersion> |
2449 | ++ <parent> |
2450 | ++ <groupId>org.junit</groupId> |
2451 | ++ <artifactId>junit-parent</artifactId> |
2452 | ++ <version>5.9.2</version> |
2453 | ++ <relativePath>../pom.xml</relativePath> |
2454 | ++ </parent> |
2455 | ++ <groupId>org.junit.platform</groupId> |
2456 | ++ <artifactId>junit-platform-console</artifactId> |
2457 | ++ <version>1.9.1</version> |
2458 | ++ <name>JUnit Platform Console</name> |
2459 | ++ <description>Module "junit-platform-console" of JUnit 5.</description> |
2460 | ++ |
2461 | ++ <dependencies> |
2462 | ++ <dependency> |
2463 | ++ <groupId>org.junit.platform</groupId> |
2464 | ++ <artifactId>junit-platform-reporting</artifactId> |
2465 | ++ <version>${project.version}</version> |
2466 | ++ </dependency> |
2467 | ++ <dependency> |
2468 | ++ <groupId>info.picocli</groupId> |
2469 | ++ <artifactId>picocli</artifactId> |
2470 | ++ <version>4.6.2</version> |
2471 | ++ </dependency> |
2472 | ++ </dependencies> |
2473 | ++ |
2474 | ++ <build> |
2475 | ++ <plugins> |
2476 | ++ <plugin> |
2477 | ++ <groupId>org.apache.maven.plugins</groupId> |
2478 | ++ <artifactId>maven-jar-plugin</artifactId> |
2479 | ++ <version>3.3.0</version> |
2480 | ++ <configuration> |
2481 | ++ <archive> |
2482 | ++ <manifest> |
2483 | ++ <mainClass>org.junit.platform.console.ConsoleLauncher</mainClass> |
2484 | ++ </manifest> |
2485 | ++ </archive> |
2486 | ++ </configuration> |
2487 | ++ </plugin> |
2488 | ++ <plugin> |
2489 | ++ <groupId>org.apache.maven.plugins</groupId> |
2490 | ++ <artifactId>maven-shade-plugin</artifactId> |
2491 | ++ <version>3.3.0</version> |
2492 | ++ <executions> |
2493 | ++ <execution> |
2494 | ++ <phase>package</phase> |
2495 | ++ <goals> |
2496 | ++ <goal>shade</goal> |
2497 | ++ </goals> |
2498 | ++ <configuration> |
2499 | ++ <artifactSet> |
2500 | ++ <includes> |
2501 | ++ <include>info.picocli:picocli</include> |
2502 | ++ </includes> |
2503 | ++ </artifactSet> |
2504 | ++ <relocations> |
2505 | ++ <relocation> |
2506 | ++ <pattern>picocli</pattern> |
2507 | ++ <shadedPattern>org.junit.platform.console.shadow.picocli</shadedPattern> |
2508 | ++ </relocation> |
2509 | ++ </relocations> |
2510 | ++ </configuration> |
2511 | ++ </execution> |
2512 | ++ </executions> |
2513 | ++ </plugin> |
2514 | ++ </plugins> |
2515 | ++ </build> |
2516 | ++</project> |
2517 | +--- /dev/null |
2518 | ++++ b/junit5/junit-platform-engine/pom.xml |
2519 | +@@ -0,0 +1,28 @@ |
2520 | ++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
2521 | ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
2522 | ++ <modelVersion>4.0.0</modelVersion> |
2523 | ++ <parent> |
2524 | ++ <groupId>org.junit</groupId> |
2525 | ++ <artifactId>junit-parent</artifactId> |
2526 | ++ <version>5.9.2</version> |
2527 | ++ <relativePath>../pom.xml</relativePath> |
2528 | ++ </parent> |
2529 | ++ <groupId>org.junit.platform</groupId> |
2530 | ++ <artifactId>junit-platform-engine</artifactId> |
2531 | ++ <version>1.9.1</version> |
2532 | ++ <name>JUnit Platform Engine API</name> |
2533 | ++ <description>Module "junit-platform-engine" of JUnit 5.</description> |
2534 | ++ |
2535 | ++ <dependencies> |
2536 | ++ <dependency> |
2537 | ++ <groupId>org.opentest4j</groupId> |
2538 | ++ <artifactId>opentest4j</artifactId> |
2539 | ++ <version>1.2.0</version> |
2540 | ++ </dependency> |
2541 | ++ <dependency> |
2542 | ++ <groupId>org.junit.platform</groupId> |
2543 | ++ <artifactId>junit-platform-commons</artifactId> |
2544 | ++ <version>${project.version}</version> |
2545 | ++ </dependency> |
2546 | ++ </dependencies> |
2547 | ++</project> |
2548 | +--- /dev/null |
2549 | ++++ b/junit5/junit-platform-launcher/pom.xml |
2550 | +@@ -0,0 +1,23 @@ |
2551 | ++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
2552 | ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
2553 | ++ <modelVersion>4.0.0</modelVersion> |
2554 | ++ <parent> |
2555 | ++ <groupId>org.junit</groupId> |
2556 | ++ <artifactId>junit-parent</artifactId> |
2557 | ++ <version>5.9.2</version> |
2558 | ++ <relativePath>../pom.xml</relativePath> |
2559 | ++ </parent> |
2560 | ++ <groupId>org.junit.platform</groupId> |
2561 | ++ <artifactId>junit-platform-launcher</artifactId> |
2562 | ++ <version>1.9.1</version> |
2563 | ++ <name>JUnit Platform Launcher</name> |
2564 | ++ <description>Module "junit-platform-launcher" of JUnit 5.</description> |
2565 | ++ |
2566 | ++ <dependencies> |
2567 | ++ <dependency> |
2568 | ++ <groupId>org.junit.platform</groupId> |
2569 | ++ <artifactId>junit-platform-engine</artifactId> |
2570 | ++ <version>${project.version}</version> |
2571 | ++ </dependency> |
2572 | ++ </dependencies> |
2573 | ++</project> |
2574 | +--- /dev/null |
2575 | ++++ b/junit5/junit-platform-reporting/pom.xml |
2576 | +@@ -0,0 +1,60 @@ |
2577 | ++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
2578 | ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
2579 | ++ <modelVersion>4.0.0</modelVersion> |
2580 | ++ <parent> |
2581 | ++ <groupId>org.junit</groupId> |
2582 | ++ <artifactId>junit-parent</artifactId> |
2583 | ++ <version>5.9.2</version> |
2584 | ++ <relativePath>../pom.xml</relativePath> |
2585 | ++ </parent> |
2586 | ++ <groupId>org.junit.platform</groupId> |
2587 | ++ <artifactId>junit-platform-reporting</artifactId> |
2588 | ++ <version>1.9.1</version> |
2589 | ++ <name>JUnit Platform Reporting</name> |
2590 | ++ <description>Module "junit-platform-reporting" of JUnit 5.</description> |
2591 | ++ |
2592 | ++ <dependencies> |
2593 | ++ <dependency> |
2594 | ++ <groupId>org.junit.platform</groupId> |
2595 | ++ <artifactId>junit-platform-launcher</artifactId> |
2596 | ++ <version>${project.version}</version> |
2597 | ++ </dependency> |
2598 | ++ <dependency> |
2599 | ++ <groupId>org.opentest4j.reporting</groupId> |
2600 | ++ <artifactId>open-test-reporting-events</artifactId> |
2601 | ++ <version>0.1.0-M1</version> |
2602 | ++ </dependency> |
2603 | ++ </dependencies> |
2604 | ++ |
2605 | ++ <build> |
2606 | ++ <plugins> |
2607 | ++ <plugin> |
2608 | ++ <groupId>org.apache.maven.plugins</groupId> |
2609 | ++ <artifactId>maven-shade-plugin</artifactId> |
2610 | ++ <version>3.3.0</version> |
2611 | ++ <executions> |
2612 | ++ <execution> |
2613 | ++ <phase>package</phase> |
2614 | ++ <goals> |
2615 | ++ <goal>shade</goal> |
2616 | ++ </goals> |
2617 | ++ <configuration> |
2618 | ++ <artifactSet> |
2619 | ++ <includes> |
2620 | ++ <include>org.opentest4j.reporting:open-test-reporting-events</include> |
2621 | ++ </includes> |
2622 | ++ </artifactSet> |
2623 | ++ <relocations> |
2624 | ++ <relocation> |
2625 | ++ <pattern>org.opentest4j.reporting</pattern> |
2626 | ++ <shadedPattern>org.junit.platform.reporting.shadow.org.opentest4j.reporting</shadedPattern> |
2627 | ++ </relocation> |
2628 | ++ </relocations> |
2629 | ++ </configuration> |
2630 | ++ </execution> |
2631 | ++ </executions> |
2632 | ++ </plugin> |
2633 | ++ </plugins> |
2634 | ++ </build> |
2635 | ++ |
2636 | ++</project> |
2637 | +--- /dev/null |
2638 | ++++ b/junit5/junit-platform-runner/pom.xml |
2639 | +@@ -0,0 +1,39 @@ |
2640 | ++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
2641 | ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
2642 | ++ <modelVersion>4.0.0</modelVersion> |
2643 | ++ <parent> |
2644 | ++ <groupId>org.junit</groupId> |
2645 | ++ <artifactId>junit-parent</artifactId> |
2646 | ++ <version>5.9.2</version> |
2647 | ++ <relativePath>../pom.xml</relativePath> |
2648 | ++ </parent> |
2649 | ++ <groupId>org.junit.platform</groupId> |
2650 | ++ <artifactId>junit-platform-runner</artifactId> |
2651 | ++ <version>1.9.1</version> |
2652 | ++ <name>JUnit Platform Runner</name> |
2653 | ++ <description>Module "junit-platform-runner" of JUnit 5.</description> |
2654 | ++ |
2655 | ++ <dependencies> |
2656 | ++ <dependency> |
2657 | ++ <groupId>junit</groupId> |
2658 | ++ <artifactId>junit</artifactId> |
2659 | ++ <version>4.13.2</version> |
2660 | ++ </dependency> |
2661 | ++ <dependency> |
2662 | ++ <groupId>org.junit.platform</groupId> |
2663 | ++ <artifactId>junit-platform-launcher</artifactId> |
2664 | ++ <version>${project.version}</version> |
2665 | ++ </dependency> |
2666 | ++ <dependency> |
2667 | ++ <groupId>org.junit.platform</groupId> |
2668 | ++ <artifactId>junit-platform-suite-api</artifactId> |
2669 | ++ <version>${project.version}</version> |
2670 | ++ </dependency> |
2671 | ++ <dependency> |
2672 | ++ <groupId>org.junit.platform</groupId> |
2673 | ++ <artifactId>junit-platform-suite-commons</artifactId> |
2674 | ++ <version>${project.version}</version> |
2675 | ++ </dependency> |
2676 | ++ </dependencies> |
2677 | ++ |
2678 | ++</project> |
2679 | +--- /dev/null |
2680 | ++++ b/junit5/junit-platform-suite-api/pom.xml |
2681 | +@@ -0,0 +1,24 @@ |
2682 | ++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
2683 | ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
2684 | ++ <modelVersion>4.0.0</modelVersion> |
2685 | ++ <parent> |
2686 | ++ <groupId>org.junit</groupId> |
2687 | ++ <artifactId>junit-parent</artifactId> |
2688 | ++ <version>5.9.2</version> |
2689 | ++ <relativePath>../pom.xml</relativePath> |
2690 | ++ </parent> |
2691 | ++ <groupId>org.junit.platform</groupId> |
2692 | ++ <artifactId>junit-platform-suite-api</artifactId> |
2693 | ++ <version>1.9.1</version> |
2694 | ++ <name>JUnit Platform Suite API</name> |
2695 | ++ <description>Module "junit-platform-suite-api" of JUnit 5.</description> |
2696 | ++ |
2697 | ++ <dependencies> |
2698 | ++ <dependency> |
2699 | ++ <groupId>org.junit.platform</groupId> |
2700 | ++ <artifactId>junit-platform-commons</artifactId> |
2701 | ++ <version>${project.version}</version> |
2702 | ++ </dependency> |
2703 | ++ </dependencies> |
2704 | ++ |
2705 | ++</project> |
2706 | +--- /dev/null |
2707 | ++++ b/junit5/junit-platform-suite-commons/pom.xml |
2708 | +@@ -0,0 +1,34 @@ |
2709 | ++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
2710 | ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
2711 | ++ <modelVersion>4.0.0</modelVersion> |
2712 | ++ <parent> |
2713 | ++ <groupId>org.junit</groupId> |
2714 | ++ <artifactId>junit-parent</artifactId> |
2715 | ++ <version>5.9.2</version> |
2716 | ++ <relativePath>../pom.xml</relativePath> |
2717 | ++ </parent> |
2718 | ++ <groupId>org.junit.platform</groupId> |
2719 | ++ <artifactId>junit-platform-suite-commons</artifactId> |
2720 | ++ <version>1.9.1</version> |
2721 | ++ <name>JUnit Platform Suite Commons</name> |
2722 | ++ <description>Module "junit-platform-suite-commons" of JUnit 5.</description> |
2723 | ++ |
2724 | ++ <dependencies> |
2725 | ++ <dependency> |
2726 | ++ <groupId>org.junit.platform</groupId> |
2727 | ++ <artifactId>junit-platform-launcher</artifactId> |
2728 | ++ <version>${project.version}</version> |
2729 | ++ </dependency> |
2730 | ++ <dependency> |
2731 | ++ <groupId>org.junit.platform</groupId> |
2732 | ++ <artifactId>junit-platform-engine</artifactId> |
2733 | ++ <version>${project.version}</version> |
2734 | ++ </dependency> |
2735 | ++ <dependency> |
2736 | ++ <groupId>org.junit.platform</groupId> |
2737 | ++ <artifactId>junit-platform-suite-api</artifactId> |
2738 | ++ <version>${project.version}</version> |
2739 | ++ </dependency> |
2740 | ++ </dependencies> |
2741 | ++ |
2742 | ++</project> |
2743 | +--- /dev/null |
2744 | ++++ b/junit5/junit-platform-suite-engine/pom.xml |
2745 | +@@ -0,0 +1,34 @@ |
2746 | ++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
2747 | ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
2748 | ++ <modelVersion>4.0.0</modelVersion> |
2749 | ++ <parent> |
2750 | ++ <groupId>org.junit</groupId> |
2751 | ++ <artifactId>junit-parent</artifactId> |
2752 | ++ <version>5.9.2</version> |
2753 | ++ <relativePath>../pom.xml</relativePath> |
2754 | ++ </parent> |
2755 | ++ <groupId>org.junit.platform</groupId> |
2756 | ++ <artifactId>junit-platform-suite-engine</artifactId> |
2757 | ++ <version>1.9.1</version> |
2758 | ++ <name>JUnit Platform Suite Engine</name> |
2759 | ++ <description>Module "junit-platform-suite-engine" of JUnit 5.</description> |
2760 | ++ |
2761 | ++ <dependencies> |
2762 | ++ <dependency> |
2763 | ++ <groupId>org.junit.platform</groupId> |
2764 | ++ <artifactId>junit-platform-engine</artifactId> |
2765 | ++ <version>${project.version}</version> |
2766 | ++ </dependency> |
2767 | ++ <dependency> |
2768 | ++ <groupId>org.junit.platform</groupId> |
2769 | ++ <artifactId>junit-platform-suite-api</artifactId> |
2770 | ++ <version>${project.version}</version> |
2771 | ++ </dependency> |
2772 | ++ <dependency> |
2773 | ++ <groupId>org.junit.platform</groupId> |
2774 | ++ <artifactId>junit-platform-suite-commons</artifactId> |
2775 | ++ <version>${project.version}</version> |
2776 | ++ </dependency> |
2777 | ++ </dependencies> |
2778 | ++ |
2779 | ++</project> |
2780 | +--- /dev/null |
2781 | ++++ b/junit5/junit-platform-suite/pom.xml |
2782 | +@@ -0,0 +1,29 @@ |
2783 | ++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
2784 | ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
2785 | ++ <modelVersion>4.0.0</modelVersion> |
2786 | ++ <parent> |
2787 | ++ <groupId>org.junit</groupId> |
2788 | ++ <artifactId>junit-parent</artifactId> |
2789 | ++ <version>5.9.2</version> |
2790 | ++ <relativePath>../pom.xml</relativePath> |
2791 | ++ </parent> |
2792 | ++ <groupId>org.junit.platform</groupId> |
2793 | ++ <artifactId>junit-platform-suite</artifactId> |
2794 | ++ <version>1.9.1</version> |
2795 | ++ <name>JUnit Platform Suite (Aggregator)</name> |
2796 | ++ <description>Module "junit-platform-suite" of JUnit 5.</description> |
2797 | ++ |
2798 | ++ <dependencies> |
2799 | ++ <dependency> |
2800 | ++ <groupId>org.junit.platform</groupId> |
2801 | ++ <artifactId>junit-platform-suite-api</artifactId> |
2802 | ++ <version>${project.version}</version> |
2803 | ++ </dependency> |
2804 | ++ <dependency> |
2805 | ++ <groupId>org.junit.platform</groupId> |
2806 | ++ <artifactId>junit-platform-suite-engine</artifactId> |
2807 | ++ <version>${project.version}</version> |
2808 | ++ </dependency> |
2809 | ++ </dependencies> |
2810 | ++ |
2811 | ++</project> |
2812 | +--- /dev/null |
2813 | ++++ b/junit5/junit-vintage-engine/pom.xml |
2814 | +@@ -0,0 +1,29 @@ |
2815 | ++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
2816 | ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
2817 | ++ <modelVersion>4.0.0</modelVersion> |
2818 | ++ <parent> |
2819 | ++ <groupId>org.junit</groupId> |
2820 | ++ <artifactId>junit-parent</artifactId> |
2821 | ++ <version>5.9.2</version> |
2822 | ++ <relativePath>../pom.xml</relativePath> |
2823 | ++ </parent> |
2824 | ++ <groupId>org.junit.vintage</groupId> |
2825 | ++ <artifactId>junit-vintage-engine</artifactId> |
2826 | ++ <version>5.9.2</version> |
2827 | ++ <name>JUnit Vintage Engine</name> |
2828 | ++ <description>Module "junit-vintage-engine" of JUnit 5.</description> |
2829 | ++ |
2830 | ++ <dependencies> |
2831 | ++ <dependency> |
2832 | ++ <groupId>org.junit.platform</groupId> |
2833 | ++ <artifactId>junit-platform-engine</artifactId> |
2834 | ++ <version>${platform.version}</version> |
2835 | ++ </dependency> |
2836 | ++ <dependency> |
2837 | ++ <groupId>junit</groupId> |
2838 | ++ <artifactId>junit</artifactId> |
2839 | ++ <version>4.13.2</version> |
2840 | ++ </dependency> |
2841 | ++ </dependencies> |
2842 | ++ |
2843 | ++</project> |
2844 | +--- /dev/null |
2845 | ++++ b/junit5/pom.xml |
2846 | +@@ -0,0 +1,218 @@ |
2847 | ++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
2848 | ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
2849 | ++ <modelVersion>4.0.0</modelVersion> |
2850 | ++ <groupId>org.junit</groupId> |
2851 | ++ <artifactId>junit-parent</artifactId> |
2852 | ++ <version>5.9.2</version> |
2853 | ++ <packaging>pom</packaging> |
2854 | ++ <name>JUnit 5 (Parent)</name> |
2855 | ++ |
2856 | ++ <url>https://junit.org/junit5/</url> |
2857 | ++ |
2858 | ++ <licenses> |
2859 | ++ <license> |
2860 | ++ <name>Eclipse Public License v2.0</name> |
2861 | ++ <url>https://www.eclipse.org/legal/epl-v20.html</url> |
2862 | ++ </license> |
2863 | ++ </licenses> |
2864 | ++ |
2865 | ++ <developers> |
2866 | ++ <developer> |
2867 | ++ <id>bechte</id> |
2868 | ++ <name>Stefan Bechtold</name> |
2869 | ++ <email>stefan.bechtold@me.com</email> |
2870 | ++ </developer> |
2871 | ++ <developer> |
2872 | ++ <id>jlink</id> |
2873 | ++ <name>Johannes Link</name> |
2874 | ++ <email>business@johanneslink.net</email> |
2875 | ++ </developer> |
2876 | ++ <developer> |
2877 | ++ <id>marcphilipp</id> |
2878 | ++ <name>Marc Philipp</name> |
2879 | ++ <email>mail@marcphilipp.de</email> |
2880 | ++ </developer> |
2881 | ++ <developer> |
2882 | ++ <id>mmerdes</id> |
2883 | ++ <name>Matthias Merdes</name> |
2884 | ++ <email>matthias.merdes@heidelpay.com</email> |
2885 | ++ </developer> |
2886 | ++ <developer> |
2887 | ++ <id>sbrannen</id> |
2888 | ++ <name>Sam Brannen</name> |
2889 | ++ <email>sam@sambrannen.com</email> |
2890 | ++ </developer> |
2891 | ++ <developer> |
2892 | ++ <id>sormuras</id> |
2893 | ++ <name>Christian Stein</name> |
2894 | ++ <email>sormuras@gmail.com</email> |
2895 | ++ </developer> |
2896 | ++ <developer> |
2897 | ++ <id>juliette-derancourt</id> |
2898 | ++ <name>Juliette de Rancourt</name> |
2899 | ++ <email>derancourt.juliette@gmail.com</email> |
2900 | ++ </developer> |
2901 | ++ </developers> |
2902 | ++ |
2903 | ++ <scm> |
2904 | ++ <connection>scm:git:git://github.com/junit-team/junit5.git</connection> |
2905 | ++ <developerConnection>scm:git:git://github.com/junit-team/junit5.git</developerConnection> |
2906 | ++ <url>https://github.com/junit-team/junit5</url> |
2907 | ++ </scm> |
2908 | ++ |
2909 | ++ <properties> |
2910 | ++ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
2911 | ++ <platform.version>1.9.1</platform.version> |
2912 | ++ </properties> |
2913 | ++ |
2914 | ++ <modules> |
2915 | ++ <module>junit-bom</module> |
2916 | ++ <module>junit-jupiter</module> |
2917 | ++ <module>junit-jupiter-api</module> |
2918 | ++ <module>junit-jupiter-engine</module> |
2919 | ++ <module>junit-jupiter-migrationsupport</module> |
2920 | ++ <module>junit-jupiter-params</module> |
2921 | ++ <module>junit-platform-commons</module> |
2922 | ++ <module>junit-platform-console</module> |
2923 | ++ <module>junit-platform-console-standalone</module> |
2924 | ++ <module>junit-platform-engine</module> |
2925 | ++ <module>junit-platform-launcher</module> |
2926 | ++ <module>junit-platform-reporting</module> |
2927 | ++ <module>junit-platform-runner</module> |
2928 | ++ <module>junit-platform-suite</module> |
2929 | ++ <module>junit-platform-suite-api</module> |
2930 | ++ <module>junit-platform-suite-commons</module> |
2931 | ++ <module>junit-platform-suite-engine</module> |
2932 | ++ <module>junit-vintage-engine</module> |
2933 | ++ </modules> |
2934 | ++ |
2935 | ++ <build> |
2936 | ++ <pluginManagement> |
2937 | ++ <plugins> |
2938 | ++ <plugin> |
2939 | ++ <artifactId>maven-compiler-plugin</artifactId> |
2940 | ++ <version>3.10.1</version> |
2941 | ++ <executions> |
2942 | ++ <execution> |
2943 | ++ <id>default-compile</id> |
2944 | ++ <phase>compile</phase> |
2945 | ++ <goals> |
2946 | ++ <goal>compile</goal> |
2947 | ++ </goals> |
2948 | ++ <configuration> |
2949 | ++ <source>8</source> |
2950 | ++ <target>8</target> |
2951 | ++ </configuration> |
2952 | ++ </execution> |
2953 | ++ <execution> |
2954 | ++ <id>compile-java-9</id> |
2955 | ++ <phase>compile</phase> |
2956 | ++ <goals> |
2957 | ++ <goal>compile</goal> |
2958 | ++ </goals> |
2959 | ++ <configuration> |
2960 | ++ <release>9</release> |
2961 | ++ <compileSourceRoots> |
2962 | ++ <compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot> |
2963 | ++ </compileSourceRoots> |
2964 | ++ <multiReleaseOutput>true</multiReleaseOutput> |
2965 | ++ </configuration> |
2966 | ++ </execution> |
2967 | ++ <!-- |
2968 | ++ <execution> |
2969 | ++ <id>compile-java-17</id> |
2970 | ++ <phase>compile</phase> |
2971 | ++ <goals> |
2972 | ++ <goal>compile</goal> |
2973 | ++ </goals> |
2974 | ++ <configuration> |
2975 | ++ <release>17</release> |
2976 | ++ <compileSourceRoots> |
2977 | ++ <compileSourceRoot>${project.basedir}/src/main/java17</compileSourceRoot> |
2978 | ++ </compileSourceRoots> |
2979 | ++ <multiReleaseOutput>true</multiReleaseOutput> |
2980 | ++ </configuration> |
2981 | ++ </execution> |
2982 | ++ --> |
2983 | ++ <!-- |
2984 | ++ <execution> |
2985 | ++ <id>compile-module-info</id> |
2986 | ++ <phase>compile</phase> |
2987 | ++ <goals> |
2988 | ++ <goal>compile</goal> |
2989 | ++ </goals> |
2990 | ++ <configuration> |
2991 | ++ <release>9</release> |
2992 | ++ <compileSourceRoots> |
2993 | ++ <compileSourceRoot>${project.basedir}/src/module</compileSourceRoot> |
2994 | ++ </compileSourceRoots> |
2995 | ++ </configuration> |
2996 | ++ </execution> |
2997 | ++ --> |
2998 | ++ </executions> |
2999 | ++ <configuration> |
3000 | ++ <testSource>17</testSource> |
3001 | ++ <testTarget>17</testTarget> |
3002 | ++ </configuration> |
3003 | ++ </plugin> |
3004 | ++ <plugin> |
3005 | ++ <groupId>org.apache.maven.plugins</groupId> |
3006 | ++ <artifactId>maven-jar-plugin</artifactId> |
3007 | ++ <version>3.3.0</version> |
3008 | ++ <configuration> |
3009 | ++ <archive> |
3010 | ++ <addMavenDescriptor>false</addMavenDescriptor> |
3011 | ++ <manifestEntries> |
3012 | ++ <Multi-Release>true</Multi-Release> |
3013 | ++ </manifestEntries> |
3014 | ++ </archive> |
3015 | ++ </configuration> |
3016 | ++ </plugin> |
3017 | ++ </plugins> |
3018 | ++ </pluginManagement> |
3019 | ++ |
3020 | ++ <plugins> |
3021 | ++ <plugin> |
3022 | ++ <groupId>org.codehaus.mojo</groupId> |
3023 | ++ <artifactId>build-helper-maven-plugin</artifactId> |
3024 | ++ <version>3.2.0</version> |
3025 | ++ <executions> |
3026 | ++ <execution> |
3027 | ++ <phase>generate-resources</phase> |
3028 | ++ <goals> |
3029 | ++ <goal>add-resource</goal> |
3030 | ++ </goals> |
3031 | ++ <configuration> |
3032 | ++ <resources> |
3033 | ++ <resource> |
3034 | ++ <directory>../</directory> |
3035 | ++ <targetPath>META-INF/</targetPath> |
3036 | ++ <includes> |
3037 | ++ <include>LICENSE.md</include> |
3038 | ++ <include>LICENSE-notice.md</include> |
3039 | ++ </includes> |
3040 | ++ </resource> |
3041 | ++ <resource> |
3042 | ++ <directory>.</directory> |
3043 | ++ <targetPath>META-INF/</targetPath> |
3044 | ++ <includes> |
3045 | ++ <include>LICENSE-*.md</include> |
3046 | ++ </includes> |
3047 | ++ </resource> |
3048 | ++ </resources> |
3049 | ++ </configuration> |
3050 | ++ </execution> |
3051 | ++ </executions> |
3052 | ++ </plugin> |
3053 | ++ </plugins> |
3054 | ++ </build> |
3055 | ++ |
3056 | ++ <dependencies> |
3057 | ++ <dependency> |
3058 | ++ <groupId>org.apiguardian</groupId> |
3059 | ++ <artifactId>apiguardian-api</artifactId> |
3060 | ++ <version>1.1.2</version> |
3061 | ++ </dependency> |
3062 | ++ </dependencies> |
3063 | ++ |
3064 | ++</project> |
3065 | diff --git a/debian/patches/junit5-17-backward-compatibility.patch b/debian/patches/junit5-17-backward-compatibility.patch |
3066 | new file mode 100644 |
3067 | index 0000000..0053beb |
3068 | --- /dev/null |
3069 | +++ b/debian/patches/junit5-17-backward-compatibility.patch |
3070 | @@ -0,0 +1,49 @@ |
3071 | +Description: Restores the compatibility with the previous versions |
3072 | +Author: Emmanuel Bourg <ebourg@apache.org> |
3073 | +Forwarded: not-needed |
3074 | +--- a/junit5/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java |
3075 | ++++ b/junit5/unit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java |
3076 | +@@ -109,7 +109,6 @@ |
3077 | + * the {@code junit-platform-suite-engine} module; to be removed in JUnit Platform 2.0 |
3078 | + */ |
3079 | + @API(status = DEPRECATED, since = "1.8") |
3080 | +-@Deprecated |
3081 | + public class JUnitPlatform extends Runner implements Filterable { |
3082 | + |
3083 | + // @formatter:off |
3084 | +--- a/junit5/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java |
3085 | ++++ b/junit5/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java |
3086 | +@@ -96,6 +96,33 @@ |
3087 | + return testPlan; |
3088 | + } |
3089 | + |
3090 | ++ @API(status = INTERNAL, since = "1.0") |
3091 | ++ public static TestPlan from(Collection<TestDescriptor> engineDescriptors) { |
3092 | ++ return from(engineDescriptors, new ConfigurationParameters() { |
3093 | ++ @Override |
3094 | ++ public Optional<String> get(String key) { |
3095 | ++ return Optional.empty(); |
3096 | ++ } |
3097 | ++ |
3098 | ++ @Override |
3099 | ++ public Optional<Boolean> getBoolean(String key) { |
3100 | ++ return Optional.empty(); |
3101 | ++ } |
3102 | ++ |
3103 | ++ @Override |
3104 | ++ @SuppressWarnings("deprecation") |
3105 | ++ public int size() { |
3106 | ++ return 0; |
3107 | ++ } |
3108 | ++ |
3109 | ++ @Override |
3110 | ++ public Set<String> keySet() { |
3111 | ++ return java.util.Collections.emptySet(); |
3112 | ++ } |
3113 | ++ |
3114 | ++ }); |
3115 | ++ } |
3116 | ++ |
3117 | + @API(status = INTERNAL, since = "1.4") |
3118 | + protected TestPlan(boolean containsTests, ConfigurationParameters configurationParameters) { |
3119 | + this.containsTests = containsTests; |
3120 | diff --git a/debian/patches/libhamcrest-java-04-gradle-build.patch b/debian/patches/libhamcrest-java-04-gradle-build.patch |
3121 | new file mode 100644 |
3122 | index 0000000..34f38da |
3123 | --- /dev/null |
3124 | +++ b/debian/patches/libhamcrest-java-04-gradle-build.patch |
3125 | @@ -0,0 +1,70 @@ |
3126 | +Description: Changes the build to work with the version of Gradle in Debian |
3127 | +Author: Emmanuel Bourg <ebourg@apache.org> |
3128 | +Forwarded: not-needed |
3129 | +--- a/libhamcrest-java/settings.gradle |
3130 | ++++ b/libhamcrest-java/settings.gradle |
3131 | +@@ -1,4 +1,3 @@ |
3132 | +-enableFeaturePreview('STABLE_PUBLISHING') |
3133 | + |
3134 | + include 'hamcrest', |
3135 | + 'hamcrest-core', |
3136 | +--- a/libhamcrest-java/build.gradle |
3137 | ++++ b/libhamcrest-java/build.gradle |
3138 | +@@ -57,6 +57,7 @@ |
3139 | + } |
3140 | + } |
3141 | + |
3142 | ++/* |
3143 | + def pomConfigurationFor(String pomName, String pomDescription) { |
3144 | + return { |
3145 | + name = pomName |
3146 | +@@ -91,6 +92,7 @@ |
3147 | + } |
3148 | + } |
3149 | + } |
3150 | ++*/ |
3151 | + |
3152 | + def publishToOssrh = project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword') |
3153 | + |
3154 | +@@ -102,9 +104,6 @@ |
3155 | + artifactId hamcrestProject.name |
3156 | + artifact hamcrestProject.sourcesJar |
3157 | + artifact hamcrestProject.javadocJar |
3158 | +- pom pomConfigurationFor( |
3159 | +- 'Hamcrest', |
3160 | +- 'Core API and libraries of hamcrest matcher framework.') |
3161 | + } |
3162 | + |
3163 | + def hamcrestCoreProject = project(':hamcrest-core') |
3164 | +@@ -113,9 +112,6 @@ |
3165 | + artifactId hamcrestCoreProject.name |
3166 | + artifact hamcrestCoreProject.sourcesJar |
3167 | + artifact hamcrestCoreProject.javadocJar |
3168 | +- pom pomConfigurationFor( |
3169 | +- 'Hamcrest Core', |
3170 | +- 'Core Hamcrest API - deprecated, please use "hamcrest" instead') |
3171 | + } |
3172 | + |
3173 | + def hamcrestLibraryProject = project(':hamcrest-library') |
3174 | +@@ -124,9 +120,6 @@ |
3175 | + artifactId hamcrestLibraryProject.name |
3176 | + artifact hamcrestLibraryProject.sourcesJar |
3177 | + artifact hamcrestLibraryProject.javadocJar |
3178 | +- pom pomConfigurationFor( |
3179 | +- 'Hamcrest Library', |
3180 | +- 'A library of Hamcrest matchers - deprecated, please use "hamcrest" instead') |
3181 | + } |
3182 | + } |
3183 | + repositories { |
3184 | +@@ -144,9 +137,11 @@ |
3185 | + } |
3186 | + } |
3187 | + |
3188 | ++/* |
3189 | + signing { |
3190 | + required { publishToOssrh } |
3191 | + sign publishing.publications.hamcrest |
3192 | + sign publishing.publications.hamcrestCore |
3193 | + sign publishing.publications.hamcrestLibrary |
3194 | + } |
3195 | ++*/ |
3196 | diff --git a/debian/patches/libhamcrest-java-05-backward-compatibility.patch b/debian/patches/libhamcrest-java-05-backward-compatibility.patch |
3197 | new file mode 100644 |
3198 | index 0000000..ea880f9 |
3199 | --- /dev/null |
3200 | +++ b/debian/patches/libhamcrest-java-05-backward-compatibility.patch |
3201 | @@ -0,0 +1,23 @@ |
3202 | +Description: Restores the compatibility with Hamcrest 1.x |
3203 | +Author: Emmanuel Bourg <ebourg@apache.org> |
3204 | +Forwarded: not-needed |
3205 | +--- /dev/null |
3206 | ++++ b/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/Factory.java |
3207 | +@@ -0,0 +1,17 @@ |
3208 | ++package org.hamcrest; |
3209 | ++ |
3210 | ++import static java.lang.annotation.ElementType.METHOD; |
3211 | ++import java.lang.annotation.Retention; |
3212 | ++import static java.lang.annotation.RetentionPolicy.RUNTIME; |
3213 | ++import java.lang.annotation.Target; |
3214 | ++ |
3215 | ++/** |
3216 | ++ * Marks a Hamcrest static factory method so tools recognise them. |
3217 | ++ * A factory method is an equivalent to a named constructor. |
3218 | ++ * |
3219 | ++ * @author Joe Walnes |
3220 | ++ */ |
3221 | ++@Retention(RUNTIME) |
3222 | ++@Target({METHOD}) |
3223 | ++public @interface Factory { |
3224 | ++} |
3225 | diff --git a/debian/patches/libhamcrest-java-06-type-inference-fix.patch b/debian/patches/libhamcrest-java-06-type-inference-fix.patch |
3226 | new file mode 100644 |
3227 | index 0000000..c9e58a1 |
3228 | --- /dev/null |
3229 | +++ b/debian/patches/libhamcrest-java-06-type-inference-fix.patch |
3230 | @@ -0,0 +1,116 @@ |
3231 | +Description: Fixes the type inference errors when building with the source/target level set to Java 8 |
3232 | +Author: Emmanuel Bourg <ebourg@apache.org> |
3233 | +Forwarded: not-needed |
3234 | +--- a/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/core/AllOf.java |
3235 | ++++ b/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/core/AllOf.java |
3236 | +@@ -46,7 +46,7 @@ |
3237 | + * <pre>assertThat("myValue", allOf(startsWith("my"), containsString("Val")))</pre> |
3238 | + */ |
3239 | + public static <T> Matcher<T> allOf(Iterable<Matcher<? super T>> matchers) { |
3240 | +- return new AllOf<>(matchers); |
3241 | ++ return new AllOf<>((java.util.List) matchers); |
3242 | + } |
3243 | + |
3244 | + /** |
3245 | +@@ -56,6 +56,6 @@ |
3246 | + */ |
3247 | + @SafeVarargs |
3248 | + public static <T> Matcher<T> allOf(Matcher<? super T>... matchers) { |
3249 | +- return allOf(Arrays.asList(matchers)); |
3250 | ++ return allOf((java.util.List) Arrays.asList(matchers)); |
3251 | + } |
3252 | + } |
3253 | +--- a/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java |
3254 | ++++ b/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java |
3255 | +@@ -36,7 +36,7 @@ |
3256 | + * <pre>assertThat("myValue", anyOf(startsWith("foo"), containsString("Val")))</pre> |
3257 | + */ |
3258 | + public static <T> AnyOf<T> anyOf(Iterable<Matcher<? super T>> matchers) { |
3259 | +- return new AnyOf<>(matchers); |
3260 | ++ return new AnyOf<>((java.util.List) matchers); |
3261 | + } |
3262 | + |
3263 | + /** |
3264 | +@@ -46,6 +46,6 @@ |
3265 | + */ |
3266 | + @SafeVarargs |
3267 | + public static <T> AnyOf<T> anyOf(Matcher<? super T>... matchers) { |
3268 | +- return anyOf(Arrays.asList(matchers)); |
3269 | ++ return anyOf((java.util.List) Arrays.asList(matchers)); |
3270 | + } |
3271 | + } |
3272 | +--- a/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java |
3273 | ++++ b/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java |
3274 | +@@ -67,7 +67,7 @@ |
3275 | + */ |
3276 | + @SafeVarargs |
3277 | + public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) { |
3278 | +- return arrayContainingInAnyOrder(asList(itemMatchers)); |
3279 | ++ return arrayContainingInAnyOrder((List) asList(itemMatchers)); |
3280 | + } |
3281 | + |
3282 | + /** |
3283 | +--- a/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java |
3284 | ++++ b/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java |
3285 | +@@ -98,7 +98,7 @@ |
3286 | + */ |
3287 | + @SafeVarargs |
3288 | + public static <T> Matcher<Iterable<? extends T>> containsInAnyOrder(Matcher<? super T>... itemMatchers) { |
3289 | +- return containsInAnyOrder(Arrays.asList(itemMatchers)); |
3290 | ++ return containsInAnyOrder((List) Arrays.asList(itemMatchers)); |
3291 | + } |
3292 | + |
3293 | + /** |
3294 | +--- a/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java |
3295 | ++++ b/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java |
3296 | +@@ -73,7 +73,7 @@ |
3297 | + * the matchers that must be satisfied by the items in the examined array |
3298 | + */ |
3299 | + public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatchers) { |
3300 | +- return arrayContaining(asList(itemMatchers)); |
3301 | ++ return arrayContaining((List) asList(itemMatchers)); |
3302 | + } |
3303 | + |
3304 | + /** |
3305 | +--- a/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java |
3306 | ++++ b/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java |
3307 | +@@ -57,7 +57,7 @@ |
3308 | + this.first = matcher; |
3309 | + } |
3310 | + public CombinableMatcher<X> and(Matcher<? super X> other) { |
3311 | +- return new CombinableMatcher<>(first).and(other); |
3312 | ++ return new CombinableMatcher<>(first).and((Matcher) other); |
3313 | + } |
3314 | + } |
3315 | + |
3316 | +@@ -76,7 +76,7 @@ |
3317 | + this.first = matcher; |
3318 | + } |
3319 | + public CombinableMatcher<X> or(Matcher<? super X> other) { |
3320 | +- return new CombinableMatcher<>(first).or(other); |
3321 | ++ return new CombinableMatcher<>(first).or((Matcher) other); |
3322 | + } |
3323 | + } |
3324 | + } |
3325 | +--- a/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java |
3326 | ++++ b/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java |
3327 | +@@ -99,7 +99,7 @@ |
3328 | + */ |
3329 | + @SafeVarargs |
3330 | + public static <E> Matcher<Iterable<? extends E>> containsInRelativeOrder(Matcher<? super E>... itemMatchers) { |
3331 | +- return containsInRelativeOrder(asList(itemMatchers)); |
3332 | ++ return containsInRelativeOrder((List) asList(itemMatchers)); |
3333 | + } |
3334 | + |
3335 | + /** |
3336 | +--- a/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java |
3337 | ++++ b/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java |
3338 | +@@ -59,7 +59,7 @@ |
3339 | + * a list of matchers, each of which must be satisfied by an entry in an examined array |
3340 | + */ |
3341 | + public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) { |
3342 | +- return arrayContainingInAnyOrder(Arrays.asList(itemMatchers)); |
3343 | ++ return arrayContainingInAnyOrder((List) Arrays.asList(itemMatchers)); |
3344 | + } |
3345 | + |
3346 | + /** |
3347 | diff --git a/debian/patches/opentest4j-reporting-01-gradle-compatibility.patch b/debian/patches/opentest4j-reporting-01-gradle-compatibility.patch |
3348 | new file mode 100644 |
3349 | index 0000000..aea0ada |
3350 | --- /dev/null |
3351 | +++ b/debian/patches/opentest4j-reporting-01-gradle-compatibility.patch |
3352 | @@ -0,0 +1,45 @@ |
3353 | +Description: Rewrite the build system without Kotlin until Gradle is upgraded to a recent version |
3354 | +Author: Emmanuel Bourg <ebourg@apache.org> |
3355 | +Forwarded: not-needed |
3356 | +--- /dev/null |
3357 | ++++ b/opentest4j-reporting/build.gradle |
3358 | +@@ -0,0 +1,3 @@ |
3359 | ++allprojects { |
3360 | ++ apply plugin: 'java' |
3361 | ++} |
3362 | +--- /dev/null |
3363 | ++++ b/opentest4j-reporting/events/build.gradle |
3364 | +@@ -0,0 +1,13 @@ |
3365 | ++/* |
3366 | ++plugins { |
3367 | ++ `java-conventions` |
3368 | ++} |
3369 | ++*/ |
3370 | ++ |
3371 | ++dependencies { |
3372 | ++ compile(project(":schema")) |
3373 | ++// testImplementation(libs.archunit) |
3374 | ++// testImplementation(libs.assertj.core) |
3375 | ++// testImplementation(libs.junit.jupiter) |
3376 | ++// testImplementation(libs.xmlunit.assertj) |
3377 | ++} |
3378 | +--- /dev/null |
3379 | ++++ b/opentest4j-reporting/settings.gradle |
3380 | +@@ -0,0 +1,17 @@ |
3381 | ++rootProject.name = "open-test-reporting" |
3382 | ++/* |
3383 | ++dependencyResolutionManagement { |
3384 | ++ repositories { |
3385 | ++ mavenCentral() |
3386 | ++ } |
3387 | ++} |
3388 | ++*/ |
3389 | ++ |
3390 | ++//include("cli") |
3391 | ++//include("documentation") |
3392 | ++include("events") |
3393 | ++include("schema") |
3394 | ++//include("tooling") |
3395 | ++ |
3396 | ++//enableFeaturePreview("VERSION_CATALOGS") |
3397 | ++//enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") |
3398 | diff --git a/debian/patches/picocli-0001-Adjust-build-to-work-without-asciidoctor.patch b/debian/patches/picocli-0001-Adjust-build-to-work-without-asciidoctor.patch |
3399 | new file mode 100644 |
3400 | index 0000000..de9f237 |
3401 | --- /dev/null |
3402 | +++ b/debian/patches/picocli-0001-Adjust-build-to-work-without-asciidoctor.patch |
3403 | @@ -0,0 +1,391 @@ |
3404 | +From: Miroslav Kravec <kravec.miroslav@gmail.com> |
3405 | +Date: Sat, 26 Jan 2019 19:31:42 +0100 |
3406 | +Subject: Adjust build to work without the following plugins: |
3407 | + - asciidoctor |
3408 | + - bnd (so no OSGi metadata) |
3409 | + - org.beryx:badass-jar (so no multi-version JARs) |
3410 | + and with default java |
3411 | +Last-update: 2021-11-21 |
3412 | +Forwarded: not-needed |
3413 | + |
3414 | +--- a/picocli/build.gradle |
3415 | ++++ b/picocli/build.gradle |
3416 | +@@ -1,61 +1,8 @@ |
3417 | +-import aQute.bnd.gradle.Bundle |
3418 | +- |
3419 | + group 'info.picocli' |
3420 | + description 'Java command line parser with both an annotations API and a programmatic API. Usage help with ANSI styles and colors. Autocomplete. Nested subcommands. Easily included as source to avoid adding a dependency.' |
3421 | + version "$projectVersion" |
3422 | + ext.moduleName = 'info.picocli' |
3423 | + |
3424 | +-buildscript { |
3425 | +- repositories { |
3426 | +- maven { |
3427 | +- url "https://plugins.gradle.org/m2/" |
3428 | +- } |
3429 | +- mavenCentral() |
3430 | +- } |
3431 | +- |
3432 | +- dependencies { |
3433 | +- classpath "org.asciidoctor:asciidoctor-gradle-jvm:$asciidoctorGradlePluginVersion" |
3434 | +- classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.4' |
3435 | +- classpath "gradle.plugin.org.beryx:badass-jar:1.1.3" |
3436 | +- classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:5.1.2' |
3437 | +- } |
3438 | +-} |
3439 | +- |
3440 | +-apply plugin: "org.beryx.jar" |
3441 | +- |
3442 | +-if (System.getenv('MAVEN_OSS_USER')) { // on home system |
3443 | +- apply plugin: 'biz.aQute.bnd.builder' |
3444 | +-} else { |
3445 | +- try { // otherwise, only apply if available |
3446 | +- Class.forName('aQute.bnd.gradle.BndPlugin') |
3447 | +- Class.forName('aQute.bnd.build.Project') |
3448 | +- apply plugin: 'biz.aQute.bnd.builder' |
3449 | +- } catch (Throwable ignored) {} |
3450 | +-} |
3451 | +-pluginManager.withPlugin('biz.aQute.bnd.builder') { // if plugin applied, execute this action |
3452 | +- configurations { |
3453 | +- bundleCompile |
3454 | +- baseline |
3455 | +- } |
3456 | +- dependencies { |
3457 | +- baseline('group': group, 'name': jar.archiveBaseName) { |
3458 | +- version { |
3459 | +- strictly "(,${jar.archiveVersion}[" |
3460 | +- } |
3461 | +- transitive = false |
3462 | +- } |
3463 | +- } |
3464 | +- sourceSets { |
3465 | +- bundle |
3466 | +- } |
3467 | +- task bundle(type: Bundle) { |
3468 | +- from sourceSets.bundle.output |
3469 | +- bndfile = 'bnd.bnd' |
3470 | +- sourceSet = sourceSets.bundle |
3471 | +- } |
3472 | +-} |
3473 | +- |
3474 | +- |
3475 | + allprojects { |
3476 | + apply plugin: 'java' |
3477 | + apply plugin: 'java-library' // to avoid https://github.com/gradle/gradle/issues/1118 |
3478 | +@@ -103,7 +50,7 @@ |
3479 | + } |
3480 | + } |
3481 | + |
3482 | +-sourceSets.main.java.srcDirs = ['src/main/java', 'src/main/java9'] |
3483 | ++sourceSets.main.java.srcDirs = ['src/main/java'] |
3484 | + compileJava { |
3485 | + inputs.property("moduleName", moduleName) |
3486 | + doFirst { |
3487 | +@@ -116,20 +63,6 @@ |
3488 | + } |
3489 | + } |
3490 | + |
3491 | +-jar { |
3492 | +- manifest { |
3493 | +- attributes 'Specification-Title' : 'picocli', |
3494 | +- 'Specification-Vendor' : 'Remko Popma', |
3495 | +- 'Specification-Version' : archiveVersion.get(), |
3496 | +- 'Implementation-Title' : 'picocli', |
3497 | +- 'Implementation-Vendor' : 'Remko Popma', |
3498 | +- 'Implementation-Version': archiveVersion.get(), |
3499 | +- 'Main-Class' : 'picocli.AutoComplete' |
3500 | +- } |
3501 | +- // copy module-info.class to META-INF/versions/9 |
3502 | +- multiRelease = true |
3503 | +-} |
3504 | +- |
3505 | + // jacoco 0.8.2 does not work with Java 13; gradle 4.x has no JavaVersion enum value for Java 12 |
3506 | + if (org.gradle.api.JavaVersion.current().isJava11Compatible()) { |
3507 | + project.logger.lifecycle("skipping jacoco test for Java version ${org.gradle.api.JavaVersion.current()}") |
3508 | +--- a/picocli/picocli-codegen/build.gradle |
3509 | ++++ b/picocli/picocli-codegen/build.gradle |
3510 | +@@ -29,24 +29,11 @@ |
3511 | + //generateGraalReflectionConfig.dependsOn(compileJava) |
3512 | + //jar.dependsOn(generateGraalReflectionConfig) |
3513 | + |
3514 | +-jar { |
3515 | +- manifest { |
3516 | +- attributes 'Specification-Title' : 'Picocli Code Generation', |
3517 | +- 'Specification-Vendor' : 'Remko Popma', |
3518 | +- 'Specification-Version' : archiveVersion.get(), |
3519 | +- 'Implementation-Title' : 'Picocli Code Generation', |
3520 | +- 'Implementation-Vendor' : 'Remko Popma', |
3521 | +- 'Implementation-Version': archiveVersion.get(), |
3522 | +- 'Automatic-Module-Name' : 'info.picocli.codegen' |
3523 | +- } |
3524 | +-} |
3525 | +- |
3526 | +- |
3527 | + task generateManpageAsciiDoc(type: JavaExec) { |
3528 | + dependsOn(classes) |
3529 | + group = "Documentation" |
3530 | + description = "Generate AsciiDoc manpage" |
3531 | +- classpath(configurations.compileClasspath, configurations.annotationProcessor, sourceSets.main.runtimeClasspath) |
3532 | ++ classpath(configurations.compileClasspath, sourceSets.main.runtimeClasspath) |
3533 | + main 'picocli.codegen.docgen.manpage.ManPageGenerator' |
3534 | + args 'picocli.codegen.docgen.manpage.ManPageGenerator$App', |
3535 | + 'picocli.codegen.aot.graalvm.DynamicProxyConfigGenerator$App', |
3536 | +@@ -62,18 +49,6 @@ |
3537 | + } |
3538 | + } |
3539 | + |
3540 | +-apply plugin: 'org.asciidoctor.jvm.convert' |
3541 | +-asciidoctor { |
3542 | +- dependsOn(generateManpageAsciiDoc) |
3543 | +- sourceDir = file("${project.buildDir}/picocli-generated-docs") |
3544 | +- outputDir = file("${project.buildDir}/docs") |
3545 | +- logDocuments = true |
3546 | +- outputOptions { |
3547 | +- backends = ['manpage', 'html5'] |
3548 | +- } |
3549 | +-} |
3550 | +-javadoc.dependsOn('asciidoctor') |
3551 | +- |
3552 | + ext { |
3553 | + PUBLISH_GROUP_ID = group |
3554 | + PUBLISH_ARTIFACT_ID = project.name |
3555 | +--- a/picocli/gradle/docs.gradle |
3556 | ++++ b/picocli/gradle/docs.gradle |
3557 | +@@ -1,13 +1,4 @@ |
3558 | + apply plugin: 'java' |
3559 | +-apply plugin: 'org.asciidoctor.jvm.convert' |
3560 | +-pluginManager.withPlugin('org.asciidoctor.jvm.convert') { // if plugin applied, execute this action |
3561 | +- configurations { |
3562 | +- tabbedCodeExt |
3563 | +- } |
3564 | +- dependencies { |
3565 | +- tabbedCodeExt "com.bmuschko:asciidoctorj-tabbed-code-extension:0.3" |
3566 | +- } |
3567 | +-} |
3568 | + |
3569 | + Map<org.gradle.api.JavaVersion, String> linkMap = org.gradle.api.JavaVersion.values().collectEntries { version -> |
3570 | + [(version) : 'https://docs.oracle.com/javase/8/docs/api/'] |
3571 | +@@ -41,19 +32,3 @@ |
3572 | + } |
3573 | + } |
3574 | + javadoc.dependsOn(jar) |
3575 | +-javadoc.dependsOn('asciidoctor') |
3576 | +-asciidoctorj { |
3577 | +- version = '2.4.3' |
3578 | +-} |
3579 | +-asciidoctor { |
3580 | +- sourceDir = file('docs') |
3581 | +- outputDir = file('build/docs') |
3582 | +- logDocuments = true |
3583 | +- configurations 'tabbedCodeExt' |
3584 | +- baseDirFollowsSourceDir() |
3585 | +-// backends 'pdf', 'html' |
3586 | +-// attributes 'sourcedir': file('docs') //project.sourceSets.main.java.srcDirs[0] |
3587 | +-//// attributes 'pdf-stylesdir': 'theme', |
3588 | +-//// 'pdf-style': 'custom', |
3589 | +-//// 'sourcedir': file('docs') //project.sourceSets.main.java.srcDirs[0] |
3590 | +-} |
3591 | +--- a/picocli/picocli-examples/generate-man-pages/example-gradle-project/build.gradle |
3592 | ++++ b/picocli/picocli-examples/generate-man-pages/example-gradle-project/build.gradle |
3593 | +@@ -1,22 +1,6 @@ |
3594 | +-buildscript { |
3595 | +- repositories { |
3596 | +- jcenter() |
3597 | +- maven { |
3598 | +- url "https://plugins.gradle.org/m2/" |
3599 | +- } |
3600 | +- mavenCentral() |
3601 | +- } |
3602 | +- |
3603 | +- dependencies { |
3604 | +- classpath "org.asciidoctor:asciidoctor-gradle-jvm:3.3.2" |
3605 | +- } |
3606 | +-} |
3607 | +- |
3608 | + plugins { |
3609 | + id 'java' |
3610 | + } |
3611 | +-apply plugin: 'org.asciidoctor.jvm.convert' |
3612 | +- |
3613 | + |
3614 | + group 'org.mycompany.myproject' |
3615 | + version '1.0-SNAPSHOT' |
3616 | +@@ -50,18 +34,6 @@ |
3617 | + args project.ext.mainClassName, "--outdir=${project.buildDir}/generated-picocli-docs", "-v", "--template-dir=src/docs/mantemplates" |
3618 | + } |
3619 | + |
3620 | +-apply plugin: 'org.asciidoctor.jvm.convert' |
3621 | +-asciidoctor { |
3622 | +- dependsOn(generateManpageAsciiDoc) |
3623 | +- sourceDir = file("${project.buildDir}/generated-picocli-docs") |
3624 | +- outputDir = file("${project.buildDir}/docs") |
3625 | +- logDocuments = true |
3626 | +- outputOptions { |
3627 | +- backends = ['manpage', 'html5'] |
3628 | +- } |
3629 | +-} |
3630 | +-assemble.dependsOn(asciidoctor) |
3631 | +- |
3632 | + // We can now use the Gradle `distribution` plugin to include |
3633 | + // the generated manpage files in the distribution archive: |
3634 | + apply plugin: "distribution" |
3635 | +--- a/picocli/picocli-annotation-processing-tests/build.gradle |
3636 | ++++ b/picocli/picocli-annotation-processing-tests/build.gradle |
3637 | +@@ -22,19 +22,7 @@ |
3638 | + } |
3639 | + } |
3640 | + tasks.withType(Test.class) { |
3641 | +- if (org.gradle.api.JavaVersion.current().isJava12Compatible()) { // only a problem from Java 16, but okay |
3642 | ++ //if (org.gradle.api.JavaVersion.current().isJava12Compatible()) { // only a problem from Java 16, but okay |
3643 | + it.jvmArgs '--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED' // https://github.com/google/compile-testing/issues/222 |
3644 | +- } |
3645 | +-} |
3646 | +- |
3647 | +-jar { |
3648 | +- manifest { |
3649 | +- attributes 'Specification-Title': 'Picocli Annotation Processing Tests', |
3650 | +- 'Specification-Vendor' : 'Remko Popma', |
3651 | +- 'Specification-Version' : archiveVersion.get(), |
3652 | +- 'Implementation-Title' : 'Picocli Annotation Processing Tests', |
3653 | +- 'Implementation-Vendor' : 'Remko Popma', |
3654 | +- 'Implementation-Version': archiveVersion.get(), |
3655 | +- 'Automatic-Module-Name' : 'info.picocli.annotation.processing.tests' |
3656 | +- } |
3657 | ++ //} |
3658 | + } |
3659 | +--- a/picocli/picocli-groovy/build.gradle |
3660 | ++++ b/picocli/picocli-groovy/build.gradle |
3661 | +@@ -29,18 +29,6 @@ |
3662 | + ] |
3663 | + //javadoc.options.linksOffline 'http://docs.groovy-lang.org/2.4.9/html/gapi', 'gradle/javadocs/jdk/9/' |
3664 | + |
3665 | +-jar { |
3666 | +- manifest { |
3667 | +- attributes 'Specification-Title' : 'Picocli Groovy', |
3668 | +- 'Specification-Vendor' : 'Remko Popma', |
3669 | +- 'Specification-Version' : archiveVersion.get(), |
3670 | +- 'Implementation-Title' : 'Picocli Groovy', |
3671 | +- 'Implementation-Vendor' : 'Remko Popma', |
3672 | +- 'Implementation-Version': archiveVersion.get(), |
3673 | +- 'Automatic-Module-Name' : 'info.picocli.groovy' |
3674 | +- } |
3675 | +-} |
3676 | +- |
3677 | + ext { |
3678 | + PUBLISH_GROUP_ID = group |
3679 | + PUBLISH_ARTIFACT_ID = project.name |
3680 | +--- a/picocli/picocli-shell-jline2/build.gradle |
3681 | ++++ b/picocli/picocli-shell-jline2/build.gradle |
3682 | +@@ -12,18 +12,6 @@ |
3683 | + testImplementation "junit:junit:$junitVersion" |
3684 | + } |
3685 | + |
3686 | +-jar { |
3687 | +- manifest { |
3688 | +- attributes 'Specification-Title' : 'Picocli Shell JLine2', |
3689 | +- 'Specification-Vendor' : 'Remko Popma', |
3690 | +- 'Specification-Version' : archiveVersion.get(), |
3691 | +- 'Implementation-Title' : 'Picocli Shell JLine2', |
3692 | +- 'Implementation-Vendor' : 'Remko Popma', |
3693 | +- 'Implementation-Version': archiveVersion.get(), |
3694 | +- 'Automatic-Module-Name' : 'info.picocli.shell.jline2' |
3695 | +- } |
3696 | +-} |
3697 | +- |
3698 | + ext { |
3699 | + PUBLISH_GROUP_ID = group |
3700 | + PUBLISH_ARTIFACT_ID = project.name |
3701 | +--- a/picocli/picocli-shell-jline3/build.gradle |
3702 | ++++ b/picocli/picocli-shell-jline3/build.gradle |
3703 | +@@ -15,18 +15,6 @@ |
3704 | + testImplementation "junit:junit:$junitVersion" |
3705 | + } |
3706 | + |
3707 | +-jar { |
3708 | +- manifest { |
3709 | +- attributes 'Specification-Title' : 'Picocli Shell JLine3', |
3710 | +- 'Specification-Vendor' : 'Remko Popma', |
3711 | +- 'Specification-Version' : archiveVersion.get(), |
3712 | +- 'Implementation-Title' : 'Picocli Shell JLine3', |
3713 | +- 'Implementation-Vendor' : 'Remko Popma', |
3714 | +- 'Implementation-Version': archiveVersion.get(), |
3715 | +- 'Automatic-Module-Name' : 'info.picocli.shell.jline3' |
3716 | +- } |
3717 | +-} |
3718 | +- |
3719 | + ext { |
3720 | + PUBLISH_GROUP_ID = group |
3721 | + PUBLISH_ARTIFACT_ID = project.name |
3722 | +--- a/picocli/picocli-spring-boot-starter/build.gradle |
3723 | ++++ b/picocli/picocli-spring-boot-starter/build.gradle |
3724 | +@@ -11,19 +11,7 @@ |
3725 | + dependencies { |
3726 | + api rootProject |
3727 | + api "org.springframework.boot:spring-boot-starter:$springBootVersion" |
3728 | +- annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:$springBootVersion" |
3729 | +-} |
3730 | +- |
3731 | +-jar { |
3732 | +- manifest { |
3733 | +- attributes 'Specification-Title' : 'Picocli Spring Boot Starter', |
3734 | +- 'Specification-Vendor' : 'Remko Popma', |
3735 | +- 'Specification-Version' : archiveVersion.get(), |
3736 | +- 'Implementation-Title' : 'Picocli Spring Boot Starter', |
3737 | +- 'Implementation-Vendor' : 'Remko Popma', |
3738 | +- 'Implementation-Version': archiveVersion.get(), |
3739 | +- 'Automatic-Module-Name' : 'info.picocli.spring' |
3740 | +- } |
3741 | ++ //annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:$springBootVersion" |
3742 | + } |
3743 | + |
3744 | + ext { |
3745 | +--- a/picocli/gradle/publish-mavencentral.gradle |
3746 | ++++ b/picocli/gradle/publish-mavencentral.gradle |
3747 | +@@ -1,3 +1,4 @@ |
3748 | ++/* disabled for Debian packaging build |
3749 | + apply plugin: 'java' |
3750 | + apply plugin: 'distribution' |
3751 | + apply plugin: 'maven-publish' |
3752 | +@@ -130,3 +131,4 @@ |
3753 | + signing { |
3754 | + sign publishing.publications |
3755 | + } |
3756 | ++*/ |
3757 | +--- a/picocli/picocli-examples/build.gradle |
3758 | ++++ b/picocli/picocli-examples/build.gradle |
3759 | +@@ -5,13 +5,13 @@ |
3760 | + mavenCentral() |
3761 | + } |
3762 | + |
3763 | +- dependencies { |
3764 | +- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31" |
3765 | +- } |
3766 | ++ //dependencies { |
3767 | ++ // classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31" |
3768 | ++ //} |
3769 | + } |
3770 | + |
3771 | + apply plugin: 'groovy' |
3772 | +-apply plugin: 'kotlin' |
3773 | ++//apply plugin: 'kotlin' |
3774 | + apply plugin: 'scala' |
3775 | + apply plugin: 'java-library' |
3776 | + |
3777 | +@@ -24,7 +24,7 @@ |
3778 | + dependencies { |
3779 | + api rootProject |
3780 | + api project(':picocli-groovy') |
3781 | +- api "org.jetbrains.kotlin:kotlin-stdlib" |
3782 | ++ //api "org.jetbrains.kotlin:kotlin-stdlib" |
3783 | + api 'org.scala-lang:scala-library:2.13.3' |
3784 | + ivy "org.apache.ivy:ivy:$ivyVersion" // for Intelli/J |
3785 | + implementation "org.codehaus.groovy:groovy-all:$groovyVersion", |
3786 | +@@ -38,7 +38,7 @@ |
3787 | + "org.hibernate.validator:hibernate-validator-annotation-processor:6.1.2.Final", |
3788 | + "javax.el:javax.el-api:3.0.0", |
3789 | + "org.glassfish.web:javax.el:2.2.6" |
3790 | +- implementation "org.jetbrains.kotlin:kotlin-script-runtime:1.4.31" |
3791 | ++ //implementation "org.jetbrains.kotlin:kotlin-script-runtime:1.4.31" |
3792 | + } |
3793 | + tasks.withType(GroovyCompile) { |
3794 | + // this, and the `configurations {ivy}` section, are a workaround for the dreaded |
3795 | diff --git a/debian/patches/series b/debian/patches/series |
3796 | index 021c717..a9bb11c 100644 |
3797 | --- a/debian/patches/series |
3798 | +++ b/debian/patches/series |
3799 | @@ -1,3 +1,18 @@ |
3800 | launchers.patch |
3801 | do-not-export-headless-display.patch |
3802 | reproducible-build.patch |
3803 | +jline3-01-ignore-warnings.patch |
3804 | +jline3-02-ignore-remote-modules.patch |
3805 | +picocli-0001-Adjust-build-to-work-without-asciidoctor.patch |
3806 | +opentest4j-reporting-01-gradle-compatibility.patch |
3807 | +libhamcrest-java-04-gradle-build.patch |
3808 | +libhamcrest-java-05-backward-compatibility.patch |
3809 | +libhamcrest-java-06-type-inference-fix.patch |
3810 | +junit4-exclude-dependency-sources.patch |
3811 | +junit4-Version.patch |
3812 | +junit4-java17-compatibility.patch |
3813 | +junit4-hamcrest-compatibility.patch |
3814 | +junit5-15-deprecated.patch |
3815 | +junit5-16-maven-build.patch |
3816 | +junit5-17-backward-compatibility.patch |
3817 | +testng-build-with-gradle.patch |
3818 | diff --git a/debian/patches/testng-build-with-gradle.patch b/debian/patches/testng-build-with-gradle.patch |
3819 | new file mode 100644 |
3820 | index 0000000..25a3339 |
3821 | --- /dev/null |
3822 | +++ b/debian/patches/testng-build-with-gradle.patch |
3823 | @@ -0,0 +1,129 @@ |
3824 | +Description: Provide a Groovy gradle build for testng |
3825 | +Author: Vladimir Petko <vladimir.petko@canonical.com> |
3826 | +Forwarded: not-needed |
3827 | + |
3828 | +--- /dev/null |
3829 | ++++ b/testng/build.gradle |
3830 | +@@ -0,0 +1,118 @@ |
3831 | ++plugins { |
3832 | ++ id 'java-library' |
3833 | ++ id 'maven-publish' |
3834 | ++} |
3835 | ++ |
3836 | ++repositories { |
3837 | ++ mavenLocal() |
3838 | ++} |
3839 | ++ |
3840 | ++apply plugin: 'java' |
3841 | ++apply plugin: 'java-library' |
3842 | ++apply plugin: 'maven-publish' |
3843 | ++ |
3844 | ++sourceCompatibility = 8 |
3845 | ++targetCompatibility = 8 |
3846 | ++ |
3847 | ++dependencies { |
3848 | ++ compile 'org.slf4j:slf4j-api:1.7.36' |
3849 | ++ compile 'com.beust:jcommander:1.82' |
3850 | ++ compile 'org.apache.ant:ant:1.10.12' |
3851 | ++ compile 'com.google.inject:guice:5.1.0' |
3852 | ++ compile 'junit:junit:4.13.2' |
3853 | ++ compile 'org.yaml:snakeyaml:1.33' |
3854 | ++ compile 'org.assertj:assertj-core:2.3.0' |
3855 | ++ compile 'com.google.code.findbugs:jsr305:debian' |
3856 | ++} |
3857 | ++ |
3858 | ++group = 'org.testng' |
3859 | ++version = System.env.TESTNG_VERSION |
3860 | ++description = 'testng' |
3861 | ++ |
3862 | ++sourceSets { |
3863 | ++ main { |
3864 | ++ java { |
3865 | ++ srcDirs 'testng-runner-api/src/main/java' |
3866 | ++ srcDirs 'testng-core/src/main/java' |
3867 | ++ srcDirs 'testng-asserts/src/main/java' |
3868 | ++ srcDirs 'testng-core-api/src/main/java' |
3869 | ++ srcDirs 'testng-test-kit/src/main/java' |
3870 | ++ srcDirs 'testng-reflection-utils/src/main/java' |
3871 | ++ srcDirs 'testng-collections/src/main/java' |
3872 | ++ } |
3873 | ++ resources { |
3874 | ++ srcDirs 'testng-core/src/main/resources' |
3875 | ++ } |
3876 | ++ } |
3877 | ++} |
3878 | ++ |
3879 | ++tasks { |
3880 | ++ jar { |
3881 | ++ manifest { |
3882 | ++ attributes( |
3883 | ++ "Specification-Title": rootProject.name, |
3884 | ++ "Specification-Version": version, |
3885 | ++ "Specification-Vendor" : rootProject.name, |
3886 | ++ "Implementation-Title" : rootProject.name, |
3887 | ++ "Implementation-Version": version, |
3888 | ++ "Implementation-Vendor" : rootProject.name, |
3889 | ++ "Implementation-Vendor-Id" : project.group, |
3890 | ++ "Implementation-Url": "https://testng.org", |
3891 | ++ "Automatic-Module-Name" : project.group, |
3892 | ++ "Bundle-ManifestVersion": "2", |
3893 | ++ "Bundle-Name": rootProject.name, |
3894 | ++ "Bundle-SymbolicName": project.group, |
3895 | ++ "Bundle-Vendor": rootProject.name, |
3896 | ++ "Bundle-License": "Apache-2.0", |
3897 | ++ "Bundle-Description": "Testing framework for Java", |
3898 | ++ "Bundle-Version": version, |
3899 | ++ "Import-Package" : """ |
3900 | ++ bsh.*;version="[2.0.03.0.0)";resolution:=optional, |
3901 | ++ com.beust.jcommander.*;version="[1.7.03.0.0)";resolution:=optional, |
3902 | ++ com.google.inject.*;version="[1.21.3)";resolution:=optional, |
3903 | ++ junit.framework;version="[3.8.1 5.0.0)";resolution:=optional, |
3904 | ++ org.junit.*;resolution:=optional, |
3905 | ++ org.apache.tools.ant.*;version="[1.7.0 2.0.0)";resolution:=optional, |
3906 | ++ org.yaml.*;version="[1.62.0)";resolution:=optional, |
3907 | ++ *;resolution:=optional |
3908 | ++ """.replace(" ", "").replace("\n", ""), |
3909 | ++ "Export-Package" : """ |
3910 | ++ org.testng, |
3911 | ++ org.testng.annotations, |
3912 | ++ org.testng.asserts, |
3913 | ++ org.testng.collections, |
3914 | ++ org.testng.internal, |
3915 | ++ org.testng.internal.annotations, |
3916 | ++ org.testng.internal.ant, |
3917 | ++ org.testng.internal.collections, |
3918 | ++ org.testng.internal.invokers, |
3919 | ++ org.testng.internal.invokers.objects, |
3920 | ++ org.testng.internal.junit, |
3921 | ++ org.testng.internal.objects, |
3922 | ++ org.testng.internal.objects.pojo, |
3923 | ++ org.testng.internal.reflect, |
3924 | ++ org.testng.internal.thread, |
3925 | ++ org.testng.internal.thread.graph, |
3926 | ++ org.testng.junit, |
3927 | ++ org.testng.log, |
3928 | ++ org.testng.log4testng, |
3929 | ++ org.testng.reporters, |
3930 | ++ org.testng.reporters.jq, |
3931 | ++ org.testng.reporters.util, |
3932 | ++ org.testng.thread, |
3933 | ++ org.testng.util, |
3934 | ++ org.testng.xml, |
3935 | ++ org.testng.xml.internal |
3936 | ++ """.replace(" ", "").replace("\n", " ") |
3937 | ++ ) |
3938 | ++ } |
3939 | ++ } |
3940 | ++} |
3941 | ++ |
3942 | ++publishing { |
3943 | ++ publications { |
3944 | ++ testng(MavenPublication) { |
3945 | ++ from(components.java) |
3946 | ++ } |
3947 | ++ } |
3948 | ++} |
3949 | +--- /dev/null |
3950 | ++++ b/testng/settings.gradle |
3951 | +@@ -0,0 +1 @@ |
3952 | ++rootProject.name = 'testng' |
3953 | diff --git a/debian/picocli/maven.ignoreRules b/debian/picocli/maven.ignoreRules |
3954 | new file mode 100644 |
3955 | index 0000000..49300b5 |
3956 | --- /dev/null |
3957 | +++ b/debian/picocli/maven.ignoreRules |
3958 | @@ -0,0 +1 @@ |
3959 | +org.springframework.boot:spring-boot-starter * * * * |
3960 | diff --git a/debian/picocli/maven.rules b/debian/picocli/maven.rules |
3961 | new file mode 100644 |
3962 | index 0000000..883085f |
3963 | --- /dev/null |
3964 | +++ b/debian/picocli/maven.rules |
3965 | @@ -0,0 +1,3 @@ |
3966 | + |
3967 | +jline jline jar s/.*/2.x/ * * |
3968 | + |
3969 | diff --git a/debian/picocli/poms b/debian/picocli/poms |
3970 | new file mode 100644 |
3971 | index 0000000..734f647 |
3972 | --- /dev/null |
3973 | +++ b/debian/picocli/poms |
3974 | @@ -0,0 +1,3 @@ |
3975 | +build/debian/picocli.pom --artifact=build/libs/picocli*.jar --java-lib |
3976 | +picocli-codegen/build/debian/picocli-codegen.pom --artifact=picocli-shell-jline2/build/libs/picocli*.jar --java-lib |
3977 | +picocli-shell-jline2/build/debian/picocli-shell-jline2.pom --artifact=picocli-shell-jline2/build/libs/picocli*.jar --java-lib |
3978 | diff --git a/debian/picocli/rules b/debian/picocli/rules |
3979 | new file mode 100755 |
3980 | index 0000000..31ade94 |
3981 | --- /dev/null |
3982 | +++ b/debian/picocli/rules |
3983 | @@ -0,0 +1,19 @@ |
3984 | +#!/usr/bin/make -f |
3985 | + |
3986 | +%: |
3987 | + dh $@ --buildsystem=gradle --with maven-repo-helper |
3988 | + |
3989 | +override_dh_auto_build: |
3990 | + dh_auto_build -- jar \ |
3991 | + -x :picocli-annotation-processing-tests:jar \ |
3992 | + -x :picocli-examples:compileGroovy \ |
3993 | + -x :picocli-examples:jar \ |
3994 | + -x :picocli-shell-jline3:jar \ |
3995 | + -x :picocli-spring-boot-starter:jar |
3996 | + |
3997 | +# tests are disabled until we have com.github.stefanbirkner:system-rules:1.x |
3998 | +override_dh_auto_test: |
3999 | + |
4000 | +override_dh_auto_configure: |
4001 | + dh_auto_configure $@ |
4002 | + rsync -Lav ../debian/built-components/ debian/ || true |
4003 | \ No newline at end of file |
4004 | diff --git a/debian/rules b/debian/rules |
4005 | index f9867da..762a115 100755 |
4006 | --- a/debian/rules |
4007 | +++ b/debian/rules |
4008 | @@ -1,4 +1,5 @@ |
4009 | #!/usr/bin/make -f |
4010 | +export DH_VERBOSE=1 |
4011 | |
4012 | JAVA_HOME = /usr/lib/jvm/default-java |
4013 | |
4014 | @@ -7,6 +8,9 @@ VERSION := $(shell dpkg-parsechangelog --show-field Version | awk -F'[+]' ' |
4015 | BUILD_NUMBER := $(shell dpkg-parsechangelog --show-field Version | awk -F'[+~-]' '{ print $$2 }') |
4016 | DATE := $(shell dpkg-parsechangelog --show-field Date) |
4017 | JTREG_HOME := $(shell readlink -f build/images/jtreg) |
4018 | + |
4019 | +export TESTNG_VERSION=7.5 |
4020 | + |
4021 | export JTREG_HOME |
4022 | |
4023 | export HEADLESS=1 |
4024 | @@ -17,17 +21,25 @@ ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) |
4025 | NJOBS = $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) |
4026 | endif |
4027 | |
4028 | +components:=jansi1 jline3 picocli univocity-parsers libhamcrest-java junit4 opentest4j-reporting junit5 testng |
4029 | + |
4030 | %: |
4031 | - dh $@ --with javahelper |
4032 | + dh $@ |
4033 | + |
4034 | +override_dh_clean: |
4035 | + ./debian/component-scripts/clean-components.sh jtreg7 $(components) |
4036 | + dh_clean |
4037 | |
4038 | override_dh_auto_build: |
4039 | + ./debian/component-scripts/build-components.sh jtreg7 $(components) |
4040 | + |
4041 | echo "=== $(VERSION) - $(BUILD_NUMBER) ===" |
4042 | mkdir -p build/classes/com/sun/javatest/regtest/tool |
4043 | (cd make && make \ |
4044 | ASMTOOLS_JAR=/usr/share/java/asmtools.jar \ |
4045 | BUILD_DIR=../build \ |
4046 | - JUNIT_JARS=/usr/share/java/junit-platform-console-standalone.jar \ |
4047 | - TESTNG_JARS="/usr/share/java/testng.jar /usr/share/java/guice.jar /usr/share/java/jcommander.jar /usr/share/java/slf4j-simple.jar /usr/share/java/slf4j-api.jar" \ |
4048 | + JUNIT_JARS=../junit5/debian/jtreg7/usr/share/java/junit-platform-console-standalone.jar \ |
4049 | + TESTNG_JARS="../testng/debian/jtreg7/usr/share/java/testng.jar /usr/share/java/guice.jar /usr/share/java/jcommander.jar /usr/share/java/slf4j-simple.jar /usr/share/java/slf4j-api.jar" \ |
4050 | JAVATEST_JAR=/usr/share/java/javatest.jar \ |
4051 | BUILD_DATE='$(DATE)' \ |
4052 | BUILD_NUMBER=$(VERSION) \ |
4053 | @@ -35,11 +47,10 @@ override_dh_auto_build: |
4054 | BUILD_MILESTONE=src \ |
4055 | JDKHOME=$(JAVA_HOME) \ |
4056 | BUILD_NUMBER=$(BUILD_NUMBER) -j$(NJOBS) all) |
4057 | - dh_auto_build |
4058 | |
4059 | # Generate the manpages |
4060 | - JT_HOME=./build/images/jtreg/lib/ help2man --no-discard-stderr --name="Regression Test Harness" --help-option="-help all" ./build/images/jtreg/bin/jtdiff > jtdiff.1 |
4061 | - JT_HOME=./build/images/jtreg/lib/ help2man --no-discard-stderr --name="Regression Test Harness" --help-option="-help all" ./build/images/jtreg/bin/jtreg > jtreg.1 |
4062 | + JT_HOME=build/images/jtreg help2man --name="Regression Test Harness" --help-option="-help all" --version-option="-version" build/images/jtreg/bin/jtdiff > jtdiff.1 |
4063 | + JT_HOME=build/images/jtreg help2man --name="Regression Test Harness" --help-option="-help all" --version-option="-version" build/images/jtreg/bin/jtreg > jtreg.1 |
4064 | |
4065 | # Make jtreg.jar writable so it is not ignored by strip-nondeterminism |
4066 | chmod +w build/images/jtreg/lib/jtreg.jar |
4067 | diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides |
4068 | new file mode 100644 |
4069 | index 0000000..8f10b8c |
4070 | --- /dev/null |
4071 | +++ b/debian/source/lintian-overrides |
4072 | @@ -0,0 +1,2 @@ |
4073 | +# suppress warning for junit5 test jars |
4074 | +jtreg7 source: source-contains-prebuilt-java-object |
4075 | diff --git a/debian/testng/maven.ignoreRules b/debian/testng/maven.ignoreRules |
4076 | new file mode 100644 |
4077 | index 0000000..4885855 |
4078 | --- /dev/null |
4079 | +++ b/debian/testng/maven.ignoreRules |
4080 | @@ -0,0 +1,6 @@ |
4081 | +com.coderplus.maven.plugins copy-rename-maven-plugin * * * * |
4082 | +org.apache.maven.plugins maven-gpg-plugin * * * * |
4083 | +org.apache.maven.plugins maven-javadoc-plugin * * * * |
4084 | +org.apache.maven.plugins maven-release-plugin * * * * |
4085 | +org.apache.maven.plugins maven-source-plugin * * * * |
4086 | +org.apache.maven.plugins maven-surefire-plugin * * * * |
4087 | diff --git a/debian/testng/maven.rules b/debian/testng/maven.rules |
4088 | new file mode 100644 |
4089 | index 0000000..b98dce8 |
4090 | --- /dev/null |
4091 | +++ b/debian/testng/maven.rules |
4092 | @@ -0,0 +1,6 @@ |
4093 | +com.google.inject guice jar s/.*/debian/ s/no_aop// * |
4094 | +junit junit jar s/4\..*/4.x/ * * |
4095 | +org.yaml snakeyaml bundle s/1\..*/1.x/ * * |
4096 | +org.yaml snakeyaml s/jar/bundle/ s/1\..*/1.x/ * * |
4097 | +s/ant/org.apache.ant/ * * s/.*/debian/ * * |
4098 | +org.assertj assertj-core jar s/.*/debian/ * * |
4099 | diff --git a/debian/testng/poms b/debian/testng/poms |
4100 | new file mode 100644 |
4101 | index 0000000..22d9c6c |
4102 | --- /dev/null |
4103 | +++ b/debian/testng/poms |
4104 | @@ -0,0 +1 @@ |
4105 | +build/debian/testng.pom --artifact=build/libs/testng-*.jar --java-lib --relocate=org.testng:testng:7.x |
4106 | diff --git a/debian/testng/rules b/debian/testng/rules |
4107 | new file mode 100755 |
4108 | index 0000000..d908d2d |
4109 | --- /dev/null |
4110 | +++ b/debian/testng/rules |
4111 | @@ -0,0 +1,16 @@ |
4112 | +#!/usr/bin/make -f |
4113 | + |
4114 | +include /usr/share/dpkg/pkg-info.mk |
4115 | + |
4116 | +export DEB_VERSION_UPSTREAM |
4117 | + |
4118 | +%: |
4119 | + dh $@ --buildsystem=gradle --with maven-repo-helper |
4120 | + |
4121 | +override_dh_auto_build: |
4122 | + mkdir -p src/main/java |
4123 | + dh_auto_build |
4124 | + |
4125 | +override_dh_auto_configure: |
4126 | + dh_auto_configure $@ |
4127 | + rsync -Lav ../debian/built-components/ debian/ || true |
4128 | \ No newline at end of file |
4129 | diff --git a/debian/univocity-parsers/maven.ignoreRules b/debian/univocity-parsers/maven.ignoreRules |
4130 | new file mode 100644 |
4131 | index 0000000..5c682ed |
4132 | --- /dev/null |
4133 | +++ b/debian/univocity-parsers/maven.ignoreRules |
4134 | @@ -0,0 +1,63 @@ |
4135 | +# Maven ignore rules - ignore some Maven dependencies and plugins |
4136 | +# Format of this file is: |
4137 | +# [group] [artifact] [type] [version] [classifier] [scope] |
4138 | +# where each element can be either |
4139 | +# - the exact string, for example org.apache for the group, or 3.1 |
4140 | +# for the version. In this case, the element is simply matched |
4141 | +# and left as it is |
4142 | +# - * (the star character, alone). In this case, anything will |
4143 | +# match and be left as it is. For example, using * on the |
4144 | +# position of the artifact field will match any artifact id |
4145 | +# All elements much match before a rule can be applied |
4146 | +# Example rule: match jar with groupid= junit, artifactid= junit |
4147 | +# and version starting with 3., this dependency is then removed |
4148 | +# from the POM |
4149 | +# junit junit jar s/3\\..*/3.x/ |
4150 | + |
4151 | +org.apache.maven.plugins maven-javadoc-plugin * * * * |
4152 | +org.apache.maven.plugins maven-site-plugin * * * * |
4153 | +org.apache.maven.plugins maven-surefire-plugin * * * * |
4154 | +org.apache.maven.plugins maven-dependency-plugin * * * * |
4155 | +org.apache.maven.plugins maven-enforcer-plugin * * * * |
4156 | +org.apache.maven.plugins maven-javadoc-plugin * * * * |
4157 | +org.apache.maven.plugins maven-source-plugin * * * * |
4158 | + |
4159 | +org.apache.sshd sshd-core * * * * |
4160 | + |
4161 | +org.codehaus.mojo exec-maven-plugin * * * * |
4162 | +org.fusesource.jansi jansi-linux32 * * * * |
4163 | +org.fusesource.jansi jansi-linux64 * * * * |
4164 | +org.fusesource.jansi jansi-osx * * * * |
4165 | +org.fusesource.jansi jansi-windows32 * * * * |
4166 | +org.fusesource.jansi jansi-windows64 * * * * |
4167 | +org.fusesource.jansi jansi-freebsd32 * * * * |
4168 | +org.fusesource.jansi jansi-freebsd64 * * * * |
4169 | +org.fusesource.mvnplugins fuse-jxr-skin * * * * |
4170 | +org.fusesource.mvnplugins maven-uberize-plugin * * * * |
4171 | +org.fusesource.mvnplugins fuse-javadoc-skin * * * * |
4172 | +org.springframework.boot:spring-boot-starter * * * * |
4173 | + |
4174 | +com.univocity univocity-output-tester |
4175 | +org.apache.maven.plugins maven-assembly-plugin |
4176 | +org.apache.maven.plugins maven-enforcer-plugin |
4177 | +org.apache.maven.plugins maven-javadoc-plugin |
4178 | +org.apache.maven.plugins maven-source-plugin |
4179 | +org.hsqldb hsqldb |
4180 | +org.sonatype.plugins nexus-staging-maven-plugin |
4181 | +org.testng testng |
4182 | + |
4183 | +org.apache.maven.doxia doxia-module-markdown * * * * |
4184 | +org.apache.maven.plugins maven-enforcer-plugin * * * * |
4185 | +org.apache.maven.plugins maven-release-plugin * * * * |
4186 | +org.apache.maven.plugins maven-source-plugin * * * * |
4187 | +org.codehaus.mojo animal-sniffer-maven-plugin * * * * |
4188 | +com.google.code.maven-replacer-plugin replacer * * * * |
4189 | +* maven-site-plugin * * * * |
4190 | +com.github.stephenc.wagon wagon-gitsite * * * * |
4191 | +* maven-project-info-reports-plugin * * * * |
4192 | + |
4193 | +org.jetbrains.kotlin kotlin-maven-plugin |
4194 | +org.jetbrains.kotlin kotlin-stdlib |
4195 | +org.junit.platform junit-platform-jfr |
4196 | +org.junit.platform junit-platform-testkit |
4197 | +org.mockito mockito-junit-jupiter |
4198 | \ No newline at end of file |
4199 | diff --git a/debian/univocity-parsers/maven.rules b/debian/univocity-parsers/maven.rules |
4200 | new file mode 100644 |
4201 | index 0000000..aafd0db |
4202 | --- /dev/null |
4203 | +++ b/debian/univocity-parsers/maven.rules |
4204 | @@ -0,0 +1,23 @@ |
4205 | +jmock jmock * s/.*/1.x/ * * |
4206 | +junit junit jar s/4\..*/4.x/ * * |
4207 | +org.fusesource.hawtjni hawtjni-runtime jar s/.*/debian/ * * |
4208 | +org.fusesource.jansi example jar s/.*/debian/ * * |
4209 | +org.fusesource.jansi jansi-project pom s/.*/debian/ * * |
4210 | +org.fusesource.jansi jansi jar s/.*/debian/ * * |
4211 | +org.fusesource.jansi jansi jar s/.*/debian/ * * |
4212 | +org.jline jline jar s/.*/debian/ * * |
4213 | +jline jline jar * * * |
4214 | +org.opentest4j.reporting s/schema/open-test-reporting-schema/ * s/.*/debian/ * * |
4215 | +org.opentest4j.reporting s/events/open-test-reporting-events/ * s/.*/debian/ * * |
4216 | +com.univocity univocity-parsers jar s/.*/debian/ * * |
4217 | + |
4218 | +org.hamcrest s/hamcrest-core/hamcrest/ * s/.*/debian/ * * |
4219 | + |
4220 | +org.junit.platform * * ${platform.version} * * |
4221 | +org.junit.jupiter * * ${platform.version} * * |
4222 | + |
4223 | +com.google.inject guice jar s/.*/debian/ s/no_aop// * |
4224 | +org.yaml snakeyaml bundle s/1\..*/1.x/ * * |
4225 | +org.yaml snakeyaml s/jar/bundle/ s/1\..*/1.x/ * * |
4226 | +s/ant/org.apache.ant/ * * s/.*/debian/ * * |
4227 | +org.assertj assertj-core jar s/.*/debian/ * * |
4228 | diff --git a/debian/univocity-parsers/poms b/debian/univocity-parsers/poms |
4229 | new file mode 100644 |
4230 | index 0000000..dc25bf3 |
4231 | --- /dev/null |
4232 | +++ b/debian/univocity-parsers/poms |
4233 | @@ -0,0 +1 @@ |
4234 | +pom.xml --has-package-version |
4235 | diff --git a/debian/univocity-parsers/rules b/debian/univocity-parsers/rules |
4236 | new file mode 100755 |
4237 | index 0000000..c695498 |
4238 | --- /dev/null |
4239 | +++ b/debian/univocity-parsers/rules |
4240 | @@ -0,0 +1,8 @@ |
4241 | +#!/usr/bin/make -f |
4242 | + |
4243 | +%: |
4244 | + dh $@ |
4245 | + |
4246 | +override_dh_auto_configure: |
4247 | + dh_auto_configure $@ |
4248 | + rsync -Lav ../debian/built-components/ debian/ || true |
4249 | \ No newline at end of file |
4250 | diff --git a/debian/watch b/debian/watch |
4251 | index eb34910..7536ffb 100644 |
4252 | --- a/debian/watch |
4253 | +++ b/debian/watch |
4254 | @@ -1,7 +1,30 @@ |
4255 | version=4 |
4256 | -opts=\ |
4257 | -compression=gzip,\ |
4258 | -repack,\ |
4259 | -repacksuffix=~us1,\ |
4260 | -dversionmangle=s/\~us\d*$// \ |
4261 | -https://github.com/openjdk/jtreg/tags .*/jtreg-([\d\.]+(?:\+[0-9]+)?).tar.gz |
4262 | +opts="compression=gzip,repack,repacksuffix=~us1" \ |
4263 | +https://github.com/openjdk/jtreg/tags .*/jtreg-([\d\.]+(?:\+[0-9]+)?)\.tar\.gz |
4264 | + |
4265 | +opts="compression=gzip,component=jansi1,repack" \ |
4266 | +https://github.com/fusesource/jansi/tags?after=jansi-2.1.0 .*/jansi-project-(1.18)\.tar\.gz |
4267 | + |
4268 | +opts="compression=gzip,component=jline3,repack" \ |
4269 | +https://github.com/jline/jline3/tags?after=jline-parent-3.5.2 .*/.*-(3.3.1)\.tar\.gz |
4270 | + |
4271 | +opts="compression=gzip,component=junit4,repack" \ |
4272 | + https://github.com/junit-team/junit4/tags .*/r?(4.13.2)\.tar\.gz |
4273 | + |
4274 | +opts="compression=gzip,component=junit5,repack" \ |
4275 | +https://github.com/junit-team/junit5/tags .*/r(5.9.2)\.tar\.gz |
4276 | + |
4277 | +opts="compression=gzip,component=libhamcrest-java,repack" \ |
4278 | +https://github.com/hamcrest/JavaHamcrest/tags .*/(?:hamcrest-java-|v)(2.2)\.tar\.gz |
4279 | + |
4280 | +opts="compression=gzip,component=opentest4j-reporting,repack" \ |
4281 | +https://github.com/ota4j-team/open-test-reporting/tags .*/r(0.1.0-M1)\.tar\.gz |
4282 | + |
4283 | +opts="compression=gzip,component=picocli,repack" \ |
4284 | +https://github.com/remkop/picocli/tags (?:.*?/)?v?(4.6.2)\.tar\.gz |
4285 | + |
4286 | +opts="compression=gzip,component=testng,repack" \ |
4287 | +https://github.com/cbeust/testng/tags .*/(7.5.1)\.tar\.gz |
4288 | + |
4289 | +opts="compression=gzip,component=univocity-parsers,repack" \ |
4290 | +https://github.com/univocity/univocity-parsers/tags .*/(?:.*?)(2.9.1)\.tar\.gz |
I have gone over this patch a few times and appreciate the outer layers of it. That means I haven't really looked into the specific contents of the various maven.rules, maven.ignoreRules and poms files added here.
I realize this kind of a vendoring solution is essential for the jtreg7 backport, which is going to be critical to regression test JDK 21 (and JDK 17 too, in the near future). It will be interesting to see what approach is agreed upon by Debian in this context.
I approve and also recommend a further review of the solution.