Skip to content

Commit 05d0f8e

Browse files
jbonofrejbonofre
committed
Include quarkus-container-image and README in the binary distributions (#1493)
(cherry picked from commit 0da202f)
1 parent 131e891 commit 05d0f8e

File tree

9 files changed

+190
-58
lines changed

9 files changed

+190
-58
lines changed

‎quarkus/admin/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ distributions {
9191
from(project.layout.buildDirectory.dir("quarkus-app"))
9292
from("distribution/NOTICE")
9393
from("distribution/LICENSE")
94+
from("distribution/README.md")
9495
}
9596
}
9697
}

‎quarkus/admin/distribution/LICENSE‎

Lines changed: 26 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -290,12 +290,6 @@ License (from POM): Apache License 2.0 - https://repository.jboss.org/licenses/a
290290

291291
--------------------------------------------------------------------------------
292292

293-
Group: com.auth0 Name: java-jwt Version: 4.5.0
294-
Project URL (from POM): https://github.com/auth0/java-jwt
295-
License (from POM): The MIT License (MIT) - https://raw.githubusercontent.com/auth0/java-jwt/master/LICENSE
296-
297-
--------------------------------------------------------------------------------
298-
299293
Group: com.azure Name: azure-core Version: 1.55.3
300294
Project URL (from POM): https://github.com/Azure/azure-sdk-for-java
301295
License (from POM): The MIT License (MIT) - http://opensource.org/licenses/MIT
@@ -380,12 +374,6 @@ License (from POM): Apache License 2.0 - https://www.apache.org/licenses/LICENSE
380374

381375
--------------------------------------------------------------------------------
382376

383-
Group: com.fasterxml.jackson.module Name: jackson-module-parameter-names Version: 2.18.2
384-
Project URL (from POM): https://github.com/FasterXML/jackson
385-
License (from POM): Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
386-
387-
--------------------------------------------------------------------------------
388-
389377
Group: com.github.ben-manes.caffeine Name: caffeine Version: 3.2.0
390378
Project URL (from POM): https://github.com/ben-manes/caffeine
391379
License (from POM): Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
@@ -560,7 +548,7 @@ License (from POM): Apache License 2.0 - https://www.apache.org/licenses/LICENSE
560548

561549
--------------------------------------------------------------------------------
562550

563-
Group: com.google.guava Name: guava Version: 33.4.0-jre
551+
Group: com.google.guava Name: guava Version: 33.4.6-jre
564552
Project URL (from POM): https://github.com/google/guava
565553
License (from POM): Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
566554

@@ -572,31 +560,31 @@ License (from POM): Apache License 2.0 - https://www.apache.org/licenses/LICENSE
572560

573561
--------------------------------------------------------------------------------
574562

575-
Group: com.google.http-client Name: google-http-client Version: 1.46.1
563+
Group: com.google.http-client Name: google-http-client Version: 1.46.3
576564
Project URL (from POM): https://github.com/googleapis/google-http-java-client
577565
License (from POM): Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
578566

579567
--------------------------------------------------------------------------------
580568

581-
Group: com.google.http-client Name: google-http-client-apache-v2 Version: 1.46.1
569+
Group: com.google.http-client Name: google-http-client-apache-v2 Version: 1.46.3
582570
Project URL (from POM): https://github.com/googleapis/google-http-java-client
583571
License (from POM): Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
584572

585573
--------------------------------------------------------------------------------
586574

587-
Group: com.google.http-client Name: google-http-client-appengine Version: 1.46.1
575+
Group: com.google.http-client Name: google-http-client-appengine Version: 1.46.3
588576
Project URL (from POM): https://github.com/googleapis/google-http-java-client
589577
License (from POM): Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
590578

591579
--------------------------------------------------------------------------------
592580

593-
Group: com.google.http-client Name: google-http-client-gson Version: 1.46.1
581+
Group: com.google.http-client Name: google-http-client-gson Version: 1.46.3
594582
Project URL (from POM): https://github.com/googleapis/google-http-java-client
595583
License (from POM): Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
596584

597585
--------------------------------------------------------------------------------
598586

599-
Group: com.google.http-client Name: google-http-client-jackson2 Version: 1.46.1
587+
Group: com.google.http-client Name: google-http-client-jackson2 Version: 1.46.3
600588
Project URL (from POM): https://github.com/googleapis/google-http-java-client
601589
License (from POM): Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
602590

@@ -669,14 +657,14 @@ License (from POM): Apache License 2.0 - https://www.apache.org/licenses/LICENSE
669657
--------------------------------------------------------------------------------
670658

671659
Group: com.sun.xml.bind Name: jaxb-core Version: 4.0.5
672-
Project URL: https://eclipse-ee4j.github.io/jaxb-ri/
673-
License: BSD-3-Clause - https://opensource.org/licenses/BSD-3-Clause
660+
Project URL (from POM): https://eclipse-ee4j.github.io/jaxb-ri/
661+
License (from POM): EDL 1.0 - http://www.eclipse.org/org/documents/edl-v10.php
674662

675663
--------------------------------------------------------------------------------
676664

677665
Group: com.sun.xml.bind Name: jaxb-xjc Version: 4.0.5
678-
Project URL: https://eclipse-ee4j.github.io/jaxb-ri/
679-
License: BSD-3-Clause - https://opensource.org/licenses/BSD-3-Clause
666+
Project URL (from POM): https://eclipse-ee4j.github.io/jaxb-ri/
667+
License (from POM): EDL 1.0 - http://www.eclipse.org/org/documents/edl-v10.php
680668

681669
--------------------------------------------------------------------------------
682670

@@ -1004,12 +992,6 @@ License (from POM): Apache License 2.0 - https://www.apache.org/licenses/LICENSE
1004992

1005993
--------------------------------------------------------------------------------
1006994

1007-
Group: io.opentelemetry Name: opentelemetry-sdk-extension-autoconfigure Version: 1.44.1
1008-
Project URL (from POM): https://github.com/open-telemetry/opentelemetry-java
1009-
License (from POM): Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
1010-
1011-
--------------------------------------------------------------------------------
1012-
1013995
Group: io.opentelemetry Name: opentelemetry-sdk-extension-autoconfigure-spi Version: 1.44.1
1014996
Project URL (from POM): https://github.com/open-telemetry/opentelemetry-java
1015997
License (from POM): Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
@@ -1046,19 +1028,19 @@ License (from POM): Apache License 2.0 - https://www.apache.org/licenses/LICENSE
10461028

10471029
--------------------------------------------------------------------------------
10481030

1049-
Group: io.projectreactor.netty Name: reactor-netty-core Version: 1.2.4
1031+
Group: io.projectreactor.netty Name: reactor-netty-core Version: 1.2.5
10501032
Project URL (from POM): https://github.com/reactor/reactor-netty
10511033
License (from POM): Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
10521034

10531035
--------------------------------------------------------------------------------
10541036

1055-
Group: io.projectreactor.netty Name: reactor-netty-http Version: 1.2.4
1037+
Group: io.projectreactor.netty Name: reactor-netty-http Version: 1.2.5
10561038
Project URL (from POM): https://github.com/reactor/reactor-netty
10571039
License (from POM): Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
10581040

10591041
--------------------------------------------------------------------------------
10601042

1061-
Group: io.projectreactor Name: reactor-core Version: 3.7.4
1043+
Group: io.projectreactor Name: reactor-core Version: 3.7.5
10621044
Project URL (from POM): https://github.com/reactor/reactor-core
10631045
License (from POM): Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
10641046

@@ -1264,6 +1246,12 @@ License (from POM): Eclipse Distribution License 1.0 - http://www.eclipse.org/or
12641246

12651247
--------------------------------------------------------------------------------
12661248

1249+
Group: javax.validation Name: validation-api Version: 1.1.0.Final
1250+
Project URL (from POM): https://beanvalidation.org
1251+
License (from POM): Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
1252+
1253+
--------------------------------------------------------------------------------
1254+
12671255
Group: javax.ws.rs Name: jsr311-api Version: 1.1.1
12681256
Project URL (from POM): https://jsr311.dev.java.net
12691257
License (from POM): CDDL License - http://www.opensource.org/licenses/cddl1.php
@@ -1488,6 +1476,12 @@ License (from POM): BSD-3-Clause - https://asm.ow2.io/license.html
14881476

14891477
--------------------------------------------------------------------------------
14901478

1479+
Group: org.postgresql Name: postgresql Version: 42.7.5
1480+
Project URL: https://jdbc.postgresql.org/
1481+
License (from POM): BSD-2-Clause - https://opensource.org/licenses/BSD-2-Clause
1482+
1483+
--------------------------------------------------------------------------------
1484+
14911485
Group: org.reactivestreams Name: reactive-streams Version: 1.0.4
14921486
Project URL (from POM): http://www.reactive-streams.org/
14931487
License (from POM): MIT-0 - https://spdx.org/licenses/MIT-0.html
@@ -1525,7 +1519,7 @@ License (from POM): Apache License 2.0 - https://www.apache.org/licenses/LICENSE
15251519

15261520
--------------------------------------------------------------------------------
15271521

1528-
Group: org.yaml Name: snakeyaml Version: 2.3
1522+
Group: org.yaml Name: snakeyaml Version: 2.4
15291523
Project URL (from POM): https://bitbucket.org/snakeyaml/snakeyaml
15301524
License (from POM): Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
15311525

@@ -1722,9 +1716,3 @@ Project URL (from POM): https://github.com/awslabs/aws-eventstream-java
17221716
License (from POM): Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
17231717

17241718
--------------------------------------------------------------------------------
1725-
1726-
Group: org.postgresql Name: postgresql Version: 42.7.5
1727-
Project URL: https://jdbc.postgresql.org/
1728-
License (from POM): BSD-2-Clause - https://opensource.org/licenses/BSD-2-Clause
1729-
1730-
--------------------------------------------------------------------------------

‎quarkus/admin/distribution/NOTICE‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -454,9 +454,9 @@ NOTICE:
454454

455455
--------------------------------------------------------------------------------
456456

457-
Group: io.micrometer Name: micrometer-commons Version: 1.14.5
458-
Group: io.micrometer Name: micrometer-core Version: 1.14.5
459-
Group: io.micrometer Name: micrometer-observation Version: 1.14.5
457+
Group: io.micrometer Name: micrometer-commons Version: 1.14.6
458+
Group: io.micrometer Name: micrometer-core Version: 1.14.6
459+
Group: io.micrometer Name: micrometer-observation Version: 1.14.6
460460

461461
NOTICE:
462462
| Micrometer

‎quarkus/admin/distribution/README.md‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
20+
# Polaris Admin Tool
21+
22+
The Polaris Admin Tool is a maintenance tool for performing administrative tasks on the Polaris server.
23+
24+
## Prerequisites
25+
26+
Polaris admin tool requires a Java SE 21 or higher to run.
27+
28+
## Getting help
29+
30+
To get help, simple run (in a command line where you extracted the Polaris tool archive):
31+
32+
```
33+
./run.sh help
34+
```
35+
36+
## Bootstrap
37+
38+
You can bootstrap realms and root principal credentials with:
39+
40+
```
41+
./run.sh bootstrap
42+
```
43+
44+
providing all required arguments.
45+
46+
## Purge
47+
48+
You can purge realms and all associated entities with:
49+
50+
```
51+
./run.sh purge
52+
```
53+
54+
## Documentation
55+
56+
For more details, please take a look on the documentation: https://polaris.apache.org/in-dev/unreleased/admin-tool/

‎quarkus/run-script/scripts/run.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ if [ ! -x "$JAVACMD" ] ; then
3636
exit 1
3737
fi
3838

39-
exec "${JAVACMD}" -jar "${script_dir}/quarkus-run.jar"
39+
exec "${JAVACMD}" -jar "${script_dir}/quarkus-run.jar" $@

‎quarkus/server/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ distributions {
8989
from(project.layout.buildDirectory.dir("quarkus-app"))
9090
from("distribution/NOTICE")
9191
from("distribution/LICENSE")
92-
exclude("lib/main/io.quarkus.quarkus-container-image*")
92+
from("distribution/README.md")
9393
}
9494
}
9595
}

0 commit comments

Comments
 (0)