Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 32 additions & 69 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>

Expand All @@ -14,6 +14,8 @@
<properties>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>utf-8</project.reporting.outputEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>

<modules>
Expand All @@ -33,60 +35,25 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>11</source>
<target>11</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.3.2</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.4.0</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>

<plugin>
<artifactId>maven-site-plugin</artifactId>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.1</version>
<configuration>
<reportPlugins>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>

<plugin>
<artifactId>maven-jxr-plugin</artifactId>
</plugin>

<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>

<plugin>
<artifactId>maven-pmd-plugin</artifactId>
</plugin>

<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
</plugin>
</reportPlugins>
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
</plugins>
Expand All @@ -95,75 +62,75 @@
<plugins>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.8</version>
<version>3.3.1</version>
</plugin>

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<version>3.11.0</version>
</plugin>

<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8</version>
<version>3.6.3</version>
</plugin>

<plugin>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.3</version>
<version>3.3.1</version>
</plugin>

<plugin>
<artifactId>maven-pmd-plugin</artifactId>
<version>2.6</version>
<version>3.21.0</version>
</plugin>

<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.4</version>
<version>3.5.0</version>
</plugin>

<plugin>
<artifactId>maven-release-plugin</artifactId>
<version>2.2.1</version>
<version>3.0.1</version>
</plugin>

<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.5</version>
<version>3.3.1</version>
</plugin>

<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.0</version>
<version>3.12.1</version>
</plugin>

<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.11</version>
<version>3.1.2</version>
</plugin>

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.11</version>
<version>3.1.2</version>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.3.3</version>
<version>3.0.5</version>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
<version>2.4</version>
<version>3.0.0</version>
</plugin>

<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>8.0.0.M1</version>
<version>8.1.22.v20160922</version>
</plugin>
</plugins>
</pluginManagement>
Expand All @@ -185,29 +152,29 @@

<dependency>
<groupId>junit</groupId>
<artifactId>junit-dep</artifactId>
<version>4.10</version>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.2.1</version>
<version>2.2</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>1.2.1</version>
<version>2.2</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.8.5</version>
<version>3.12.4</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -220,8 +187,4 @@
<url>http://github.com/jleetutorial/maven-project</url>
</scm>

<prerequisites>
<maven>3.0.3</maven>
</prerequisites>

</project>
4 changes: 2 additions & 2 deletions server/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>

Expand All @@ -22,7 +22,7 @@
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit-dep</artifactId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

Expand Down
3 changes: 2 additions & 1 deletion webapp/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>

Expand All @@ -22,6 +22,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>8.1.22.v20160922</version>
</plugin>
</plugins>
</build>
Expand Down
12 changes: 7 additions & 5 deletions webapp/src/main/webapp/index.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<h1>New user Register for DevOps Learning</h1>
<p>Please fill in this form to create an account.</p>
<hr>

<label for="Name"><b>Enter Name</b></label>
<input type="text" placeholder="Enter Full Name" name="Name" id="Name" required>
<br>

<label for="mobile"><b>Enter mobile</b></label>
<input type="text" placeholder="Enter moible number" name="mobile" id="mobile" required>
<br>
Expand All @@ -31,7 +31,9 @@
<p>Already have an account? <a href="#">Sign in</a>.</p>
</div>

<h1> Thankyou, Happy Learning </h1>
<h1>Thank you!</h1>
<h1>Happy Learning</h1>
<p>Update to test POM SCM !</p>



</form>
</form>