Skip to content

Commit

Permalink
Updated dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
Peter Svehla committed Oct 21, 2014
1 parent 52399b2 commit 177b86a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
14 changes: 7 additions & 7 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ Liferay Spring Portlet MVC

A Liferay Spring Portlet MVC project template using Maven.

* Liferay EE 6.2.10.4 (GA1, SP3)
* Liferay EE 6.2.10.8 (GA1, SP7)
* Java 1.7
* Portlet 2.0
* Spring Framework 4.0.6
* Spring Framework 4.1.1
* Annotation-based controller configuration

Usage
Expand All @@ -28,19 +28,19 @@ $ cp target/liferay-spring-mvc-portlet.war $LIFERAY_HOME/deploy/
Configuration
-------------

Default settings are Liferay EE 6.2.10.4, Java 1.7, Portlet 2.0, and Spring 4.0. All can be configured in [pom.xml](https://github.com/psvehla/liferay-spring-mvc-portlet/pom.xml)
Default settings are Liferay EE 6.2.10.4, Java 1.7, Portlet 2.0, and Spring 4.1. All can be configured in [pom.xml](https://github.com/psvehla/liferay-spring-mvc-portlet/pom.xml)

```xml
<properties>
<liferay.version>6.2.10.4</liferay.version>
<liferay.version>6.2.10.8</liferay.version>
<liferay.auto.deploy.dir>F:\java\liferay-portal-6.1.20-ee-ga2\deploy</liferay.auto.deploy.dir>
<java-version>1.7</java-version>
<portlet-api.version>2.0</portlet-api.version>
<servlet-api.version>2.5</servlet-api.version>
<jsp-api.version>2.2</jsp-api.version>
<jstl.version>1.2</jstl.version>
<org.springframework-version>4.0.6.RELEASE</org.springframework-version>
<org.aspectj-version>1.8.1</org.aspectj-version>
<org.springframework-version>4.1.1.RELEASE</org.springframework-version>
<org.aspectj-version>1.8.2</org.aspectj-version>
<org.slf4j-version>1.7.7</org.slf4j-version>
</properties>
```
Expand All @@ -56,7 +56,7 @@ Add an entry for the archetype in: ```~/.m2/archetype-catalog.xml```
<archetype>
<groupId>au.com.redbarn</groupId>
<artifactId>liferay-spring-mvc-portlet-archetype</artifactId>
<version>1.3-RELEASE</version>
<version>1.4-RELEASE</version>
<repository>https://raw.github.com/psvehla/maven-repo/master/releases</repository>
<description>liferay-spring-mvc-portlet-archetype</description>
</archetype>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@
<artifactId>liferay-spring-mvc-portlet</artifactId>
<packaging>war</packaging>
<name>Liferay Spring MVC Portlet</name>
<version>1.3-RELEASE</version>
<version>1.4-RELEASE</version>

<prerequisites>
<maven>3.1.1</maven>
</prerequisites>

<properties>
<liferay.version>6.2.10.4</liferay.version>
<liferay.version>6.2.10.8</liferay.version>
<liferay.auto.deploy.dir>F:\java\liferay-portal-6.1.20-ee-ga2\deploy</liferay.auto.deploy.dir>
<java-version>1.7</java-version>
<portlet-api.version>2.0</portlet-api.version>
<servlet-api.version>2.5</servlet-api.version>
<jsp-api.version>2.2</jsp-api.version>
<jstl.version>1.2</jstl.version>
<org.springframework-version>4.0.6.RELEASE</org.springframework-version>
<org.aspectj-version>1.8.1</org.aspectj-version>
<org.springframework-version>4.1.1.RELEASE</org.springframework-version>
<org.aspectj-version>1.8.2</org.aspectj-version>
<org.slf4j-version>1.7.7</org.slf4j-version>
</properties>

Expand Down

0 comments on commit 177b86a

Please sign in to comment.