X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=pom.xml;h=c79777fc7ae1e836c3202257731c00a7f78e6638;hb=1d3e5272a80d5890a3618912e6799f436dc2911b;hp=4a9a8b45f4d4265034f1a2912d337eead103d5b5;hpb=801fbed2d559e224160d473e0860dd765354569f;p=mkjsf-moved-to-github.git

diff --git a/pom.xml b/pom.xml
index 4a9a8b4..c79777f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,12 @@
+<<<<<<< HEAD
 <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">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.indexdata</groupId>
   <artifactId>mkjsf</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
-  <name>mkjsf</name>
+  <version>0.0.7-SNAPSHOT</version>
+  <name>MasterKey JSF</name>
   <packaging>jar</packaging>
-  <description>Components for building Pazpar2 application using JSF</description>
+  <description>MKJSF - JavaServer Faces library for MasterKey</description>
     <dependencies>
     <dependency>
       <groupId>javax</groupId>
@@ -14,7 +15,7 @@
       <scope>provided</scope>
     </dependency>
 
-    <!-- JSF 2 -->
+    <!-- JSF 2, JSP tag library, Weld, CDI -->
     <dependency>
       <groupId>org.glassfish</groupId>
       <artifactId>javax.faces</artifactId>
@@ -24,26 +25,37 @@
       <groupId>javax.servlet.jsp.jstl</groupId>
       <artifactId>javax.servlet.jsp.jstl-api</artifactId>
       <version>1.2.1</version>      
-    </dependency>
-    <!-- Weld, Dependency Injection (CDI) -->
+    </dependency>    
     <dependency>
       <groupId>org.jboss.weld.servlet</groupId>
       <artifactId>weld-servlet</artifactId>
       <version>1.1.10.Final</version>      
-    </dependency>    
+    </dependency> 
+
+    <!-- File upload etc -->
+    <dependency>
+      <groupId>org.apache.myfaces.tomahawk</groupId>
+      <artifactId>tomahawk20</artifactId>
+      <version>1.1.10</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.1</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
       <version>4.2.3</version>
-    </dependency>    
-    
+    </dependency>
+     
+    <!-- Pazpar2 client -->   
     <dependency>
       <groupId>com.indexdata</groupId>
       <artifactId>masterkey-common</artifactId>
-      <version>0.1.10-SNAPSHOT</version>
+      <version>0.1.10</version>
     </dependency>
   </dependencies>
-
   <build>
     <directory>target</directory>
     <outputDirectory>target/classes</outputDirectory>
@@ -54,6 +66,7 @@
         <excludes>          
           <exclude>main/</exclude>
           <exclude>*.java</exclude>
+          <exclude>META-INF/beans.xml</exclude>
         </excludes>
       </resource>
     </resources>
@@ -69,6 +82,117 @@
           <target>1.6</target>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-release-plugin</artifactId>
+        <version>2.2.2</version>
+        <configuration>
+          <preparationGoals>clean verify</preparationGoals>
+          <releaseProfiles>production</releaseProfiles>
+          <tagNameFormat>v@{project.version}</tagNameFormat>
+          <pushChanges>false</pushChanges>
+          <localCheckout>true</localCheckout>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.2</version>
+        <configuration>
+          <classifier>${env}</classifier>
+        </configuration>
+      </plugin>
+      
     </plugins>
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.wagon</groupId>
+        <artifactId>wagon-ssh</artifactId>
+        <version>1.0-beta-6</version>
+      </extension>
+      <extension>
+        <groupId>org.apache.maven.wagon</groupId>
+        <artifactId>wagon-ssh-external</artifactId>
+        <version>2.2</version>
+      </extension>
+    </extensions>
   </build>
+  <distributionManagement>
+    <repository>
+      <uniqueVersion>false</uniqueVersion>
+      <id>id-maven-repo</id>
+      <name>Index Data Maven Repository</name>
+      <url>scp://maven.indexdata.com:222/var/www/maven/repository</url>
+    </repository>
+    <site>
+      <id>id-website</id>
+      <url>scpexe://www.indexdata.com/var/www/software/mkjsf/</url>
+    </site>
+  </distributionManagement>  
+  <repositories>
+    <repository>
+      <id>id-maven-repo</id>
+      <url>http://maven.indexdata.com</url>
+    </repository>
+  </repositories>
+  <scm>
+    <connection>scm:git:ssh://git.indexdata.com:222/home/git/pub/mkjsf</connection>
+    <url>http://gitid.indexdata.com/?p=mkjsf.git</url>
+  </scm>
+  
+  <properties>
+    <env />
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>    
+  </properties>
+  
+  <profiles>
+    <profile>
+      <!-- Tomcat 7 profile, includes JSF 2.0 and Weld -->
+      <id>default</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <env />
+      </properties>
+      <dependencies>
+      </dependencies>
+      <build>
+        <resources>
+          <resource>
+            <targetPath>META-INF</targetPath>
+            <directory>src/main/resources/tomcat</directory>
+            <includes>
+              <include>beans.xml</include>
+            </includes>
+          </resource>
+        </resources>
+      </build>
+    </profile>
+    <profile>
+      <!-- J2EE Application Server profile (Glassfish, JBoss) -->
+      <!-- beans.xml contains information of which configuration 
+           scheme to inject. Optimally this would be decided at 
+           the .war/application level, not at (this) jar/library
+           level, but for now this is necessary when using Glassfish
+           or JBoss -->
+      <id>as</id>
+      <properties>
+        <env>as</env>
+      </properties>
+      <dependencies>
+      </dependencies>
+      <build>
+        <resources>
+          <resource>
+            <targetPath>META-INF</targetPath>
+            <directory>src/main/resources/as</directory>
+            <includes>
+              <include>beans.xml</include>
+            </includes>
+          </resource>
+        </resources>
+      </build>      
+    </profile>
+  </profiles>
 </project>
\ No newline at end of file