Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkjsf.git into...

[mkjsf-moved-to-github.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 4de438a..598ab0d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
   <modelVersion>4.0.0</modelVersion>\r
   <groupId>com.indexdata</groupId>\r
-  <artifactId>pz2utils4jsf-as</artifactId>\r
-  <version>0.0.1-SNAPSHOT</version>\r
-  <name>pz2utils4jsf-as</name>\r
+  <artifactId>mkjsf</artifactId>\r
+  <version>0.0.3-SNAPSHOT</version>\r
+  <name>MasterKey JSF</name>\r
   <packaging>jar</packaging>\r
-  <description>Components for building Pazpar2 application using JSF. Application server version</description>\r
+  <description>MKJSF - JavaServer Faces library for MasterKey</description>\r
     <dependencies>\r
     <dependency>\r
       <groupId>javax</groupId>\r
@@ -18,8 +18,8 @@
     <dependency>\r
       <groupId>org.glassfish</groupId>\r
       <artifactId>javax.faces</artifactId>\r
-      <version>2.1.16</version>\r
       <scope>provided</scope>\r
+      <version>2.1.21</version>\r
     </dependency>\r
     <dependency>\r
       <groupId>javax.servlet.jsp.jstl</groupId>\r
@@ -33,15 +33,29 @@
       <artifactId>weld-servlet</artifactId>\r
       <version>1.1.10.Final</version>\r
       <scope>provided</scope>\r
+    </dependency>    \r
+    <dependency>\r
+      <groupId>org.apache.httpcomponents</groupId>\r
+      <artifactId>httpclient</artifactId>\r
+      <version>4.2.3</version>\r
+    </dependency>\r
+    <!-- File upload -->\r
+    <dependency>\r
+      <groupId>org.apache.myfaces.tomahawk</groupId>\r
+      <artifactId>tomahawk20</artifactId>\r
+      <version>1.1.10</version>\r
     </dependency>\r
-    \r
+    <dependency>\r
+      <groupId>commons-io</groupId>\r
+      <artifactId>commons-io</artifactId>\r
+      <version>2.1</version>\r
+    </dependency>    \r
     <dependency>\r
       <groupId>com.indexdata</groupId>\r
       <artifactId>masterkey-common</artifactId>\r
-      <version>0.1.10-SNAPSHOT</version>\r
+      <version>0.1.10</version>\r
     </dependency>\r
   </dependencies>\r
-\r
   <build>\r
     <directory>target-as</directory>\r
     <outputDirectory>target-as/classes</outputDirectory>\r
@@ -63,10 +77,61 @@
           <excludes>\r
              <exclude>src/META-INF/</exclude>\r
           </excludes>\r
-          <source>1.7</source>\r
-          <target>1.7</target>\r
+          <source>1.6</source>\r
+          <target>1.6</target>\r
+        </configuration>\r
+      </plugin>\r
+      <plugin>\r
+        <groupId>org.apache.maven.plugins</groupId>\r
+        <artifactId>maven-release-plugin</artifactId>\r
+        <version>2.2.2</version>\r
+        <configuration>\r
+          <preparationGoals>clean verify</preparationGoals>\r
+          <releaseProfiles>production</releaseProfiles>\r
+          <tagNameFormat>v@{project.version}</tagNameFormat>\r
+          <pushChanges>false</pushChanges>\r
+          <localCheckout>true</localCheckout>\r
         </configuration>\r
       </plugin>\r
     </plugins>\r
+    <extensions>\r
+      <extension>\r
+        <groupId>org.apache.maven.wagon</groupId>\r
+        <artifactId>wagon-ssh</artifactId>\r
+        <version>1.0-beta-6</version>\r
+      </extension>\r
+      <extension>\r
+        <groupId>org.apache.maven.wagon</groupId>\r
+        <artifactId>wagon-ssh-external</artifactId>\r
+        <version>2.2</version>\r
+      </extension>\r
+    </extensions>\r
   </build>\r
+  <distributionManagement>\r
+    <repository>\r
+      <uniqueVersion>false</uniqueVersion>\r
+      <id>id-maven-repo</id>\r
+      <name>Index Data Maven Repository</name>\r
+      <url>scp://maven.indexdata.com:222/var/www/maven/repository</url>\r
+    </repository>\r
+    <site>\r
+      <id>id-website</id>\r
+      <url>scpexe://www.indexdata.com/var/www/software/mkjsf/</url>\r
+    </site>\r
+  </distributionManagement>  \r
+  <repositories>\r
+    <repository>\r
+      <id>id-maven-repo</id>\r
+      <url>http://maven.indexdata.com</url>\r
+    </repository>\r
+  </repositories>\r
+  <scm>\r
+    <connection>scm:git:ssh://git.indexdata.com:222/home/git/private/mkjsf</connection>\r
+    <url>http://gitid.indexdata.com/?p=mkjsf.git</url>\r
+  </scm>\r
+  \r
+  <properties>\r
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
+  </properties>\r
+  \r
 </project>
\ No newline at end of file