DevFW-CICD/spring-petclinic
16
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-15 20:25:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Integrating Gordon's work

Browse source 
- integrated Gordon's comments in the POM
- removed antlr from the POM that we don't need anymore
- changed webjars versions inside headTag.jsp
This commit is contained in:
Mic 2013-02-20 09:40:48 +08:00
parent ed116de007
commit 9ba5811de3
3 changed files with 26 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
pom.xml
View file

@ -10,7 +10,6 @@
<packaging>war</packaging>
<properties>
<antlr.version>2.7.7</antlr.version>
<aspectj.version>1.7.1</aspectj.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
<commons-lang3.version>3.1</commons-lang3.version>
@ -38,6 +37,16 @@
<junit.version>4.11</junit.version>
<logback.version>1.0.9</logback.version>
<log4j.version>1.2.17</log4j.version>
<rome.version>1.0</rome.version>
<servlet.version>2.5</servlet.version>
<slf4j.version>1.7.2</slf4j.version>
<spring-data-jpa.version>1.3.0.RELEASE</spring-data-jpa.version>
<spring-framework.version>3.2.1.RELEASE</spring-framework.version>
<validation.version>1.0.0.GA</validation.version>
<webjars-bootstrap.version>2.3.0</webjars-bootstrap.version>
<webjars-jquery-ui.version>1.9.2</webjars-jquery-ui.version>
<webjars-jquery.version>1.9.0</webjars-jquery.version>
<maven-assembly-plugin.version>2.4</maven-assembly-plugin.version>
<maven-clean-plugin.version>2.5</maven-clean-plugin.version>
<maven-compiler-plugin.version>3.0</maven-compiler-plugin.version>
@ -62,18 +71,8 @@
<maven.version.range>[2.2.1,3.1.0)</maven.version.range>
<maven-war-plugin.version>2.3</maven-war-plugin.version>
<mysql.version>5.1.22</mysql.version>
<!-- gDickens: Best Practice: ALWAYS define source encoding for platform independence -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<rome.version>1.0</rome.version>
<servlet.version>2.5</servlet.version>
<slf4j.version>1.7.2</slf4j.version>
<spring-data-jpa.version>1.3.0.RELEASE</spring-data-jpa.version>
<spring-framework.version>3.2.1.RELEASE</spring-framework.version>
<validation.version>1.0.0.GA</validation.version>
<webjars-bootstrap.version>2.3.0</webjars-bootstrap.version>
<webjars-jquery-ui.version>1.9.2</webjars-jquery-ui.version>
<webjars-jquery.version>1.9.0</webjars-jquery.version>
</properties>
<dependencies>
@ -133,12 +132,12 @@
<artifactId>hsqldb</artifactId>
</dependency>
<!-- MySQL JDBC Connector -->
<!-- gDickens: standard mysql library
<dependency>
<!--
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
</dependency>
</dependency>
-->
<!-- Hibernate JPA Provider -->
<dependency>
@ -235,7 +234,7 @@
</dependency>
</dependencies>
<!-- gDickens: Best Practice to ALWAYS include the Maven plugin versions -->
<!-- all Maven plugin versions are mentioned in order to guarantee the build reproducibility in the long term -->
<build>
<defaultGoal>install</defaultGoal>
<plugins>
@ -850,6 +849,7 @@
<version>${logback.version}</version>
<scope>runtime</scope>
</dependency>
<!-- used for Atom -->
<dependency>
<groupId>rome</groupId>
<artifactId>rome</artifactId>
@ -870,22 +870,18 @@
<artifactId>joda-time-jsptags</artifactId>
<version>${jodatime-jsptags.version}</version>
</dependency>
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
<version>${antlr.version}</version>
</dependency>
<!-- Databases -->
<dependency>
<!-- Databases - Uses HSQL by default -->
<!-- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
</dependency>
</dependency> -->
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp.jstl</groupId>
@ -943,6 +939,7 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<!-- used by Spring MVC Test framework -->
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
@ -958,5 +955,4 @@
</dependencies>
</dependencyManagement>
</project>

2
src/main/resources/logback.xml
View file

@ -16,7 +16,7 @@
<logger name="org.springframework.samples.petclinic" level="debug"/>
<root level="warn">
<root level="info">
<appender-ref ref="console"/>
</root>
</configuration>

8
src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp
View file

@ -9,19 +9,19 @@ PetClinic :: a Spring Framework demonstration
<title>PetClinic :: a Spring Framework demonstration</title>
<spring:url value="/webjars/bootstrap/2.2.1/css/bootstrap.min.css" var="bootstrapCss"/>
<spring:url value="/webjars/bootstrap/2.3.0/css/bootstrap.min.css" var="bootstrapCss"/>
<link href="${bootstrapCss}" rel="stylesheet"/>
<spring:url value="/resources/css/petclinic.css" var="petclinicCss"/>
<link href="${petclinicCss}" rel="stylesheet"/>
<spring:url value="/webjars/jquery/1.8.2/jquery.js" var="jQuery"/>
<spring:url value="/webjars/jquery/1.9.0/jquery.js" var="jQuery"/>
<script src="${jQuery}"></script>
<spring:url value="/webjars/jquery-ui/1.9.1/js/jquery-ui-1.9.1.custom.js" var="jQueryUi"/>
<spring:url value="/webjars/jquery-ui/1.9.2/js/jquery-ui-1.9.1.custom.js" var="jQueryUi"/>
<script src="${jQueryUi}"></script>
<spring:url value="/webjars/jquery-ui/1.9.1/css/smoothness/jquery-ui-1.9.1.custom.css" var="jQueryUiCss"/>
<spring:url value="/webjars/jquery-ui/1.9.2/css/smoothness/jquery-ui-1.9.1.custom.css" var="jQueryUiCss"/>
<link href="${jQueryUiCss}" rel="stylesheet"></link>
</head>