Autodeploy-plugin konfat samt tillägg av dependency och ny version på
några tidigare dependencies Change-Id: I65d3389efdca67d9e4020b40d3f884a530f30567
This commit is contained in:
mpeters
parent
6b1f19049c
commit
6146b58826
99
pom.xml
99
pom.xml
@ -1,5 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<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/maven-v4_0_0.xsd">
|
||||
<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/maven-v4_0_0.xsd">
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>se.su.dsv</groupId>
|
||||
@ -18,10 +19,11 @@
|
||||
<url>http://wiquery.googlecode.com/svn/repo/</url>
|
||||
<layout>default</layout>
|
||||
</repository>
|
||||
|
||||
</repositories>
|
||||
|
||||
<dependencies>
|
||||
<!-- WICKET DEPENDENCIES -->
|
||||
<!-- WICKET DEPENDENCIES -->
|
||||
<dependency>
|
||||
<groupId>org.apache.wicket</groupId>
|
||||
<artifactId>wicket</artifactId>
|
||||
@ -45,10 +47,8 @@
|
||||
<version>${slf4j.version}</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<!--
|
||||
since we want the jcl over slf4j, we need to bump up the version of
|
||||
slf4j-api that wicket brings in
|
||||
-->
|
||||
<!-- since we want the jcl over slf4j, we need to bump up the version of
|
||||
slf4j-api that wicket brings in -->
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>jcl-over-slf4j</artifactId>
|
||||
@ -57,7 +57,7 @@
|
||||
<dependency>
|
||||
<groupId>log4j</groupId>
|
||||
<artifactId>log4j</artifactId>
|
||||
<version>1.2.14</version>
|
||||
<version>1.2.16</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
|
||||
@ -67,14 +67,14 @@
|
||||
<version>1.8.0.10</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>mysql</groupId>
|
||||
<artifactId>mysql-connector-java</artifactId>
|
||||
<version>5.1.13</version>
|
||||
<scope>runtime</scope>
|
||||
<groupId>mysql</groupId>
|
||||
<artifactId>mysql-connector-java</artifactId>
|
||||
<version>5.1.13</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
|
||||
|
||||
<!-- Spring Deps -->
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
@ -161,7 +161,7 @@
|
||||
<version>${hibernate.version}</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
|
||||
|
||||
<!-- Jackrabbit dependencies -->
|
||||
<dependency>
|
||||
<groupId>org.apache.jackrabbit</groupId>
|
||||
@ -184,8 +184,8 @@
|
||||
<version>2.1.3</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- Additional dependencies -->
|
||||
|
||||
<!-- Additional dependencies -->
|
||||
<dependency>
|
||||
<groupId>org.apache.wicket</groupId>
|
||||
<artifactId>wicket-extensions</artifactId>
|
||||
@ -236,8 +236,14 @@
|
||||
<version>2010-09-21</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Library with wicket components -->
|
||||
<dependency>
|
||||
<groupId>org.wamblee</groupId>
|
||||
<artifactId>wamblee-wicket-components</artifactId>
|
||||
<version>0.6</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
||||
|
||||
<version>0.1-SNAPSHOT</version>
|
||||
<build>
|
||||
@ -298,21 +304,60 @@
|
||||
<version>${jetty.version}</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-war-plugin</artifactId>
|
||||
<version>2.1.1</version>
|
||||
<configuration>
|
||||
<packagingExcludes>WEB-INF/web.xml</packagingExcludes>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<artifactId>maven-war-plugin</artifactId>
|
||||
<version>2.1.1</version>
|
||||
<configuration>
|
||||
<packagingExcludes>WEB-INF/web.xml</packagingExcludes>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<!-- Used for deploying directly from Maven/Eclipse -->
|
||||
<plugin>
|
||||
<groupId>org.codehaus.cargo</groupId>
|
||||
<artifactId>cargo-maven2-plugin</artifactId>
|
||||
|
||||
<configuration>
|
||||
<!-- Container configuration -->
|
||||
<container>
|
||||
<containerId>tomcat6x</containerId>
|
||||
<type>remote</type>
|
||||
</container>
|
||||
|
||||
<!-- Configuration to use with the Container -->
|
||||
<configuration>
|
||||
|
||||
<type>runtime</type>
|
||||
<properties>
|
||||
<cargo.tomcat.manager.url>https://thesis.dsv.su.se/manager</cargo.tomcat.manager.url>
|
||||
<cargo.remote.username>janne</cargo.remote.username>
|
||||
<cargo.remote.password>Lai2xoo6</cargo.remote.password>
|
||||
</properties>
|
||||
</configuration>
|
||||
|
||||
<!-- Deployer configuration -->
|
||||
<deployer>
|
||||
<type>remote</type>
|
||||
<deployables>
|
||||
<deployable>
|
||||
<groupId>se.su.dsv</groupId>
|
||||
<artifactId>SciPro</artifactId>
|
||||
<type>war</type>
|
||||
</deployable>
|
||||
</deployables>
|
||||
</deployer>
|
||||
|
||||
</configuration>
|
||||
|
||||
</plugin>
|
||||
</plugins>
|
||||
|
||||
|
||||
<finalName>scipro2</finalName>
|
||||
</build>
|
||||
|
||||
<properties>
|
||||
<slf4j.version>1.5.11</slf4j.version>
|
||||
<wicket.version>1.4.15</wicket.version>
|
||||
<wiquery.version>1.2.3</wiquery.version>
|
||||
<slf4j.version>1.6.1</slf4j.version>
|
||||
<wicket.version>1.4.17</wicket.version>
|
||||
<wiquery.version>1.2.4</wiquery.version>
|
||||
<jetty.version>6.1.25</jetty.version>
|
||||
<hibernate.version>3.5.1-Final</hibernate.version>
|
||||
<org.springframework.version>3.0.5.RELEASE</org.springframework.version>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user