diff --git a/hadoop-ozone/recon-codegen/pom.xml b/hadoop-ozone/recon-codegen/pom.xml index 0a279c40ab2..2dfb77e9e97 100644 --- a/hadoop-ozone/recon-codegen/pom.xml +++ b/hadoop-ozone/recon-codegen/pom.xml @@ -12,32 +12,25 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + + 4.0.0 - ozone org.apache.ozone + ozone 2.0.0-SNAPSHOT - 4.0.0 ozone-reconcodegen Apache Ozone Recon CodeGen - true - true + + true - org.apache.ozone - hdds-config - - - org.apache.ozone - ozone-common + com.google.inject + guice - commons-io commons-io @@ -46,18 +39,17 @@ org.apache.derby derby - - org.slf4j - slf4j-api + org.apache.ozone + hdds-config - org.springframework - spring-jdbc + org.apache.ozone + ozone-common - org.springframework - spring-tx + org.jooq + jooq org.jooq @@ -68,12 +60,16 @@ jooq-meta - org.jooq - jooq + org.slf4j + slf4j-api - com.google.inject - guice + org.springframework + spring-jdbc + + + org.springframework + spring-tx @@ -100,7 +96,8 @@ maven-enforcer-plugin - ban-annotations + ban-annotations + diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml index 85d2eac9d2b..1fad8fab076 100644 --- a/hadoop-ozone/recon/pom.xml +++ b/hadoop-ozone/recon/pom.xml @@ -12,292 +12,139 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + + 4.0.0 org.apache.ozone ozone 2.0.0-SNAPSHOT - Apache Ozone Recon - 4.0.0 ozone-recon + Apache Ozone Recon false 8.15.7 - true - - - - src/main/resources - - **/node_modules/** - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - org.apache.ozone - hdds-config - ${hdds.version} - - - - org.apache.hadoop.hdds.conf.ConfigFileGenerator - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - ban-annotations - - - - Only selected annotation processors are enabled, see configuration of maven-compiler-plugin. - - org.apache.hadoop.ozone.om.request.validation.RequestFeatureValidator - org.apache.hadoop.hdds.scm.metadata.Replicate - org.kohsuke.MetaInfServices - - - - - - - - - org.codehaus.mojo - exec-maven-plugin - - - generate-resources - - java - - - - - java - compile - org.hadoop.ozone.recon.codegen.JooqCodeGenerator - false - - ${project.build.directory}/generated-sources/java - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources/java - - - - - - - com.github.spotbugs - spotbugs-maven-plugin - - ${basedir}/dev-support/findbugsExcludeFile.xml - - - - - com.github.eirslett - frontend-maven-plugin - ${frontend-maven-plugin.version} - - false - target - ${basedir}/src/main/resources/webapps/recon/ozone-recon-web - - - - Install node and npm locally to the project - - install-node-and-npm - - - v${nodejs.version} - - - - set pnpm@${pnpm.version} store path - - npx - - - pnpm@${pnpm.version} config set store-dir ~/.pnpm-store - - - - install frontend dependencies - - npx - - - pnpm@${pnpm.version} install --frozen-lockfile - - - - Build frontend - - npx - - - pnpm@${pnpm.version} run build - - - - - - maven-clean-plugin - ${maven-clean-plugin.version} - - - - ${basedir}/src/main/resources/webapps/recon/ozone-recon-web/build - - ** - - false - - - ${basedir}/src/main/resources/webapps/recon/ozone-recon-web/node_modules - - ** - - false - - - - - - org.apache.maven.plugins - maven-resources-plugin - - - Copy frontend build to target - process-resources - - copy-resources - - - ${project.build.outputDirectory}/webapps/recon - - - ${basedir}/src/main/resources/webapps/recon/ozone-recon-web/build - - static/** - - true - - - - - - Copy frontend static files to target - process-resources - - copy-resources - - - ${project.build.outputDirectory}/webapps/static - - - ${basedir}/src/main/resources/webapps/recon/ozone-recon-web/build/static - true - - - - woff - woff2 - - - - - - - - org.apache.ozone - hdds-common + aopalliance + aopalliance - org.apache.ozone - hdds-config + com.fasterxml.jackson.core + jackson-annotations - org.apache.ozone - hdds-container-service + com.fasterxml.jackson.core + jackson-databind - org.apache.ozone - hdds-interface-client + com.google.guava + guava + + + com.google.inject + guice + + + com.google.inject.extensions + guice-assistedinject + + + com.google.inject.extensions + guice-servlet + + + com.google.protobuf + protobuf-java + + + com.jolbox + bonecp + + + commons-collections + commons-collections + + + commons-io + commons-io + + + info.picocli + picocli + + + jakarta.activation + jakarta.activation-api + + + jakarta.annotation + jakarta.annotation-api + + + jakarta.validation + jakarta.validation-api + + + jakarta.ws.rs + jakarta.ws.rs-api + + + jakarta.xml.bind + jakarta.xml.bind-api + + + javax.inject + javax.inject + + + javax.servlet + javax.servlet-api + + + org.apache.commons + commons-compress + + + org.apache.commons + commons-lang3 + + + org.apache.derby + derby org.apache.ozone - hdds-interface-server + hdds-common org.apache.ozone - hdds-managed-rocksdb + hdds-config org.apache.ozone - hdds-server-framework + hdds-container-service org.apache.ozone - ozone-common + hdds-interface-client org.apache.ozone - ozone-interface-client + hdds-interface-server org.apache.ozone - ozone-interface-storage + hdds-managed-rocksdb org.apache.ozone - ozone-reconcodegen - ${ozone.version} + hdds-server-framework org.apache.ozone - ozone-manager - - - com.sun.jersey - * - - + hdds-server-scm @@ -312,24 +159,30 @@ org.apache.ozone - hdds-server-scm + ozone-common - - commons-collections - commons-collections + org.apache.ozone + ozone-interface-client - org.apache.commons - commons-compress + org.apache.ozone + ozone-interface-storage - commons-io - commons-io + org.apache.ozone + ozone-manager + + + com.sun.jersey + * + + - org.apache.commons - commons-lang3 + org.apache.ozone + ozone-reconcodegen + ${ozone.version} org.apache.ratis @@ -339,59 +192,34 @@ org.apache.ratis ratis-proto - - - aopalliance - aopalliance - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-databind - - - com.google.guava - guava + org.eclipse.jetty + jetty-servlet - com.google.inject - guice + org.eclipse.jetty + jetty-util - com.google.inject.extensions - guice-assistedinject + org.glassfish.hk2 + guice-bridge - com.google.inject.extensions - guice-servlet + org.glassfish.hk2 + hk2-api - com.google.protobuf - protobuf-java + org.glassfish.hk2.external + jakarta.inject org.glassfish.jersey.containers jersey-container-servlet - - info.picocli - picocli - org.glassfish.jersey.containers jersey-container-servlet-core - - org.glassfish.hk2 - guice-bridge - - - org.glassfish.hk2.external - jakarta.inject - org.glassfish.jersey.core jersey-common @@ -401,48 +229,32 @@ jersey-server - org.glassfish.jersey.media - jersey-media-json-jackson + org.glassfish.jersey.inject + jersey-hk2 org.glassfish.jersey.media jersey-media-jaxb - org.glassfish.jersey.inject - jersey-hk2 - - - org.jooq - jooq + org.glassfish.jersey.media + jersey-media-json-jackson - org.jooq - jooq-meta + org.javassist + javassist org.jooq - jooq-codegen - - - com.jolbox - bonecp - - - org.apache.derby - derby - - - org.eclipse.jetty - jetty-servlet + jooq - org.eclipse.jetty - jetty-util + org.jooq + jooq-codegen - org.glassfish.hk2 - hk2-api + org.jooq + jooq-meta org.reflections @@ -452,10 +264,6 @@ org.rocksdb rocksdbjni - - org.xerial - sqlite-jdbc - org.slf4j slf4j-api @@ -473,36 +281,8 @@ spring-tx - jakarta.activation - jakarta.activation-api - - - jakarta.annotation - jakarta.annotation-api - - - jakarta.validation - jakarta.validation-api - - - jakarta.ws.rs - jakarta.ws.rs-api - - - jakarta.xml.bind - jakarta.xml.bind-api - - - javax.inject - javax.inject - - - javax.servlet - javax.servlet-api - - - org.javassist - javassist + org.xerial + sqlite-jdbc @@ -523,4 +303,220 @@ test + + + + src/main/resources + + **/node_modules/** + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.apache.ozone + hdds-config + ${hdds.version} + + + + org.apache.hadoop.hdds.conf.ConfigFileGenerator + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + ban-annotations + + + + + Only selected annotation processors are enabled, see configuration of maven-compiler-plugin. + + org.apache.hadoop.ozone.om.request.validation.RequestFeatureValidator + org.apache.hadoop.hdds.scm.metadata.Replicate + org.kohsuke.MetaInfServices + + + + + + + + + org.codehaus.mojo + exec-maven-plugin + + java + compile + org.hadoop.ozone.recon.codegen.JooqCodeGenerator + false + + ${project.build.directory}/generated-sources/java + + + + + + java + + generate-resources + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-source + + add-source + + generate-sources + + + ${project.build.directory}/generated-sources/java + + + + + + + com.github.spotbugs + spotbugs-maven-plugin + + ${basedir}/dev-support/findbugsExcludeFile.xml + + + + + com.github.eirslett + frontend-maven-plugin + ${frontend-maven-plugin.version} + + false + target + ${basedir}/src/main/resources/webapps/recon/ozone-recon-web + + + + Install node and npm locally to the project + + install-node-and-npm + + + v${nodejs.version} + + + + set pnpm@${pnpm.version} store path + + npx + + + pnpm@${pnpm.version} config set store-dir ~/.pnpm-store + + + + install frontend dependencies + + npx + + + pnpm@${pnpm.version} install --frozen-lockfile + + + + Build frontend + + npx + + + pnpm@${pnpm.version} run build + + + + + + maven-clean-plugin + ${maven-clean-plugin.version} + + + + ${basedir}/src/main/resources/webapps/recon/ozone-recon-web/build + + ** + + false + + + ${basedir}/src/main/resources/webapps/recon/ozone-recon-web/node_modules + + ** + + false + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + Copy frontend build to target + + copy-resources + + process-resources + + ${project.build.outputDirectory}/webapps/recon + + + ${basedir}/src/main/resources/webapps/recon/ozone-recon-web/build + + static/** + + true + + + + + + Copy frontend static files to target + + copy-resources + + process-resources + + ${project.build.outputDirectory}/webapps/static + + + ${basedir}/src/main/resources/webapps/recon/ozone-recon-web/build/static + true + + + + woff + woff2 + + + + + + +