Skip to content
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

Jump to bottom

Work #31

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

Work #31

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift click to select a range
84e060f
adicionando README ao projeto
Jan 5, 2021
f050c44
Atualização da dependência MySQL Server
Jan 6, 2021
4f0be6a
Adicionando developer no pom.xml
Jan 6, 2021
b07c831
Atualização README.md
Jan 6, 2021
2c45e8d
Atualização do pom.xml e do README.md
Jan 6, 2021
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
Prev Previous commit
Atualização do pom.xml e do README.md
  • Loading branch information
philipporodrigues committed Jan 6, 2021
commit 2c45e8dbdee98bcfbb733ba21873d68b2209bc5b
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 6,3 @@
```
package jetty:run
```
>>>>>>> 0cf8642 (Atualização README.md)
9 changes: 1 addition & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 3,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<developers>
<developer>
<name>Philippo Rodrigues</name>
<email>[email protected]</email>
</developer>
</developers>

<groupId>br.com.caelum</groupId>
<artifactId>ingresso</artifactId>
Expand Down Expand Up @@ -110,7 103,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.22</version>
<version>5.1.40</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/spring-context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 28,7 @@

<bean id="mysqlDS" class="org.apache.commons.dbcp.BasicDataSource">
<property name="username" value="root"/>
<property name="password" value="rootroot"/>
<property name="password" value=""/>
<property name="url" value="jdbc:mysql://localhost/ingresso?createDatabaseIfNotExist=true&amp;useSSL=false"/>
<property name="driverClassName" value="com.mysql.jdbc.Driver"/>
</bean>
Expand Down