From c2a9f89e9375dbc66f3532bd5c25bbcf7b539a1a Mon Sep 17 00:00:00 2001 From: Peter Boy Date: Sun, 17 Nov 2024 22:16:03 +0100 Subject: [PATCH] First stage of ee10 transition, adopting pom files --- .gitignore | 1 + ccm-cms-profile/pom.xml | 14 +- ccm-cms-types-agenda/pom.xml | 14 +- ccm-cms-types-bookmark/pom.xml | 14 +- ccm-cms-types-decisiontree/pom.xml | 14 +- ccm-cms-types-externallink/pom.xml | 14 +- ccm-cms-types-faqitem/pom.xml | 14 +- ccm-cms-types-glossaryitem/pom.xml | 14 +- ccm-cms-types-minutes/pom.xml | 14 +- ccm-cms/pom.xml | 18 +- ccm-core/pom.xml | 51 ++- ccm-docrepo/pom.xml | 5 +- ccm-shortcuts/pom.xml | 18 +- ccm-testutils/pom.xml | 29 +- .../src/main/java/org/libreccm/.DS_Store | Bin 0 -> 6148 bytes ccm-wildfly/pom.xml | 4 +- ccm-xafilesystemadapter/pom.xml | 5 +- pom.xml | 314 +++++++++++++----- 18 files changed, 352 insertions(+), 205 deletions(-) create mode 100644 ccm-testutils/src/main/java/org/libreccm/.DS_Store diff --git a/.gitignore b/.gitignore index 374a1f2a6..aa7cd05b3 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ target .project .settings .tscache +.idea *.vscode /ccm-core/nbproject/ /ccm-cms/nbproject/ diff --git a/ccm-cms-profile/pom.xml b/ccm-cms-profile/pom.xml index 6854ce642..3e76469b6 100644 --- a/ccm-cms-profile/pom.xml +++ b/ccm-cms-profile/pom.xml @@ -25,8 +25,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api jar provided @@ -52,7 +52,7 @@ - org.hibernate + org.hibernate.orm hibernate-envers provided @@ -89,12 +89,7 @@ org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library + hamcrest test @@ -124,6 +119,7 @@ org.jboss.shrinkwrap.resolver shrinkwrap-resolver-impl-maven + 3.3.2 test diff --git a/ccm-cms-types-agenda/pom.xml b/ccm-cms-types-agenda/pom.xml index c82a47906..068347a71 100644 --- a/ccm-cms-types-agenda/pom.xml +++ b/ccm-cms-types-agenda/pom.xml @@ -25,8 +25,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api jar provided @@ -52,7 +52,7 @@ - org.hibernate + org.hibernate.orm hibernate-envers provided @@ -89,12 +89,7 @@ org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library + hamcrest test @@ -124,6 +119,7 @@ org.jboss.shrinkwrap.resolver shrinkwrap-resolver-impl-maven + 3.3.2 test diff --git a/ccm-cms-types-bookmark/pom.xml b/ccm-cms-types-bookmark/pom.xml index ef148adaf..1867b5c45 100644 --- a/ccm-cms-types-bookmark/pom.xml +++ b/ccm-cms-types-bookmark/pom.xml @@ -25,8 +25,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api jar provided @@ -52,7 +52,7 @@ - org.hibernate + org.hibernate.orm hibernate-envers provided @@ -89,12 +89,7 @@ org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library + hamcrest test @@ -124,6 +119,7 @@ org.jboss.shrinkwrap.resolver shrinkwrap-resolver-impl-maven + 3.3.2 test diff --git a/ccm-cms-types-decisiontree/pom.xml b/ccm-cms-types-decisiontree/pom.xml index d25835cdb..39b6fe139 100644 --- a/ccm-cms-types-decisiontree/pom.xml +++ b/ccm-cms-types-decisiontree/pom.xml @@ -25,8 +25,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api jar provided @@ -52,7 +52,7 @@ - org.hibernate + org.hibernate.orm hibernate-envers provided @@ -89,12 +89,7 @@ org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library + hamcrest test @@ -124,6 +119,7 @@ org.jboss.shrinkwrap.resolver shrinkwrap-resolver-impl-maven + 3.3.2 test diff --git a/ccm-cms-types-externallink/pom.xml b/ccm-cms-types-externallink/pom.xml index dca71d6b1..72dd4c6d4 100644 --- a/ccm-cms-types-externallink/pom.xml +++ b/ccm-cms-types-externallink/pom.xml @@ -25,8 +25,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api jar provided @@ -52,7 +52,7 @@ - org.hibernate + org.hibernate.orm hibernate-envers provided @@ -89,12 +89,7 @@ org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library + hamcrest test @@ -124,6 +119,7 @@ org.jboss.shrinkwrap.resolver shrinkwrap-resolver-impl-maven + 3.3.2 test diff --git a/ccm-cms-types-faqitem/pom.xml b/ccm-cms-types-faqitem/pom.xml index ec7d23aa1..66d44074c 100644 --- a/ccm-cms-types-faqitem/pom.xml +++ b/ccm-cms-types-faqitem/pom.xml @@ -25,8 +25,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api jar provided @@ -52,7 +52,7 @@ - org.hibernate + org.hibernate.orm hibernate-envers provided @@ -89,12 +89,7 @@ org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library + hamcrest test @@ -124,6 +119,7 @@ org.jboss.shrinkwrap.resolver shrinkwrap-resolver-impl-maven + 3.3.2 test diff --git a/ccm-cms-types-glossaryitem/pom.xml b/ccm-cms-types-glossaryitem/pom.xml index b049a5326..27fc90b41 100644 --- a/ccm-cms-types-glossaryitem/pom.xml +++ b/ccm-cms-types-glossaryitem/pom.xml @@ -25,8 +25,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api jar provided @@ -52,7 +52,7 @@ - org.hibernate + org.hibernate.orm hibernate-envers provided @@ -89,12 +89,7 @@ org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library + hamcrest test @@ -124,6 +119,7 @@ org.jboss.shrinkwrap.resolver shrinkwrap-resolver-impl-maven + 3.3.2 test diff --git a/ccm-cms-types-minutes/pom.xml b/ccm-cms-types-minutes/pom.xml index dabdb7fed..41ad91be8 100644 --- a/ccm-cms-types-minutes/pom.xml +++ b/ccm-cms-types-minutes/pom.xml @@ -25,8 +25,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api jar provided @@ -52,7 +52,7 @@ - org.hibernate + org.hibernate.orm hibernate-envers provided @@ -89,12 +89,7 @@ org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library + hamcrest test @@ -124,6 +119,7 @@ org.jboss.shrinkwrap.resolver shrinkwrap-resolver-impl-maven + 3.3.2 test diff --git a/ccm-cms/pom.xml b/ccm-cms/pom.xml index 68da88f92..e74ae4da9 100644 --- a/ccm-cms/pom.xml +++ b/ccm-cms/pom.xml @@ -31,8 +31,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api jar provided @@ -51,7 +51,7 @@ - org.hibernate + org.hibernate.orm hibernate-envers provided @@ -80,8 +80,8 @@ - javax.mvc - javax.mvc-api + jakarta.mvc + jakarta.mvc-api provided @@ -137,12 +137,7 @@ org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library + hamcrest test @@ -172,6 +167,7 @@ org.jboss.shrinkwrap.resolver shrinkwrap-resolver-impl-maven + 3.3.2 test diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml index e01c03af8..c7b055f16 100644 --- a/ccm-core/pom.xml +++ b/ccm-core/pom.xml @@ -1,6 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 @@ -48,11 +49,17 @@ - + + + jakarta.platform + jakarta.jakartaee-api + 10.0.0 + provided @@ -62,7 +69,8 @@ - org.hibernate + + org.hibernate.orm hibernate-envers provided @@ -77,13 +85,18 @@ hibernate-validator-cdi provided - + + + jakarta.el + jakarta.el-api + 6.0.1-b06 @@ -92,10 +105,15 @@ provided - + + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.2 org.glassfish.jaxb @@ -103,9 +121,14 @@ provided - + + + jakarta.mvc + jakarta.mvc-api + 2.1.0 org.eclipse.krazo @@ -137,9 +160,14 @@ commons-io commons-io - + + + org.apache.commons + commons-lang3 + 3.17.0 commons-validator @@ -152,7 +180,7 @@ test - + + + org.hamcrest + hamcrest + 3.0 + test @@ -189,6 +223,7 @@ org.jboss.shrinkwrap.resolver shrinkwrap-resolver-impl-maven + 3.3.2 test diff --git a/ccm-docrepo/pom.xml b/ccm-docrepo/pom.xml index 0448784f2..3974cb0d1 100644 --- a/ccm-docrepo/pom.xml +++ b/ccm-docrepo/pom.xml @@ -29,8 +29,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api jar provided @@ -102,6 +102,7 @@ org.jboss.shrinkwrap.resolver shrinkwrap-resolver-impl-maven + 3.3.2 test diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml index fbee7067b..ad20e14ee 100644 --- a/ccm-shortcuts/pom.xml +++ b/ccm-shortcuts/pom.xml @@ -31,8 +31,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api jar provided @@ -51,7 +51,7 @@ - org.hibernate + org.hibernate.orm hibernate-envers provided @@ -74,8 +74,8 @@ - javax.mvc - javax.mvc-api + jakarta.mvc + jakarta.mvc-api provided @@ -121,12 +121,7 @@ org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library + hamcrest test @@ -156,6 +151,7 @@ org.jboss.shrinkwrap.resolver shrinkwrap-resolver-impl-maven + 3.3.2 test diff --git a/ccm-testutils/pom.xml b/ccm-testutils/pom.xml index 413f211d5..6c8f63a93 100644 --- a/ccm-testutils/pom.xml +++ b/ccm-testutils/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 @@ -25,15 +27,21 @@ junit - + + + org.hamcrest + hamcrest + 3.0 + test - + nl.jqno.equalsverifier equalsverifier @@ -49,15 +57,26 @@ arquillian-persistence-dbunit - + + + com.github.spotbugs + spotbugs-annotations + 4.8.6 + + + + org.jboss.shrinkwrap.resolver + shrinkwrap-resolver-api-maven + 3.3.2 - org.jboss.shrinkwrap.resolver shrinkwrap-resolver-impl-maven + 3.3.2 diff --git a/ccm-testutils/src/main/java/org/libreccm/.DS_Store b/ccm-testutils/src/main/java/org/libreccm/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..682fb484620f10868b21e3662ed43708cdd8e795 GIT binary patch literal 6148 zcmeI0F>1p=6hvnn6$xony7U!%gCOh^_yR5*OhCvGOQ}=&Ts~Tu{a+9wrE_7-JP==6 z{njB2g~Zln7=&5KrR2@;@|vljCo*K rZFZZcnC?9CTKVZdd#>3=`EraEJ01@Li}+!<9A{(5RecyR<_`D)(7YAg literal 0 HcmV?d00001 diff --git a/ccm-wildfly/pom.xml b/ccm-wildfly/pom.xml index 4ea03fd05..032d36723 100644 --- a/ccm-wildfly/pom.xml +++ b/ccm-wildfly/pom.xml @@ -35,8 +35,8 @@ - javax.mvc - javax.mvc-api + jakarta.mvc + jakarta.mvc-api org.eclipse.krazo diff --git a/ccm-xafilesystemadapter/pom.xml b/ccm-xafilesystemadapter/pom.xml index f7d2e0b0c..6c800dd80 100644 --- a/ccm-xafilesystemadapter/pom.xml +++ b/ccm-xafilesystemadapter/pom.xml @@ -31,8 +31,9 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api + 10.0.0 diff --git a/pom.xml b/pom.xml index da52b9180..d725d9c32 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 @@ -8,8 +9,9 @@ yyyy-MM-dd'T'HHmmss - v16.14.2 - + v22.11.0 + org.apache.maven.plugins maven-assembly-plugin - 3.3.0 + 3.7.1 org.apache.maven.plugins maven-clean-plugin - 3.1.0 + + 3.4.0 org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + + 3.13.0 - 11 - 11 + 21 + 21 true true ${project.build.sourceEncoding} @@ -198,41 +203,47 @@ org.apache.maven.plugins maven-deploy-plugin - 3.0.0-M1 + + 3.1.3 org.apache.maven.plugins maven-ear-plugin - 3.0.2 + 3.3.0 org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 + + 3.5.0 org.apache.maven.plugins maven-jar-plugin - 3.2.0 + + 3.4.2 org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + + 3.11.1 org.apache.maven.plugins maven-jxr-plugin - 3.0.0 + + 3.6.0 org.apache.maven.plugins maven-pmd-plugin - 3.13.0 + + 3.26.0 true utf-8 - 11 + 21 + 3.8.0 org.apache.maven.plugins maven-release-plugin - 3.0.0-M1 + + 3.1.1 org.apache.maven.plugins maven-failsafe-plugin - 3.0.0-M5 + + 3.5.2 org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M4 + + 3.5.2 org.apache.maven.plugins maven-surefire-report-plugin - 3.0.0-M5 + + 3.5.2 org.apache.maven.plugins maven-site-plugin - 3.9.0 + + 3.21.0 org.apache.maven.plugins maven-war-plugin - 3.3.0 + + 3.4.0 + 3.5.0 com.github.eirslett frontend-maven-plugin - 1.12.1 + + 1.15.1 com.github.spotbugs spotbugs-maven-plugin - 4.0.0 + + 4.8.6.6 true true @@ -335,41 +356,48 @@ org.codehaus.mojo build-helper-maven-plugin - 3.1.0 + + 3.6.0 org.codehaus.mojo properties-maven-plugin - 1.0.0 + + 1.2.1 org.codehaus.mojo versions-maven-plugin - 2.7 + + 2.18.0 org.codehaus.mojo taglist-maven-plugin - 2.4 + + 3.2.1 org.jacoco jacoco-maven-plugin - 0.8.5 + + 0.8.12 org.wildfly.plugins wildfly-maven-plugin - 2.1.0.Beta1 + + 5.0.1.Final true - 24.0.1.Final + 34.0.0.Final org.wildfly.plugins wildfly-jar-maven-plugin - 3.0.2.Final + + 11.0.2.Final true @@ -405,10 +433,10 @@ - 11.0 + 21.0 - 3.3.1 + 3.9.9 @@ -464,12 +492,19 @@ ******************************* --> - + + + + + jakarta.platform + jakarta.jakartaee-api + 10.0.0 - + + 6.6.2.Final - org.hibernate + + org.hibernate.orm hibernate-envers - 5.3.20.Final + + 6.6.2.Final org.postgresql postgresql - 42.2.14 + + 42.7.4 + 8.0.1.Final org.hibernate.validator hibernate-validator-cdi - 6.1.5.Final + + 8.0.1.Final - + + jakarta.el + jakarta.el-api + 6.0.1-b06 + + + 10.21.0 - + + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.2 org.glassfish.jaxb jaxb-runtime - 2.4.0-b180830.0438 + + 4.0.5 - + org.jboss.resteasy resteasy-core - 4.6.0.Final + + 6.2.11.Final org.jboss.resteasy resteasy-multipart-provider - 3.14.0.Final + + 6.2.11.Final - + + + jakarta.mvc + jakarta.mvc-api + 2.1.0 - org.eclipse.krazo krazo-core - 1.1.0-M1 + + 3.0.1 org.eclipse.krazo krazo-jersey - 1.1.0-M1 + + 3.0.1 org.eclipse.krazo krazo-resteasy - 1.1.0-M1 + + 3.0.1 org.eclipse.krazo.ext krazo-freemarker - 1.1.0-M1 + + 3.0.0 org.apache.shiro shiro-core - 1.5.3 + + 2.0.2 org.apache.shiro shiro-web - 1.5.3 + + 2.0.2 io.jsonwebtoken jjwt-api - 0.11.2 + + 0.12.6 io.jsonwebtoken jjwt-impl - 0.11.2 + + 0.12.6 io.jsonwebtoken jjwt-jackson - 0.11.2 + + 0.12.6 + 2.24.1 pom import @@ -665,49 +735,62 @@ org.apache.lucene lucene-core - 8.5.2 + + 10.0.0 commons-io commons-io - 2.7 + + 2.17.0 - + + + org.apache.commons + commons-lang3 + + 3.17.0 commons-validator commons-validator - 1.7 + + 1.9.0 org.reflections reflections - 0.9.12 + + 0.10.2 org.freemarker freemarker - 2.3.30 + + 2.3.33 org.jsoup jsoup - 1.13.1 + + 1.18.1 org.apache.maven maven-artifact - 3.6.3 + + 3.9.9 @@ -716,16 +799,22 @@ 1.2.2 - + + + com.github.spotbugs + spotbugs-annotations + 4.8.6 com.fasterxml.jackson jackson-bom - 2.11.0 + + 2.18.1 import pom @@ -736,11 +825,18 @@ ********************** --> + junit junit - 4.13 + + 4.13.2 + + 1.9.1.Final import pom @@ -768,16 +865,35 @@ arquillian-jacoco 1.1.0 + + + org.jboss.shrinkwrap.resolver + shrinkwrap-resolver-api-maven + 3.3.2 + test + + + org.jboss.shrinkwrap.resolver + shrinkwrap-resolver-impl-maven + 3.3.2 + test + + org.wildfly.arquillian wildfly-arquillian-container-managed - 3.0.1.Final + + 5.0.1.Final test org.wildfly.arquillian wildfly-arquillian-container-remote - 3.0.1.Final + + 5.0.1.Final test @@ -796,7 +912,8 @@ org.jboss.logmanager jboss-logmanager - 2.1.17.Final + + 3.0.6.Final test @@ -828,7 +945,8 @@ org.jacoco org.jacoco.core - 0.8.5 + + 0.8.12 test @@ -836,17 +954,23 @@ Hamcrest provides nice Matchers for JUnit test, making the assertions in the tests for readable. --> - + + org.hamcrest + hamcrest + 3.0 + test + + + 3.17.3 com.h2database h2 - 1.4.200 + + 2.3.232 org.webjars font-awesome - 4.7.0 + + 6.6.0 org.webjars requirejs - 2.3.5 + + 2.3.7 org.webjars requirejs-domready - 2.0.1-2 + + 2.0.1-3 org.webjars.npm tinymce - 4.8.2 + + 7.4.1