diff --git a/Dockerfile b/Dockerfile old mode 100644 new mode 100755 index 5877a4af..79bf3208 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,10 @@ # Pull base image -From tomcat:8-jre8 +FROM tomcat:9.0.8-jre8 # Maintainer -MAINTAINER "sai4cs@gmail.com" +LABEL MAINTAINER "Mohammad Kaleem" COPY ./webapp.war /usr/local/tomcat/webapps -RUN cp -R /usr/local/tomcat/webapps.dist/* /usr/local/tomcat/webapps +CMD rm -rf /usr/local/tomcat/webapps/*.war +CMD ["catalina.sh", "run"] +EXPOSE 8080 + diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 8196d201..c38e96ee --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # maven-project - +# Test# Simple Maven Project diff --git a/pom.xml b/pom.xml old mode 100644 new mode 100755 index eccd2068..89e5f507 --- a/pom.xml +++ b/pom.xml @@ -33,9 +33,10 @@ maven-compiler-plugin + 3.8.1 - 1.6 - 1.6 + 17 + 17 @@ -90,12 +91,7 @@ maven-checkstyle-plugin 2.8 - - - maven-compiler-plugin - 2.3.2 - - + maven-javadoc-plugin 2.8 @@ -106,11 +102,6 @@ 2.3 - - maven-pmd-plugin - 2.6 - - maven-project-info-reports-plugin 2.4 @@ -158,6 +149,12 @@ jetty-maven-plugin 8.0.0.M1 + + + org.apache.maven.plugins + maven-war-plugin + 3.4.0 + @@ -216,5 +213,5 @@ 3.0.3 - - + + diff --git a/server/pom.xml b/server/pom.xml old mode 100644 new mode 100755 diff --git a/server/src/main/java/com/example/Greeter.java b/server/src/main/java/com/example/Greeter.java old mode 100644 new mode 100755 diff --git a/server/src/site/apt/index.apt b/server/src/site/apt/index.apt old mode 100644 new mode 100755 diff --git a/server/src/test/java/com/example/TestGreeter.java b/server/src/test/java/com/example/TestGreeter.java old mode 100644 new mode 100755 diff --git a/webapp.war b/webapp.war new file mode 100644 index 00000000..76b430fd Binary files /dev/null and b/webapp.war differ diff --git a/webapp/pom.xml b/webapp/pom.xml old mode 100644 new mode 100755 diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml old mode 100644 new mode 100755 diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp old mode 100644 new mode 100755 index c22c57f7..b0aac3b0 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -1,2 +1,8 @@ -

Hello Dear Students!! Welcome to DevOps Project-2!!

-

By Mr. Sai from Saidemy!!

+

Hello! Welcome to DevOps Project-2!!

+

This is CI/CD Project from kaleem for practice

+

This is final CI/CD Project from kaleem for practice

+

first step for Argocd project

+

second step Argocd project

+

final step Argocd project

+

intigrating to k8s cluster final step

+

complete