-<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.7-SNAPSHOT</version>
- <name>MasterKey JSF</name>
- <packaging>jar</packaging>
- <description>MKJSF - JavaServer Faces library for MasterKey</description>
- <dependencies>
- <dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
- <version>6.0</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- JSF 2, JSP tag library, Weld, CDI -->
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.faces</artifactId>
- <version>2.1.21</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp.jstl</groupId>
- <artifactId>javax.servlet.jsp.jstl-api</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld.servlet</groupId>
- <artifactId>weld-servlet</artifactId>
- <version>1.1.10.Final</version>
- </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>
-
- <!-- Pazpar2 client -->
- <dependency>
- <groupId>com.indexdata</groupId>
- <artifactId>masterkey-common</artifactId>
- <version>0.1.10</version>
- </dependency>
- </dependencies>
- <build>
- <directory>target</directory>
- <outputDirectory>target/classes</outputDirectory>
- <sourceDirectory>src/main/java</sourceDirectory>
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>main/</exclude>
- <exclude>*.java</exclude>
- <exclude>META-INF/beans.xml</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <excludes>
- <exclude>src/META-INF/</exclude>
- </excludes>
- <source>1.6</source>
- <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>
++<<<<<<< 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">\r
+ <modelVersion>4.0.0</modelVersion>\r
+ <groupId>com.indexdata</groupId>\r
+ <artifactId>mkjsf</artifactId>\r
+ <version>0.0.7-SNAPSHOT</version>\r
+ <name>MasterKey JSF</name>\r
+ <packaging>jar</packaging>\r
+ <description>MKJSF - JavaServer Faces library for MasterKey</description>\r
+ <dependencies>\r
+ <dependency>\r
+ <groupId>javax</groupId>\r
+ <artifactId>javaee-api</artifactId>\r
+ <version>6.0</version>\r
+ <scope>provided</scope>\r
+ </dependency>\r
+\r
+ <!-- JSF 2, JSP tag library, Weld, CDI -->\r
+ <dependency>\r
+ <groupId>org.glassfish</groupId>\r
+ <artifactId>javax.faces</artifactId>\r
+ <version>2.1.21</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>javax.servlet.jsp.jstl</groupId>\r
+ <artifactId>javax.servlet.jsp.jstl-api</artifactId>\r
+ <version>1.2.1</version> \r
+ </dependency> \r
+ <dependency>\r
+ <groupId>org.jboss.weld.servlet</groupId>\r
+ <artifactId>weld-servlet</artifactId>\r
+ <version>1.1.10.Final</version> \r
+ </dependency> \r
+\r
+ <!-- File upload etc -->\r
+ <dependency>\r
+ <groupId>org.apache.myfaces.tomahawk</groupId>\r
+ <artifactId>tomahawk20</artifactId>\r
+ <version>1.1.10</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>commons-io</groupId>\r
+ <artifactId>commons-io</artifactId>\r
+ <version>2.1</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.apache.httpcomponents</groupId>\r
+ <artifactId>httpclient</artifactId>\r
+ <version>4.2.3</version>\r
+ </dependency>\r
+ \r
+ <!-- Pazpar2 client --> \r
+ <dependency>\r
+ <groupId>com.indexdata</groupId>\r
+ <artifactId>masterkey-common</artifactId>\r
+ <version>0.1.10</version>\r
+ </dependency>\r
+ </dependencies>\r
+ <build>\r
+ <directory>target</directory>\r
+ <outputDirectory>target/classes</outputDirectory>\r
+ <sourceDirectory>src/main/java</sourceDirectory>\r
+ <resources>\r
+ <resource>\r
+ <directory>src</directory>\r
+ <excludes> \r
+ <exclude>main/</exclude>\r
+ <exclude>*.java</exclude>\r
+ <exclude>META-INF/beans.xml</exclude>\r
+ </excludes>\r
+ </resource>\r
+ </resources>\r
+ <plugins>\r
+ <plugin>\r
+ <artifactId>maven-compiler-plugin</artifactId>\r
+ <version>2.3.2</version>\r
+ <configuration>\r
+ <excludes>\r
+ <exclude>src/META-INF/</exclude>\r
+ </excludes>\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
+ <plugin>\r
+ <groupId>org.apache.maven.plugins</groupId>\r
+ <artifactId>maven-jar-plugin</artifactId>\r
+ <version>2.2</version>\r
+ <configuration>\r
+ <classifier>${env}</classifier>\r
+ </configuration>\r
+ </plugin>\r
+ \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/pub/mkjsf</connection>\r
+ <url>http://gitid.indexdata.com/?p=mkjsf.git</url>\r
+ </scm>\r
+ \r
+ <properties>\r
+ <env />\r
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> \r
+ </properties>\r
+ \r
+ <profiles>\r
+ <profile>\r
+ <!-- Tomcat 7 profile, includes JSF 2.0 and Weld -->\r
+ <id>default</id>\r
+ <activation>\r
+ <activeByDefault>true</activeByDefault>\r
+ </activation>\r
+ <properties>\r
+ <env />\r
+ </properties>\r
+ <dependencies>\r
+ </dependencies>\r
+ <build>\r
+ <resources>\r
+ <resource>\r
+ <targetPath>META-INF</targetPath>\r
+ <directory>src/main/resources/tomcat</directory>\r
+ <includes>\r
+ <include>beans.xml</include>\r
+ </includes>\r
+ </resource>\r
+ </resources>\r
+ </build>\r
+ </profile>\r
+ <profile>\r
+ <!-- J2EE Application Server profile (Glassfish, JBoss) -->\r
+ <!-- beans.xml contains information of which configuration \r
+ scheme to inject. Optimally this would be decided at \r
+ the .war/application level, not at (this) jar/library\r
+ level, but for now this is necessary when using Glassfish\r
+ or JBoss -->\r
+ <id>as</id>\r
+ <properties>\r
+ <env>as</env>\r
+ </properties>\r
+ <dependencies>\r
+ </dependencies>\r
+ <build>\r
+ <resources>\r
+ <resource>\r
+ <targetPath>META-INF</targetPath>\r
+ <directory>src/main/resources/as</directory>\r
+ <includes>\r
+ <include>beans.xml</include>\r
+ </includes>\r
+ </resource>\r
+ </resources>\r
+ </build> \r
+ </profile>\r
+ </profiles>\r
- </project>\r
++</project>
projects / mkjsf-moved-to-github.git / commitdiff