Author: maven-release Date: 2011-08-30 14:08:41 +0200 (Tue, 30 Aug 2011) New Revision: 1205 Url: http://nuiton.org/repositories/revision/wikitty/1205 Log: prepare wikitty release Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-api/src/license/THIRD-PARTY.properties trunk/wikitty-dto/src/license/THIRD-PARTY.properties trunk/wikitty-generators/pom.xml trunk/wikitty-solr/pom.xml trunk/wikitty-solr/src/license/THIRD-PARTY.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-30 11:09:30 UTC (rev 1204) +++ trunk/pom.xml 2011-08-30 12:08:41 UTC (rev 1205) @@ -399,7 +399,7 @@ <dependency> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>${deploySiteVersion}</version> + <version>${sitePluginVersion}</version> </dependency> <dependency> @@ -524,19 +524,6 @@ <artifactId>plexus-utils</artifactId> <version>1.5.15</version> </dependency> - - <!-- Maven plugin for wikitty publication specific dependency --> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>${jettyPluginVersion}</version> - </dependency> - - <dependency> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>${sitePluginVersion}</version> - </dependency> </dependencies> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-08-30 11:09:30 UTC (rev 1204) +++ trunk/wikitty-api/pom.xml 2011-08-30 12:08:41 UTC (rev 1205) @@ -255,16 +255,16 @@ <!-- Commented because some test are in fail : http://www.nuiton.org/issues/show/1160 - and http://www.nuiton.org/issues/show/1160--> + and http://www.nuiton.org/issues/show/1161--> <profile> <id>run-its</id> - <activation> + <!--activation> <property> <name>performRelease</name> <value>true</value> </property> - </activation> + </activation--> <build> <defaultGoal>integration-test</defaultGoal> <plugins> Modified: trunk/wikitty-api/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-api/src/license/THIRD-PARTY.properties 2011-08-30 11:09:30 UTC (rev 1204) +++ trunk/wikitty-api/src/license/THIRD-PARTY.properties 2011-08-30 12:08:41 UTC (rev 1205) @@ -19,9 +19,8 @@ # Please fill the missing licenses for dependencies : # # -#Thu Aug 18 08:18:18 CEST 2011 +#Tue Aug 30 13:58:45 CEST 2011 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. -dom4j--dom4j--1.6.1=BSD License javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-dto/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-dto/src/license/THIRD-PARTY.properties 2011-08-30 11:09:30 UTC (rev 1204) +++ trunk/wikitty-dto/src/license/THIRD-PARTY.properties 2011-08-30 12:08:41 UTC (rev 1205) @@ -15,17 +15,12 @@ # - Public domain # - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. # - The Apache Software License, Version 2.0 -# - http://jaxen.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Aug 18 08:18:39 CEST 2011 +#Tue Aug 30 13:59:05 CEST 2011 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. -dom4j--dom4j--1.6.1=BSD License javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -jaxen--jaxen--1.1.1=http\://jaxen.codehaus.org/license.html -jdom--jdom--1.0=The Apache Software License, Version 2.0 -xalan--xalan--2.6.0=The Apache Software License, Version 2.0 xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2011-08-30 11:09:30 UTC (rev 1204) +++ trunk/wikitty-generators/pom.xml 2011-08-30 12:08:41 UTC (rev 1205) @@ -26,6 +26,10 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> </dependency> Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-08-30 11:09:30 UTC (rev 1204) +++ trunk/wikitty-solr/pom.xml 2011-08-30 12:08:41 UTC (rev 1205) @@ -59,12 +59,13 @@ <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> </dependency> - + <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>runtime</scope> + <groupId>org.jboss.jbossts</groupId> + <artifactId>jbossjta</artifactId> + <scope>compile</scope> </dependency> + <dependency> <groupId>commons-logging</groupId> Modified: trunk/wikitty-solr/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-solr/src/license/THIRD-PARTY.properties 2011-08-30 11:09:30 UTC (rev 1204) +++ trunk/wikitty-solr/src/license/THIRD-PARTY.properties 2011-08-30 12:08:41 UTC (rev 1205) @@ -21,14 +21,12 @@ # Please fill the missing licenses for dependencies : # # -#Thu Aug 18 08:18:43 CEST 2011 +#Tue Aug 30 14:05:53 CEST 2011 antlr--antlr--2.7.2=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. dom4j--dom4j--1.1=BSD License -dom4j--dom4j--1.6.1=BSD License jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0 -javax.servlet--servlet-api--2.5=Common Development and Distribution License (CDDL) v1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0 oro--oro--2.0.8=The Apache Software License, Version 2.0