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

MAVEN-4 #10

Closed
wants to merge 3 commits into from
Closed

MAVEN-4 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
241347b
[maven-release-plugin] prepare release 6.1.0
brianchandotcom Jan 9, 2012
201352d
[maven-release-plugin] prepare for next development iteration
brianchandotcom Jan 9, 2012
26130e6
MAVEN-4 Incorrect version of slf4j is loaded which causes error when …
mikakoivisto Feb 1, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions archetypes/liferay-ext-archetype/pom.xml
View file
Open in desktop
Expand Up @@ -4,15 +4,15 @@
<parent>
<groupId>com.liferay.maven</groupId>
<artifactId>liferay-archetypes</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.liferay.maven.archetypes</groupId>
<artifactId>liferay-ext-archetype</artifactId>
<packaging>maven-archetype</packaging>
<name>Liferay Maven 2 Ext Archetype</name>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<description>Provides an archetype to create Liferay extensions.</description>
<build>
<extensions>
Expand Down
4 changes: 2 additions & 2 deletions archetypes/liferay-hook-archetype/pom.xml
View file
Open in desktop
Expand Up @@ -4,15 +4,15 @@
<parent>
<groupId>com.liferay.maven</groupId>
<artifactId>liferay-archetypes</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.liferay.maven.archetypes</groupId>
<artifactId>liferay-hook-archetype</artifactId>
<packaging>maven-archetype</packaging>
<name>Liferay Maven 2 Hook Archetype</name>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<description>Provides an archetype to create Liferay hooks.</description>
<build>
<extensions>
Expand Down
4 changes: 2 additions & 2 deletions archetypes/liferay-layouttpl-archetype/pom.xml
View file
Open in desktop
Expand Up @@ -4,15 +4,15 @@
<parent>
<groupId>com.liferay.maven</groupId>
<artifactId>liferay-archetypes</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.liferay.maven.archetypes</groupId>
<artifactId>liferay-layouttpl-archetype</artifactId>
<packaging>maven-archetype</packaging>
<name>Liferay Maven 2 Layout Template Archetype</name>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<description>Provides an archetype to create Liferay layout templates.</description>
<build>
<extensions>
Expand Down
4 changes: 2 additions & 2 deletions archetypes/liferay-portlet-archetype/pom.xml
View file
Open in desktop
Expand Up @@ -4,15 +4,15 @@
<parent>
<groupId>com.liferay.maven</groupId>
<artifactId>liferay-archetypes</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.liferay.maven.archetypes</groupId>
<artifactId>liferay-portlet-archetype</artifactId>
<packaging>maven-archetype</packaging>
<name>Liferay Maven 2 Portlet Archetype</name>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<description>Provides an archetype to create Liferay portlets.</description>
<build>
<extensions>
Expand Down
4 changes: 2 additions & 2 deletions archetypes/liferay-servicebuilder-archetype/pom.xml
View file
Open in desktop
Expand Up @@ -4,15 +4,15 @@
<parent>
<groupId>com.liferay.maven</groupId>
<artifactId>liferay-archetypes</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.liferay.maven.archetypes</groupId>
<artifactId>liferay-servicebuilder-archetype</artifactId>
<packaging>maven-archetype</packaging>
<name>Liferay Maven 2 ServiceBuilder Archetype</name>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<description>Provides an archetype to create Liferay Service Builder portlets.</description>
<build>
<extensions>
Expand Down
4 changes: 2 additions & 2 deletions archetypes/liferay-theme-archetype/pom.xml
View file
Open in desktop
Expand Up @@ -4,15 +4,15 @@
<parent>
<groupId>com.liferay.maven</groupId>
<artifactId>liferay-archetypes</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.liferay.maven.archetypes</groupId>
<artifactId>liferay-theme-archetype</artifactId>
<packaging>maven-archetype</packaging>
<name>Liferay Maven 2 Theme Archetype</name>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<description>Provides an archetype to create Liferay themes.</description>
<build>
<extensions>
Expand Down
4 changes: 2 additions & 2 deletions archetypes/liferay-web-archetype/pom.xml
View file
Open in desktop
Expand Up @@ -4,15 +4,15 @@
<parent>
<groupId>com.liferay.maven</groupId>
<artifactId>liferay-archetypes</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.liferay.maven.archetypes</groupId>
<artifactId>liferay-web-archetype</artifactId>
<packaging>maven-archetype</packaging>
<name>Liferay Maven 2 Web Archetype</name>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<description>Provides an archetype to create Liferay webs.</description>
<build>
<extensions>
Expand Down
4 changes: 2 additions & 2 deletions archetypes/pom.xml
View file
Open in desktop
Expand Up @@ -4,15 +4,15 @@
<parent>
<groupId>com.liferay.maven</groupId>
<artifactId>maven-support</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.liferay.maven</groupId>
<artifactId>liferay-archetypes</artifactId>
<packaging>pom</packaging>
<name>Liferay Maven 2 Archetypes</name>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<description>Parent project to support Liferay archetypes.</description>
<modules>
<module>liferay-ext-archetype</module>
Expand Down
23 changes: 12 additions & 11 deletions plugins/liferay-maven-plugin/pom.xml
View file
Open in desktop
Expand Up @@ -4,15 +4,15 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>com.liferay.maven</groupId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.liferay.maven.plugins</groupId>
<artifactId>liferay-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Liferay Maven 2 Plugin</name>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<description>Contains goals to manage Liferay plugins.</description>
<build>
<plugins>
Expand Down Expand Up @@ -160,7 +160,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.15</version>
<version>1.2.16</version>
<exclusions>
<exclusion>
<groupId>com.sun.jdmk</groupId>
Expand Down Expand Up @@ -201,11 +201,17 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
<version>2.1.2</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>0.8</version>
<version>0.9</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
Expand All @@ -230,17 +236,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.5.11</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.5.11</version>
<version>1.6.4</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>3.0.5.RELEASE</version>
<version>3.0.6.RELEASE</version>
</dependency>
<dependency>
<groupId>oro</groupId>
Expand Down
4 changes: 2 additions & 2 deletions plugins/pom.xml
View file
Open in desktop
Expand Up @@ -4,15 +4,15 @@
<parent>
<groupId>com.liferay.maven</groupId>
<artifactId>maven-support</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.liferay.maven</groupId>
<artifactId>plugins</artifactId>
<packaging>pom</packaging>
<name>Liferay Maven 2 Plugins</name>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<description>Parent project to support Liferay plugins.</description>
<modules>
<module>liferay-maven-plugin</module>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
<artifactId>maven-support</artifactId>
<packaging>pom</packaging>
<name>Liferay Maven 2 Support</name>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<description>Parent project to support Maven 2 subprojects.</description>
<url>http://www.liferay.com</url>
<developers>
Expand Down