Merge pull request #1 from parsek-doo/master

Upgrade to LR 6.2

.gitignore

@@ -1 +1,3 @@
 target
+.idea
+liferay-shibboleth-plugin.iml

pom.xml

@@ -7,10 +7,10 @@
     <packaging>war</packaging>
     <name>liferay-shibboleth-plugin</name>
     <url>https://github.com/ivan-novakov/liferay-shibboleth-plugin</url>
-    <version>1.1</version>
+    <version>1.2</version>
     <properties>
         <liferay.auto.deploy.dir>/opt/lr/deploy</liferay.auto.deploy.dir>
-        <liferay.version>6.1.0</liferay.version>
+        <liferay.version>6.2.0-RC5</liferay.version>
     </properties>
     <build>
         <finalName>shibboleth-plugin-hook</finalName>
@@ -29,8 +29,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <encoding>UTF-8</encoding>
-                    <source>1.5</source>
-                    <target>1.5</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -39,6 +39,25 @@
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <webResources>
+                        <resource>
+                            <filtering>true</filtering>
+                            <directory>src/main/webapp</directory>
+                            <includes>
+                                <include>**/liferay-plugin-package.xml</include>
+                                <include>**/web.xml</include>
+                            </includes>
+                        </resource>
+                    </webResources>
+                    <warSourceDirectory>src/main/webapp</warSourceDirectory>
+                    <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <dependencies>