Skip to content

creating pull request on 16122019 #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Akshi2802 wants to merge 20 commits into
base: master
Choose a base branch
from
Open

creating pull request on 16122019 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
88c5ba7
Dockerfile creation
Akshi2802 Jul 7, 2019
cef4124
adding comments in java file
Akshi2802 Jul 8, 2019
55e6e2f
changing the path of build
Akshi2802 Jul 8, 2019
fe34d3a
second commit with workdir added
Akshi2802 Jul 8, 2019
90db678
Updated with nexus repository info
Akshi2802 Jul 28, 2019
9a6ce5e
Merge pull request #5 from Akshi2802/nexus-changes
Akshi2802 Jul 28, 2019
8b3bc33
updating id for repository
Akshi2802 Jul 28, 2019
f6d28fb
updating id of repo to vagrantnexus
Akshi2802 Jul 28, 2019
b63c9f9
updating Id with unique value
Akshi2802 Jul 29, 2019
3ce15dd
updated repository name of snapshot
Akshi2802 Jul 29, 2019
e837065
updated repository name of snapshot
Akshi2802 Jul 29, 2019
7a5b64d
Merge pull request #6 from Akshi2802/Akshi2802-patch-1
Akshi2802 Jul 29, 2019
d93d240
removed duplicate repository tag
Akshi2802 Jul 29, 2019
868db22
updating repo id to vagrantnexus
Akshi2802 Jul 29, 2019
7111430
Update pom.xml
Akshi2802 Jul 29, 2019
c50a3cd
Create 1711
Akshi2802 Nov 17, 2019
08ca6cf
delete 1711
Akshi2802 Dec 16, 2019
71b989f
commit with no updates
Akshi2802 Dec 16, 2019
a8e399f
2nd commit
Akshi2802 Dec 16, 2019
5bb2451
Merge branch 'master' into master
Akshi2802 Dec 16, 2019
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
6 changes: 0 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +0,0 @@
FROM tomcat
LABEL maintainer="net.balajiraja@gmail.com"
WORKDIR /var/lib/jenkins/.jenkins/workspace/git_jenkins_devopsdemo
ADD javaone.war /usr/local/tomcat/webapps/
EXPOSE 8081:8080
CMD ["catalina.sh", "run"]
6 changes: 6 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,10 @@
</plugin>
</plugins>
</build>
<distributionManagement>
<repository>
<id>settingsserverid</id>
<url>http://192.168.1.14:8083/repository/DevopsDemo-Snap/</url>
</repository>
</distributionManagement>
</project>
3 changes: 2 additions & 1 deletion src/main/java/org/web/javaone/SimpleServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package org.web.javaone;

/*Anitha*/
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
Expand All @@ -9,6 +9,7 @@

/**
* Servlet implementation class SimpleServlet - 10Jun2019 - 09:45:00 AM
* Adding changes on 08072019
*/
@WebServlet("/hello")
public class SimpleServlet extends HttpServlet {
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<servlet>
<servlet-name>SimpleServlet</servlet-name>
<display-name>SimpleServlet</display-name>
<description></description>
<description></description>
<servlet-class>org.web.javaone.SimpleServlet</servlet-class>
</servlet>
<servlet-mapping>
Expand Down