From 25587b5d3baf302f98278f4e5cdcbdcd2bd66bbf Mon Sep 17 00:00:00 2001 From: Allard Krings Date: Tue, 9 Jul 2024 11:19:39 +0000 Subject: [PATCH] meerdere pom's --- Dockerfile | 3 +- jffi | 1 + pom-dockerfile.xml | 138 ++++++++++++++++++++++++++++++++++++++++ pom-fabric8.xml | 134 ++++++++++++++++++++++++++++++++++++++ pom-install.xml | 99 ++++++++++++++++++++++++++++ pom.xml | 72 +++++++++++++++++++-- target/olproperties.war | Bin 190312 -> 190698 bytes 7 files changed, 440 insertions(+), 7 deletions(-) create mode 160000 jffi create mode 100755 pom-dockerfile.xml create mode 100755 pom-fabric8.xml create mode 100755 pom-install.xml diff --git a/Dockerfile b/Dockerfile index 7dc34b5..126f2bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ -FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi -#FROM harbor-dev.alldcs.nl/allard/openliberty-java17 +FROM allardkrings/riscv64-liberty ARG VERSION=1.0 ARG REVISION=SNAPSHOT diff --git a/jffi b/jffi new file mode 160000 index 0000000..f2ccd60 --- /dev/null +++ b/jffi @@ -0,0 +1 @@ +Subproject commit f2ccd60d8ab52387d9bfcd46cc15349df7b77dbf diff --git a/pom-dockerfile.xml b/pom-dockerfile.xml new file mode 100755 index 0000000..ffcdeeb --- /dev/null +++ b/pom-dockerfile.xml @@ -0,0 +1,138 @@ + + + 4.0.0 + + io.openliberty.guides + olproperties + 1.0 + war + + + 11 + 11 + UTF-8 + UTF-8 + + 9080 + 9443 + 1.4.13 + hub.docker.com + + + + + + jakarta.platform + jakarta.jakartaee-api + 10.0.0 + provided + + + org.eclipse.microprofile + microprofile + 6.0 + pom + provided + + + + org.junit.jupiter + junit-jupiter + 5.9.2 + test + + + org.jboss.resteasy + resteasy-client + 6.2.3.Final + test + + + org.jboss.resteasy + resteasy-json-binding-provider + 6.2.3.Final + test + + + org.glassfish + jakarta.json + 2.0.1 + test + + + + + ${project.artifactId} + + + + io.openliberty.tools + liberty-maven-plugin + 3.8.2 + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0 + + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.0.0 + + + ${liberty.var.default.http.port} + /dev + + + + + + com.spotify + dockerfile-maven-plugin + 1.4.13 + + + default + + build + + + + tag-latest + + tag + push + + + latest + + + + tag-version + + tag + + + ${project.version} + + + + + ${private.registry.url}/allardkrings/${project.artifactId} + latest + true + false + + + + + diff --git a/pom-fabric8.xml b/pom-fabric8.xml new file mode 100755 index 0000000..ab6614a --- /dev/null +++ b/pom-fabric8.xml @@ -0,0 +1,134 @@ + + + 4.0.0 + + io.openliberty.guides + olproperties + 1.0 + war + + + 11 + 11 + UTF-8 + UTF-8 + + 9080 + 9443 + + + + + + jakarta.platform + jakarta.jakartaee-api + 10.0.0 + provided + + + org.eclipse.microprofile + microprofile + 6.0 + pom + provided + + + + org.junit.jupiter + junit-jupiter + 5.9.2 + test + + + org.jboss.resteasy + resteasy-client + 6.2.3.Final + test + + + org.jboss.resteasy + resteasy-json-binding-provider + 6.2.3.Final + test + + + org.glassfish + jakarta.json + 2.0.1 + test + + + + + ${project.artifactId} + + + + io.openliberty.tools + liberty-maven-plugin + 3.8.2 + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0 + + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.0.0 + + + ${liberty.var.default.http.port} + /dev + + + + + + io.fabric8 + docker-maven-plugin + 0.44.0 + + //1 + + altshiftcreative/food-app-store-service + + + artifact + + + ${immersion} + + + + + + ${docker.hub.username} + ${docker.hub.password} + + + + + push + install + + stop + build + push + remove + + + + + + + diff --git a/pom-install.xml b/pom-install.xml new file mode 100755 index 0000000..dd7b42b --- /dev/null +++ b/pom-install.xml @@ -0,0 +1,99 @@ + + + 4.0.0 + + io.openliberty.guides + olproperties + 1.0 + war + + + 11 + 11 + UTF-8 + UTF-8 + + 9080 + 9443 + + + + + + jakarta.platform + jakarta.jakartaee-api + 10.0.0 + provided + + + org.eclipse.microprofile + microprofile + 6.0 + pom + provided + + + + org.junit.jupiter + junit-jupiter + 5.9.2 + test + + + org.jboss.resteasy + resteasy-client + 6.2.3.Final + test + + + org.jboss.resteasy + resteasy-json-binding-provider + 6.2.3.Final + test + + + org.glassfish + jakarta.json + 2.0.1 + test + + + + + ${project.artifactId} + + + + io.openliberty.tools + liberty-maven-plugin + 3.8.2 + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0 + + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.0.0 + + + ${liberty.var.default.http.port} + /dev + + + + + + + + diff --git a/pom.xml b/pom.xml index dd7b42b..09db0b9 100755 --- a/pom.xml +++ b/pom.xml @@ -4,14 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.openliberty.guides - olproperties + allardkrings + riscv64-olproperties 1.0 war - 11 - 11 + 17 + 17 UTF-8 UTF-8 @@ -93,7 +93,69 @@ - + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + + + docker-build + install + + exec + + + docker + ${project.basedir} + + build + -t + ${project.groupId}/${project.artifactId}:${project.version} + . + + + + + + docker-login + deploy + + exec + + + docker + ${project.basedir} + + login + -u + allardkrings + -p + Kubernetes01@ + hub.docker.io + + + + + docker-push + deploy + + exec + + + docker + ${project.basedir} + + push + ${project.groupId}/${project.artifactId}:${project.version} + + + + + diff --git a/target/olproperties.war b/target/olproperties.war index ab9e0e951bd6d79e358d22d1d96b860826afaf1e..b5a44a42c96899b68c5e450f9c7d65794c70449d 100644 GIT binary patch delta 1659 zcmY+^eKga190&02dq>tNXNQ0r0m{5BvUpkYlF(EDdF;elv4bg8-z)U-DSxsSWglio!SAz(0h zH5kkS24im+1?Kc9+PNuruaJH-bo`sU5(bD?q3ZT#$){WT&=P#7Hu?O{JMMXtYRSZX zR(XM&9gKchRl7+Qxc%mD9^knv zse*4l<8&1Hq%4h;U?^=HKUh9tsfd~-lAZOLmAH}ZDEgv zd!88RM;)AVX;5k06&L?A3UzayAgR+HD zHrE6z#kNlNb`Hl%ZVjH%iepJq{G%sSpU!olSLbHT9x^&L1d|miHSdX4t-HJLyglnE z(yTtR=%##Qq1_8NBxO=PdlE>tLdFz!iHM-k$C+a%d^b{h8a3ms8^9{|IksE-@%`7Y zGkmG{xos*{#gloiYlqmR+Q_XTfnwweY$*SxSs9rx?lsFO{^p$%qu|P@D7vkUY2gd2 zXQ~{sVB1waC%Q zO^pnrZPf=pPYSNRU8d$2_Nkx6UI}{o7;*l?s+VEbP1i&7^}JV}Z0F{H7PRW=qTtWA znS`^MB{M;>@jcxmV@4CB^9(Z5l%#)fI1*956`uer<*G}E!($UeJe+1%mFgc1Q}6k3 z^;n75_{N6cBTw*)9P9nUOu6dt*Bj`!+DqlzP9{@=xW}q#&w|o+WiGC0$z`656G!ky zvRsbzz&vTj-NHpFzq5cvKhCtLWQXV^(%!vnwz9v$EoMin`tetaeCOp0vE&byWPmJu|G|#cp>_&3z4; z_Vx1FccV#ey67t$WX&g5x{aW*wLZO+Vr}OeP`)}aG?wHQu|G19M7=U-<$dW4r}}c< zLrIX$*mNy_e8(XNOljAA5S{MH=S|ARZ)D-p4?eQhbD1tDR%)u*dy>}MhfFcmP#yj) zOjZ4wqk*|E)3LNY%8cBp< zZ@up5jS=wpS*8GuFI=^>59MNdq80Y69AZ|8v4xtsX6y$Vi!-^i&kB|s#t^H%-yhU+ z22&P-cQmNhHxw;rME&SLA3H1eUnVzsjJxl=bE%A-+z;|(+04cc03xLK05Fv$EIW4q z?1p?X0L*3PiGT^T;zj?S{Y3x|?L{K653)}L2#{OEfD9QZ2Ck5eV&EaO4l@W$$lK1&2- G$G-tc#tn=B delta 1280 zcmY+^doP7HOVIDa?lOn!w6&_10yqZ33Jec%=l$?*LU6>tZLXK+^t z1Rz2L0ACef^FTfiz`J+=*wujtE?uGq;Gqs3G+ThpUkAr_Z~+c=TJ8WtOTBWJ)nL}m zrKt!t80@AF3`XF5G!F>OjHI&@baC=5PFJvHH*TJDjQ{9Ho<4TS29B^u%IWlKyGyb; zkENR1xRReU9Z)SrF+b#t_G`{!q)7R*!@CB0F8E*WAcsYg+XiSjL)QY<{>M(;`{a)4 zsHO7ApW-W80wE-NF-(6_O5JKU3MurAqg{<^lyjF~!rZdWQ_> z5vzwe_L=^r>2<;6%;4hg;a?T029X-UENm~OZ+VXep{V4IfH9kk<{V40a!+y1D)Z^s5XJa+d45920Sj9b>7Fx)?9852l>57jLmv2 zxv$#p=_qfcojSnNZ91ZLx#oqAc@Qz&QkS$`gBcN;%tax@%+Hf8_oi{UYvk2EF2>Zy zJp*`jV8Pz2^3xC4(S)4wqw6)RzAH|2rqQdJu#8%sQy1aIe=;BngW#;l}~ zhA%AIdDqVG@~MeOPr1nB)hD-3B{sSypG#Q~g-7f=(^yD;n8;UDdRN~fZ$-W{{%;tp z2HQ2|*SW)BFd|2L91fB{L8fmFzD8AyS&lY<4F|Az#} oa0P^*MXKQVcV5-Zo~r%Nx_gN+3pjf7z>71!0(3QW=78$yPgf;86951J