diff --git a/.gitignore b/.gitignore index c55be61b50a..cd73e7ba534 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ dependency-reduced-pom.xml **/src/main/ts/package.json **/src/main/ts/package-lock.json local/ +.asciidoctorconfig.adoc diff --git a/inception/inception-dependencies/pom.xml b/inception/inception-dependencies/pom.xml index 18329a14ec3..860dfd26079 100644 --- a/inception/inception-dependencies/pom.xml +++ b/inception/inception-dependencies/pom.xml @@ -33,30 +33,31 @@ - org.apache.uima - uimaj-bom - ${uima.version} - pom - import - - - org.apache.uima - uimafit-bom - ${uimafit.version} + org.springframework + spring-framework-bom + ${spring.version} pom import + org.apache.uima uimaj-io-json ${uima-json.version} + org.json json ${json.version} + + org.apache.ivy + ivy + 2.5.2 + + org.glassfish.jaxb @@ -489,6 +490,11 @@ commons-collections4 ${commons-collections4.version} + + org.apache.commons + commons-math3 + ${commons-math3.version} + org.apache.commons commons-csv @@ -519,6 +525,18 @@ jsr305 3.0.2 + + + com.ibm.icu + icu4j + 75.1 + + + + eu.openminted.share.annotations + omtd-share-annotations-api + 3.0.2.7 + org.pf4j @@ -549,6 +567,13 @@ + + org.apache.jena + jena-bom + ${jena.version} + pom + import + org.apache.jena jena-fuseki-main @@ -560,11 +585,6 @@ - - org.apache.jena - jena-text - ${jena.version} - org.apache.jena jena-arq @@ -584,16 +604,6 @@ - - org.apache.jena - jena-tdb - ${jena.version} - - - org.apache.jena - jena-core - ${jena.version} - org.apache.thrift libthrift @@ -615,14 +625,6 @@ ${jboss.logging.version} - - io.sentry - sentry-bom - ${sentry.version} - pom - import - - jakarta.servlet jakarta.servlet-api @@ -709,15 +711,6 @@ ${wicketstuff.version} - - - org.springframework - spring-framework-bom - ${spring.version} - pom - import - - org.springframework.data @@ -1419,51 +1412,38 @@ - - org.apache.logging.log4j - log4j-bom - ${log4j2.version} + io.sentry + sentry-bom + ${sentry.version} pom import + - org.apache.logging.log4j - log4j-core - ${log4j2.version} - - - org.apache.logging.log4j - log4j-api - ${log4j2.version} - - - org.apache.logging.log4j - log4j-jmx-gui - ${log4j2.version} - - - org.apache.logging.log4j - log4j-layout-template-json - ${log4j2.version} - - - org.apache.logging.log4j - log4j-slf4j2-impl - ${log4j2.version} + org.apache.uima + uimaj-bom + ${uima.version} + pom + import + - org.apache.logging.log4j - log4j-spring-boot - ${log4j2.version} + org.apache.uima + uimafit-bom + ${uimafit.version} + pom + import + org.apache.logging.log4j - log4j-to-slf4j + log4j-bom ${log4j2.version} + pom + import - org.springframework.boot spring-boot-dependencies ${spring.boot.version} @@ -1472,7 +1452,6 @@ - org.apache.wicket wicket-parent ${wicket.version} @@ -1481,18 +1460,12 @@ - org.dkpro.core - dkpro-core-asl + dkpro-core-bom-asl ${dkpro.version} pom import - - org.apache.ivy - ivy - 2.5.2 - diff --git a/inception/inception-security/pom.xml b/inception/inception-security/pom.xml index 90b95108d77..31beabfa908 100644 --- a/inception/inception-security/pom.xml +++ b/inception/inception-security/pom.xml @@ -22,9 +22,10 @@ inception-app 34.0-SNAPSHOT + inception-security INCEpTION - Core - Security - jar + org.apache.commons diff --git a/pom.xml b/pom.xml index fbd0673b34c..c731862dd9b 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ 4.2.1 - 2.4.0 + 2.5.0 3.5.0 3.5.0 0.5.0 @@ -150,6 +150,7 @@ 2.12.0 1.17.1 1.26.2 + 3.6.1 1.12.0 1.9.0 2.16.1