This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
commit 8d6a39ed7b1bb60503da245bcc10d857796be931 Author: Mark Struberg <[email protected]> AuthorDate: Mon Apr 27 12:51:22 2026 +0200 OWB-1459 update maven plugins I've updated some old maven plugins. Most notably in the site generation area. The new reporting uses Doxia-2.0 which is the reason for upgrading the site.xmls --- atinject-tck/src/site/site.xml | 12 ++++++-- pom.xml | 40 ++++++++++++------------- samples/guess/src/site/site.xml | 13 ++++++-- samples/src/site/site.xml | 13 ++++++-- webbeans-ee-common/src/site/site.xml | 13 ++++++-- webbeans-ee/src/site/site.xml | 13 ++++++-- webbeans-ejb/src/site/site.xml | 13 ++++++-- webbeans-el22/src/site/site.xml | 13 ++++++-- webbeans-impl/pom.xml | 23 --------------- webbeans-impl/src/site/site.xml | 20 ++++++++----- webbeans-jetty9/src/site/site.xml | 13 ++++++-- webbeans-jms/src/site/site.xml | 13 ++++++-- webbeans-jsf/src/site/site.xml | 13 ++++++-- webbeans-osgi/src/site/site.xml | 13 ++++++-- webbeans-porting/src/site/site.xml | 13 ++++++-- webbeans-spi/src/site/site.xml | 22 +++++++------- webbeans-tck/pom.xml | 57 +----------------------------------- webbeans-tck/src/site/site.xml | 13 ++++++-- webbeans-tomcat/src/site/site.xml | 13 ++++++-- webbeans-web/src/site/site.xml | 13 ++++++-- 20 files changed, 196 insertions(+), 160 deletions(-) diff --git a/atinject-tck/src/site/site.xml b/atinject-tck/src/site/site.xml index ac140ba47..b21abfd9b 100644 --- a/atinject-tck/src/site/site.xml +++ b/atinject-tck/src/site/site.xml @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -17,7 +17,15 @@ specific language governing permissions and limitations under the License. --> -<project name="OpenWebBeans-API"> +<project xmlns="http://maven.apache.org/SITE/2.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"; + name="OpenWebBeans-API"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>2.0.0</version> + </skin> <publishDate format="dd MMM yyyy" /> <version position="left"/> diff --git a/pom.xml b/pom.xml index 08b6cf946..1ad0c536f 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ <jetty.version>9.4.12.v20180830</jetty.version> <surefire.version>3.2.2</surefire.version> - <maven-javadoc.version>3.10.1</maven-javadoc.version> + <maven-javadoc.version>3.12.0</maven-javadoc.version> </properties> <mailingLists> @@ -305,7 +305,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.3.0</version> + <version>3.5.0</version> </plugin> <plugin> @@ -428,7 +428,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>3.5.0</version> + <version>3.6.0</version> <executions> <execution> <id>verify-style</id> @@ -645,7 +645,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>3.5.0</version> + <version>3.6.2</version> <executions> <execution> <id>enforce-java-version</id> @@ -669,7 +669,7 @@ <version>${maven-javadoc.version}</version> <configuration> <quiet>true</quiet> - <source>11</source> + <source>${maven.compiler.source}</source> <doclint>none</doclint> </configuration> </plugin> @@ -685,11 +685,11 @@ <reportSets> <reportSet> <reports> - <report>cim</report> + <report>ci-management</report> <report>index</report> - <report>issue-tracking</report> - <report>mailing-list</report> - <report>project-team</report> + <report>issue-management</report> + <report>mailing-lists</report> + <report>team</report> <report>scm</report> <report>summary</report> </reports> @@ -702,7 +702,7 @@ <version>${maven-javadoc.version}</version> <configuration> <quiet>true</quiet> - <source>11</source> + <release>${maven.compiler.source}</release> <doclint>none</doclint> </configuration> <reportSets> @@ -920,7 +920,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jxr-plugin</artifactId> - <version>3.3.2</version> + <version>3.6.0</version> <configuration> <inputEncoding> ${project.build.sourceEncoding} @@ -933,9 +933,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> - <version>3.25.0</version> + <version>3.28.0</version> <configuration> - <targetJdk>11</targetJdk> + <targetJdk>${maven.compiler.source}</targetJdk> <!-- <rulesets> <ruleset> @@ -948,20 +948,20 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.9</version> + <version>3.9.0</version> <reportSets> <reportSet> <reports> - <report>cim</report> + <report>ci-management</report> <report>dependencies</report> <report>dependency-convergence</report> <report>dependency-management</report> <report>index</report> - <report>issue-tracking</report> - <report>license</report> - <report>mailing-list</report> + <report>issue-management</report> + <report>licenses</report> + <report>mailing-lists</report> <report>plugin-management</report> - <report>project-team</report> + <report>team</report> <report>scm</report> <report>summary</report> </reports> @@ -971,7 +971,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> - <version>3.2.5</version> + <version>3.5.5</version> <reportSets> <reportSet> <reports> diff --git a/samples/guess/src/site/site.xml b/samples/guess/src/site/site.xml index a2359d004..696540042 100644 --- a/samples/guess/src/site/site.xml +++ b/samples/guess/src/site/site.xml @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -14,8 +14,15 @@ the specific language governing permissions and limitations under the License. --> - -<project name="OpenWebBeans-Samples-Guess"> +<project xmlns="http://maven.apache.org/SITE/2.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"; + name="OpenWebBeans-Samples-Guess"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>2.0.0</version> + </skin> <publishDate format="dd MMM yyyy" /> <version position="left"/> diff --git a/samples/src/site/site.xml b/samples/src/site/site.xml index 86570f3ba..b1d2b8855 100644 --- a/samples/src/site/site.xml +++ b/samples/src/site/site.xml @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -14,8 +14,15 @@ the specific language governing permissions and limitations under the License. --> - -<project name="OpenWebBeans-Samples"> +<project xmlns="http://maven.apache.org/SITE/2.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"; + name="OpenWebBeans-Samples"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>2.0.0</version> + </skin> <publishDate format="dd MMM yyyy" /> <version position="left"/> diff --git a/webbeans-ee-common/src/site/site.xml b/webbeans-ee-common/src/site/site.xml index 5c66098ef..b57763363 100644 --- a/webbeans-ee-common/src/site/site.xml +++ b/webbeans-ee-common/src/site/site.xml @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -17,8 +17,15 @@ specific language governing permissions and limitations under the License. --> - -<project name="OpenWebBeans"> +<project xmlns="http://maven.apache.org/SITE/2.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"; + name="OpenWebBeans"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>2.0.0</version> + </skin> <bannerLeft> <name>Apache OpenWebBeans</name> <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> diff --git a/webbeans-ee/src/site/site.xml b/webbeans-ee/src/site/site.xml index ff9dd17eb..713952e4d 100644 --- a/webbeans-ee/src/site/site.xml +++ b/webbeans-ee/src/site/site.xml @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -17,8 +17,15 @@ specific language governing permissions and limitations under the License. --> - -<project name="OpenWebBeans"> +<project xmlns="http://maven.apache.org/SITE/2.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"; + name="OpenWebBeans"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>2.0.0</version> + </skin> <bannerLeft> <name>Apache OpenWebBeans</name> <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> diff --git a/webbeans-ejb/src/site/site.xml b/webbeans-ejb/src/site/site.xml index 408b28644..e90582113 100644 --- a/webbeans-ejb/src/site/site.xml +++ b/webbeans-ejb/src/site/site.xml @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -17,8 +17,15 @@ specific language governing permissions and limitations under the License. --> - -<project name="OpenWebBeans"> +<project xmlns="http://maven.apache.org/SITE/2.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"; + name="OpenWebBeans"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>2.0.0</version> + </skin> <bannerLeft> <name>Apache OpenWebBeans</name> <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> diff --git a/webbeans-el22/src/site/site.xml b/webbeans-el22/src/site/site.xml index 26b92e8c7..56296c1cb 100644 --- a/webbeans-el22/src/site/site.xml +++ b/webbeans-el22/src/site/site.xml @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -17,8 +17,15 @@ specific language governing permissions and limitations under the License. --> - -<project name="OpenWebBeans"> +<project xmlns="http://maven.apache.org/SITE/2.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"; + name="OpenWebBeans"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>2.0.0</version> + </skin> <bannerLeft> <name>Apache OpenWebBeans</name> <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> diff --git a/webbeans-impl/pom.xml b/webbeans-impl/pom.xml index 4f16f0147..a4d63845e 100644 --- a/webbeans-impl/pom.xml +++ b/webbeans-impl/pom.xml @@ -115,32 +115,9 @@ </configuration> </plugin> - </plugins> </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.4</version> - <reportSets> - <reportSet> - <reports> - <report>cim</report> - <report>index</report> - <report>issue-tracking</report> - <report>mailing-list</report> - <report>project-team</report> - <report>scm</report> - <report>summary</report> - </reports> - </reportSet> - </reportSets> - </plugin> - </plugins> - </reporting> <profiles> <profile> diff --git a/webbeans-impl/src/site/site.xml b/webbeans-impl/src/site/site.xml index 1626235c1..225f811d3 100644 --- a/webbeans-impl/src/site/site.xml +++ b/webbeans-impl/src/site/site.xml @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -17,8 +17,15 @@ specific language governing permissions and limitations under the License. --> - -<project name="OpenWebBeans-Impl"> +<project xmlns="http://maven.apache.org/SITE/2.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"; + name="OpenWebBeans-Impl"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>2.0.0</version> + </skin> <bannerLeft> <name>Apache OpenWebBeans</name> <src>https://openwebbeans.apache.org/images/openwebbeans.png</src> @@ -33,18 +40,17 @@ <publishDate format="dd MMM yyyy" /> <version position="left"/> - + <body> <breadcrumbs> <item name="Apache" href="https://www.apache.org"/> <item name="OpenWebBeans" href="https://openwebbeans.apache.org"/> <item name="OWB-Core" href="https://openwebbeans.apache.org/${project.version}/openwebbeans-impl"/> </breadcrumbs> - <menu name="Overview"> - <item name="Introduction" href="index.html" /> + <item name="Introduction" href="index.html"/> + <item name="Configuration" href="configuration.html"/> </menu> - <menu ref="reports"/> </body> </project> diff --git a/webbeans-jetty9/src/site/site.xml b/webbeans-jetty9/src/site/site.xml index 331dedf72..82637a4c8 100644 --- a/webbeans-jetty9/src/site/site.xml +++ b/webbeans-jetty9/src/site/site.xml @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -17,8 +17,15 @@ specific language governing permissions and limitations under the License. --> - -<project name="OpenWebBeans"> +<project xmlns="http://maven.apache.org/SITE/2.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"; + name="OpenWebBeans"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>2.0.0</version> + </skin> <bannerLeft> <name>Apache OpenWebBeans</name> <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> diff --git a/webbeans-jms/src/site/site.xml b/webbeans-jms/src/site/site.xml index 04100623e..820d29118 100644 --- a/webbeans-jms/src/site/site.xml +++ b/webbeans-jms/src/site/site.xml @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -17,8 +17,15 @@ specific language governing permissions and limitations under the License. --> - -<project name="OpenWebBeans"> +<project xmlns="http://maven.apache.org/SITE/2.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"; + name="OpenWebBeans"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>2.0.0</version> + </skin> <bannerLeft> <name>Apache OpenWebBeans</name> <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> diff --git a/webbeans-jsf/src/site/site.xml b/webbeans-jsf/src/site/site.xml index 5c3dfb7c8..35c4f3e9d 100644 --- a/webbeans-jsf/src/site/site.xml +++ b/webbeans-jsf/src/site/site.xml @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -17,8 +17,15 @@ specific language governing permissions and limitations under the License. --> - -<project name="OpenWebBeans"> +<project xmlns="http://maven.apache.org/SITE/2.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"; + name="OpenWebBeans"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>2.0.0</version> + </skin> <bannerLeft> <name>Apache OpenWebBeans</name> <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> diff --git a/webbeans-osgi/src/site/site.xml b/webbeans-osgi/src/site/site.xml index 7c21a851b..1556d244c 100644 --- a/webbeans-osgi/src/site/site.xml +++ b/webbeans-osgi/src/site/site.xml @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -17,8 +17,15 @@ specific language governing permissions and limitations under the License. --> - -<project name="OpenWebBeans"> +<project xmlns="http://maven.apache.org/SITE/2.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"; + name="OpenWebBeans"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>2.0.0</version> + </skin> <bannerLeft> <name>Apache OpenWebBeans</name> <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> diff --git a/webbeans-porting/src/site/site.xml b/webbeans-porting/src/site/site.xml index 2d2206480..3bb02921c 100644 --- a/webbeans-porting/src/site/site.xml +++ b/webbeans-porting/src/site/site.xml @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -17,8 +17,15 @@ specific language governing permissions and limitations under the License. --> - -<project name="OpenWebBeans"> +<project xmlns="http://maven.apache.org/SITE/2.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"; + name="OpenWebBeans"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>2.0.0</version> + </skin> <bannerLeft> <name>Apache OpenWebBeans</name> <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> diff --git a/webbeans-spi/src/site/site.xml b/webbeans-spi/src/site/site.xml index 6d6b62f99..714ecc033 100644 --- a/webbeans-spi/src/site/site.xml +++ b/webbeans-spi/src/site/site.xml @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -17,35 +17,37 @@ specific language governing permissions and limitations under the License. --> - -<project name="OpenWebBeans"> +<project xmlns="http://maven.apache.org/SITE/2.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"; + name="OpenWebBeans"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>2.0.0</version> + </skin> <bannerLeft> <name>Apache OpenWebBeans</name> <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> <href>https://openwebbeans.apache.org</href> </bannerLeft> - <bannerRight> <name>Apache Banner</name> <src>https://www.apache.org/images/asf-logo.gif</src> <href>https://www.apache.org</href> </bannerRight> - <publishDate format="dd MMM yyyy" /> <version position="left"/> - <body> <breadcrumbs> <item name="Apache" href="https://www.apache.org"/> <item name="OpenWebBeans" href="https://openwebbeans.apache.org"/> <item name="OWB-SPI" href="https://openwebbeans.apache.org/${project.version}/openwebbeans-spi"/> </breadcrumbs> - <menu name="Overview"> - <item name="Introduction" href="index.html" /> - <item name="Configuration" href="configuration.html" /> + <item name="Introduction" href="index.html"/> + <item name="Configuration" href="configuration.html"/> </menu> - <menu ref="reports"/> </body> </project> diff --git a/webbeans-tck/pom.xml b/webbeans-tck/pom.xml index dfeb5bc18..1c7be5c5d 100644 --- a/webbeans-tck/pom.xml +++ b/webbeans-tck/pom.xml @@ -135,36 +135,6 @@ <groupId>jakarta.ejb</groupId> <artifactId>jakarta.ejb-api</artifactId> </exclusion> - <!-- not yet G jakarta jars - <exclusion> - <groupId>jakarta.resource</groupId> - <artifactId>jakarta.resource-api</artifactId> - </exclusion> - <exclusion> - <groupId>jakarta.jms</groupId> - <artifactId>jakarta.jms-api</artifactId> - </exclusion> - <exclusion> - <groupId>jakarta.persistence</groupId> - <artifactId>jakarta.persistence-api</artifactId> - </exclusion> - <exclusion> - <groupId>jakarta.ws.rs</groupId> - <artifactId>jakarta.ws.rs-api</artifactId> - </exclusion> - <exclusion> - <groupId>jakarta.xml.ws</groupId> - <artifactId>jakarta.xml.ws-api</artifactId> - </exclusion> - <exclusion> - <groupId>jakarta.transaction</groupId> - <artifactId>jakarta.transaction-api</artifactId> - </exclusion> - <exclusion> - <groupId>jakarta.faces</groupId> - <artifactId>jakarta.faces-api</artifactId> - </exclusion> - --> </exclusions> </dependency> @@ -185,6 +155,7 @@ <scope>test</scope> </dependency> + </dependencies> <build> <plugins> @@ -198,32 +169,6 @@ </suiteXmlFiles> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-tck</id> - <phase>generate-test-sources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - - <!-- OWB Porting Package --> - <artifactItem> - <groupId>org.apache.openwebbeans</groupId> - <artifactId>openwebbeans-porting</artifactId> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> - </artifactItem> - - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </profile> diff --git a/webbeans-tck/src/site/site.xml b/webbeans-tck/src/site/site.xml index 199bdcbb6..289244af4 100644 --- a/webbeans-tck/src/site/site.xml +++ b/webbeans-tck/src/site/site.xml @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -17,8 +17,15 @@ specific language governing permissions and limitations under the License. --> - -<project name="OpenWebBeans"> +<project xmlns="http://maven.apache.org/SITE/2.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"; + name="OpenWebBeans"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>2.0.0</version> + </skin> <bannerLeft> <name>Apache OpenWebBeans</name> <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> diff --git a/webbeans-tomcat/src/site/site.xml b/webbeans-tomcat/src/site/site.xml index 01c71a518..be76db2a2 100644 --- a/webbeans-tomcat/src/site/site.xml +++ b/webbeans-tomcat/src/site/site.xml @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -17,8 +17,15 @@ specific language governing permissions and limitations under the License. --> - -<project name="OpenWebBeans"> +<project xmlns="http://maven.apache.org/SITE/2.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"; + name="OpenWebBeans"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>2.0.0</version> + </skin> <bannerLeft> <name>Apache OpenWebBeans</name> <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> diff --git a/webbeans-web/src/site/site.xml b/webbeans-web/src/site/site.xml index b96600ca5..930faa17b 100644 --- a/webbeans-web/src/site/site.xml +++ b/webbeans-web/src/site/site.xml @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -17,8 +17,15 @@ specific language governing permissions and limitations under the License. --> - -<project name="OpenWebBeans"> +<project xmlns="http://maven.apache.org/SITE/2.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"; + name="OpenWebBeans"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>2.0.0</version> + </skin> <bannerLeft> <name>Apache OpenWebBeans</name> <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src>
