equal
deleted
inserted
replaced
6 <artifactId>renkan</artifactId> |
6 <artifactId>renkan</artifactId> |
7 <version>0.1</version> |
7 <version>0.1</version> |
8 <packaging>war</packaging> |
8 <packaging>war</packaging> |
9 |
9 |
10 <properties> |
10 <properties> |
11 <coweb-version>0.8.4</coweb-version> |
11 <coweb-version>1.0</coweb-version> |
|
12 <cowebx-version>0.8.4</cowebx-version> |
12 <jersey-version>1.16</jersey-version> |
13 <jersey-version>1.16</jersey-version> |
13 <spring-version>3.1.3.RELEASE</spring-version> |
14 <spring-version>3.1.3.RELEASE</spring-version> |
14 <junit-version>4.10</junit-version> |
15 <junit-version>4.10</junit-version> |
15 <thymeleaf-version>2.0.14</thymeleaf-version> |
16 <thymeleaf-version>2.0.14</thymeleaf-version> |
16 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
17 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
30 </plugin> |
31 </plugin> |
31 |
32 |
32 <plugin> |
33 <plugin> |
33 <groupId>org.mortbay.jetty</groupId> |
34 <groupId>org.mortbay.jetty</groupId> |
34 <artifactId>jetty-maven-plugin</artifactId> |
35 <artifactId>jetty-maven-plugin</artifactId> |
35 <version>7.3.0.v20110203</version> |
36 <version>8.1.8.v20121106</version> |
36 <configuration> |
37 <configuration> |
37 <scanIntervalSeconds>10</scanIntervalSeconds> |
38 <scanIntervalSeconds>10</scanIntervalSeconds> |
38 <webAppConfig> |
39 <webAppConfig> |
39 <contextPath>/renkan</contextPath> |
40 <contextPath>/renkan</contextPath> |
40 </webAppConfig> |
41 </webAppConfig> |
128 <type>war</type> |
129 <type>war</type> |
129 </dependency> |
130 </dependency> |
130 <dependency> |
131 <dependency> |
131 <groupId>org.opencoweb.cowebx</groupId> |
132 <groupId>org.opencoweb.cowebx</groupId> |
132 <artifactId>cowebx-widgets-dojo</artifactId> |
133 <artifactId>cowebx-widgets-dojo</artifactId> |
133 <version>${coweb-version}</version> |
134 <version>${cowebx-version}</version> |
134 <type>war</type> |
135 <type>war</type> |
135 </dependency> |
136 </dependency> |
136 <dependency> |
137 <dependency> |
137 <groupId>com.sun.jersey</groupId> |
138 <groupId>com.sun.jersey</groupId> |
138 <artifactId>jersey-server</artifactId> |
139 <artifactId>jersey-server</artifactId> |