You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2012/04/01 15:29:48 UTC
svn commit: r1308106 - in /incubator/lcf/branches/CONNECTORS-437: ./
connectors/alfresco/ connectors/cmis/ connectors/rss/
connectors/webcrawler/ connectors/wiki/ framework/ framework/api-service/
framework/authority-service/ framework/authority-servle...
Author: kwright
Date: Sun Apr 1 13:29:47 2012
New Revision: 1308106
URL: http://svn.apache.org/viewvc?rev=1308106&view=rev
Log:
Fix up pom's to work with revised ant build
Modified:
incubator/lcf/branches/CONNECTORS-437/connectors/alfresco/pom.xml
incubator/lcf/branches/CONNECTORS-437/connectors/cmis/pom.xml
incubator/lcf/branches/CONNECTORS-437/connectors/rss/pom.xml
incubator/lcf/branches/CONNECTORS-437/connectors/webcrawler/pom.xml
incubator/lcf/branches/CONNECTORS-437/connectors/wiki/pom.xml
incubator/lcf/branches/CONNECTORS-437/framework/api-service/pom.xml
incubator/lcf/branches/CONNECTORS-437/framework/authority-service/pom.xml
incubator/lcf/branches/CONNECTORS-437/framework/authority-servlet/pom.xml
incubator/lcf/branches/CONNECTORS-437/framework/build.xml
incubator/lcf/branches/CONNECTORS-437/framework/core/pom.xml
incubator/lcf/branches/CONNECTORS-437/framework/crawler-ui/pom.xml
incubator/lcf/branches/CONNECTORS-437/framework/jetty-runner/pom.xml
incubator/lcf/branches/CONNECTORS-437/framework/pull-agent/pom.xml
incubator/lcf/branches/CONNECTORS-437/framework/ui-core/pom.xml
incubator/lcf/branches/CONNECTORS-437/mvn-bootstrap.bat
incubator/lcf/branches/CONNECTORS-437/mvn-bootstrap.sh
incubator/lcf/branches/CONNECTORS-437/pom.xml
incubator/lcf/branches/CONNECTORS-437/tests/alfresco/pom.xml
incubator/lcf/branches/CONNECTORS-437/tests/cmis/pom.xml
incubator/lcf/branches/CONNECTORS-437/tests/elasticsearch/pom.xml
incubator/lcf/branches/CONNECTORS-437/tests/filesystem/pom.xml
incubator/lcf/branches/CONNECTORS-437/tests/rss/pom.xml
incubator/lcf/branches/CONNECTORS-437/tests/sharepoint/pom.xml
incubator/lcf/branches/CONNECTORS-437/tests/wiki/pom.xml
Modified: incubator/lcf/branches/CONNECTORS-437/connectors/alfresco/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/connectors/alfresco/pom.xml?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/connectors/alfresco/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/connectors/alfresco/pom.xml Sun Apr 1 13:29:47 2012
@@ -207,6 +207,8 @@
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
+
+ <!-- Test scope -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: incubator/lcf/branches/CONNECTORS-437/connectors/cmis/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/connectors/cmis/pom.xml?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/connectors/cmis/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/connectors/cmis/pom.xml Sun Apr 1 13:29:47 2012
@@ -116,6 +116,8 @@
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
+
+ <!-- Test scope -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: incubator/lcf/branches/CONNECTORS-437/connectors/rss/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/connectors/rss/pom.xml?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/connectors/rss/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/connectors/rss/pom.xml Sun Apr 1 13:29:47 2012
@@ -90,23 +90,23 @@
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient-mcf</artifactId>
- <version>3.1</version>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons-httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.5</version>
+ <version>${commons-codec.version}</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
- <artifactId>xercesImpl-mcf</artifactId>
- <version>2.9.1</version>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: incubator/lcf/branches/CONNECTORS-437/connectors/webcrawler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/connectors/webcrawler/pom.xml?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/connectors/webcrawler/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/connectors/webcrawler/pom.xml Sun Apr 1 13:29:47 2012
@@ -90,23 +90,23 @@
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient-mcf</artifactId>
- <version>3.1</version>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons-httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.5</version>
+ <version>${commons-codec.version}</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
- <artifactId>xercesImpl-mcf</artifactId>
- <version>2.9.1</version>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: incubator/lcf/branches/CONNECTORS-437/connectors/wiki/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/connectors/wiki/pom.xml?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/connectors/wiki/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/connectors/wiki/pom.xml Sun Apr 1 13:29:47 2012
@@ -90,23 +90,23 @@
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient-mcf</artifactId>
- <version>3.1</version>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons-httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.5</version>
+ <version>${commons-codec.version}</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
- <artifactId>xercesImpl-mcf</artifactId>
- <version>2.9.1</version>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: incubator/lcf/branches/CONNECTORS-437/framework/api-service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/framework/api-service/pom.xml?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/framework/api-service/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/framework/api-service/pom.xml Sun Apr 1 13:29:47 2012
@@ -55,7 +55,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>
@@ -63,19 +63,19 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.0.1</version>
+ <version>${commons-io.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.5</version>
+ <version>${commons-codec.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
- <version>1.0</version>
+ <version>${commons-el.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -87,37 +87,37 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
+ <version>${commons-httpclient.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
+ <version>${commons-collections.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2.2</version>
+ <version>${commons-fileupload.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>serializer</artifactId>
- <version>2.7.1</version>
+ <version>${xalan.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
- <artifactId>xercesImpl-mcf</artifactId>
- <version>2.9.1</version>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <version>${commons-logging.version}</version>
<scope>runtime</scope>
</dependency>
@@ -151,7 +151,7 @@
<dependency>
<groupId>net.sourceforge.jtds</groupId>
<artifactId>jtds</artifactId>
- <version>1.2.4</version>
+ <version>${jtds.version}</version>
<scope>runtime</scope>
</dependency>
Modified: incubator/lcf/branches/CONNECTORS-437/framework/authority-service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/framework/authority-service/pom.xml?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/framework/authority-service/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/framework/authority-service/pom.xml Sun Apr 1 13:29:47 2012
@@ -55,7 +55,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>
@@ -63,19 +63,19 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.0.1</version>
+ <version>${commons-io.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.5</version>
+ <version>${commons-codec.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
- <version>1.0</version>
+ <version>${commons-el.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -86,38 +86,38 @@
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient-mcf</artifactId>
- <version>3.1</version>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons-httpclient.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
+ <version>${commons-collections.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2.2</version>
+ <version>${commons-fileupload.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>serializer</artifactId>
- <version>2.7.1</version>
+ <version>{xalan.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
- <artifactId>xercesImpl-mcf</artifactId>
- <version>2.9.1</version>
+ <artifactId>xercesImpl</artifactId>
+ <version>{xerces.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <version>${commons-logging.version}</version>
<scope>runtime</scope>
</dependency>
@@ -151,7 +151,7 @@
<dependency>
<groupId>net.sourceforge.jtds</groupId>
<artifactId>jtds</artifactId>
- <version>1.2.4</version>
+ <version>${jtds.version}</version>
<scope>runtime</scope>
</dependency>
Modified: incubator/lcf/branches/CONNECTORS-437/framework/authority-servlet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/framework/authority-servlet/pom.xml?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/framework/authority-servlet/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/framework/authority-servlet/pom.xml Sun Apr 1 13:29:47 2012
@@ -50,7 +50,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: incubator/lcf/branches/CONNECTORS-437/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/framework/build.xml?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/framework/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/framework/build.xml Sun Apr 1 13:29:47 2012
@@ -43,7 +43,7 @@
<include name="commons-io*.jar"/>
<include name="commons-lang*.jar"/>
<include name="commons-logging*.jar"/>
- <include name="eclipse*.jar"/>
+ <include name="ecj*.jar"/>
<include name="jasper*.jar"/>
<include name="jetty*.jar"/>
<include name="jdbcpool*.jar"/>
@@ -684,7 +684,7 @@
<fileset dir="../lib">
<include name="jetty*.jar"/>
<include name="servlet-api*.jar"/>
- <include name="eclipse*.jar"/>
+ <include name="ecj*.jar"/>
<include name="jasper*.jar"/>
<include name="tomcat-juli*.jar"/>
<include name="jsp-api*.jar"/>
@@ -725,7 +725,7 @@
<fileset dir="../lib">
<include name="jetty*.jar"/>
<include name="servlet-api*.jar"/>
- <include name="eclipse*.jar"/>
+ <include name="ecj*.jar"/>
<include name="jasper*.jar"/>
<include name="tomcat-juli*.jar"/>
<include name="jsp-api*.jar"/>
@@ -778,7 +778,7 @@
<include name="commons-io*.jar"/>
<include name="commons-lang*.jar"/>
<include name="commons-logging*.jar"/>
- <include name="eclipse*.jar"/>
+ <include name="ecj*.jar"/>
<include name="jasper*.jar"/>
<include name="jdbcpool*.jar"/>
<include name="jetty*.jar"/>
@@ -897,7 +897,7 @@
<include name="commons-io*.jar"/>
<include name="commons-lang*.jar"/>
<include name="commons-logging*.jar"/>
- <include name="eclipse*.jar"/>
+ <include name="ecj*.jar"/>
<include name="jasper*.jar"/>
<include name="jdbcpool*.jar"/>
<include name="jetty*.jar"/>
Modified: incubator/lcf/branches/CONNECTORS-437/framework/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/framework/core/pom.xml?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/framework/core/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/framework/core/pom.xml Sun Apr 1 13:29:47 2012
@@ -58,17 +58,17 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.16</version>
+ <version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>com.bitmechanic</groupId>
<artifactId>jdbcpool</artifactId>
- <version>0.99</version>
+ <version>${jdbcpool.version}</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- <version>20090211</version>
+ <version>${json.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.7</version>
+ <version>${velocity.version}</version>
</dependency>
</dependencies>
</project>
Modified: incubator/lcf/branches/CONNECTORS-437/framework/crawler-ui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/framework/crawler-ui/pom.xml?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/framework/crawler-ui/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/framework/crawler-ui/pom.xml Sun Apr 1 13:29:47 2012
@@ -55,27 +55,33 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>
<!-- runtime dependencies -->
<dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>${jstl.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.0.1</version>
+ <version>${commons-io.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.5</version>
+ <version>${commons-codec.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
- <version>1.0</version>
+ <version>${commons-el.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -86,58 +92,58 @@
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient-mcf</artifactId>
- <version>3.1</version>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons-httpclient.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
+ <version>${commons-collections.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2.2</version>
+ <version>${commons-fileupload.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>serializer</artifactId>
- <version>2.7.1</version>
+ <version>${xalan.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
- <artifactId>xercesImpl-mcf</artifactId>
- <version>2.9.1</version>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <version>${commons-logging.version}</version>
<scope>runtime</scope>
</dependency>
-
+
<!-- database dependencies -->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.7.1.1</version>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>2.2.4</version>
+ <version>${hsqldb.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>8.4-702.jdbc4</version>
+ <version>${postgresql.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -151,7 +157,7 @@
<dependency>
<groupId>net.sourceforge.jtds</groupId>
<artifactId>jtds</artifactId>
- <version>1.2.4</version>
+ <version>${jtds.version}</version>
<scope>runtime</scope>
</dependency>
Modified: incubator/lcf/branches/CONNECTORS-437/framework/jetty-runner/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/framework/jetty-runner/pom.xml?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/framework/jetty-runner/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/framework/jetty-runner/pom.xml Sun Apr 1 13:29:47 2012
@@ -206,7 +206,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -217,17 +217,17 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-api-2.1</artifactId>
- <version>6.1.14</version>
+ <version>${jsp-api-2.1.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <version>${jsp-api.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1-glassfish</artifactId>
- <version>2.1.v20091210</version>
+ <version>${jsp-2.1-glassfish.version}</version>
</dependency>
<!-- databases -->
@@ -242,7 +242,7 @@
<dependency>
<groupId>net.sourceforge.jtds</groupId>
<artifactId>jtds</artifactId>
- <version>1.2.4</version>
+ <version>${jtds.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -262,25 +262,25 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.6</version>
+ <version>${commons-lang.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.3.2</version>
+ <version>${commons-io.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.5</version>
+ <version>${commons-codec.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
- <version>1.0</version>
+ <version>${commons-el.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -291,38 +291,38 @@
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient-mcf</artifactId>
- <version>3.1</version>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons-httpclient.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
+ <version>${commons-collections.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2.2</version>
+ <version>${commons-fileupload.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>serializer</artifactId>
- <version>2.7.1</version>
+ <version>${xalan.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
- <artifactId>xercesImpl-mcf</artifactId>
- <version>2.9.1</version>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <version>${commons-logging.version}</version>
<scope>runtime</scope>
</dependency>
Modified: incubator/lcf/branches/CONNECTORS-437/framework/pull-agent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/framework/pull-agent/pom.xml?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/framework/pull-agent/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/framework/pull-agent/pom.xml Sun Apr 1 13:29:47 2012
@@ -84,38 +84,38 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-api-2.1</artifactId>
- <version>6.1.14</version>
+ <version>${jsp-api-2.1.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <version>${jsp-api.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1-glassfish</artifactId>
- <version>2.1.v20091210</version>
+ <version>${jsp-2.1-glassfish.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient-mcf</artifactId>
- <version>3.1</version>
+ <version>${commons-httpclient.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <version>${commons-logging.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.5</version>
+ <version>${commons-codec.version}</version>
<scope>test</scope>
</dependency>
Modified: incubator/lcf/branches/CONNECTORS-437/framework/ui-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/framework/ui-core/pom.xml?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/framework/ui-core/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/framework/ui-core/pom.xml Sun Apr 1 13:29:47 2012
@@ -65,13 +65,13 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <version>${jsp-api.version}</version>
<scope>provided</scope>
</dependency>
@@ -79,22 +79,22 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.6</version>
+ <version>${commons-lang.version}</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2.2</version>
+ <version>${commons-fileupload.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-io</artifactId>
- <version>1.3.2</version>
+ <version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.7</version>
+ <version>${velocity.version}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: incubator/lcf/branches/CONNECTORS-437/mvn-bootstrap.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/mvn-bootstrap.bat?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/mvn-bootstrap.bat (original)
+++ incubator/lcf/branches/CONNECTORS-437/mvn-bootstrap.bat Sun Apr 1 13:29:47 2012
@@ -16,14 +16,12 @@ rem limitations under the License.
cmd /c ant download-dependencies
-cmd /c mvn install:install-file -Dfile=lib/jdbcpool-0.99.jar -DgroupId=com.bitmechanic -DartifactId=jdbcpool -Dversion=0.99 -Dpackaging=jar
+cmd /c mvn install:install-file -Dfile=lib/jdbcpool.jar -DgroupId=com.bitmechanic -DartifactId=jdbcpool -Dversion=0.99 -Dpackaging=jar
-cmd /c mvn install:install-file -Dfile=lib/commons-httpclient-mcf.jar -DgroupId=commons-httpclient -DartifactId=commons-httpclient-mcf -Dversion=3.1 -Dpackaging=jar
-cmd /c mvn install:install-file -Dfile=lib/xercesImpl-mcf.jar -DgroupId=xerces -DartifactId=xercesImpl-mcf -Dversion=2.9.1 -Dpackaging=jar
+cmd /c mvn install:install-file -Dfile=lib/commons-httpclient.jar -DgroupId=commons-httpclient -DartifactId=commons-httpclient -Dversion=3.1-mcf-1 -Dpackaging=jar
+cmd /c mvn install:install-file -Dfile=lib/xercesImpl.jar -DgroupId=xerces -DartifactId=xercesImpl-mcf -Dversion=2.9.1 -Dpackaging=jar
cmd /c mvn install:install-file -Dfile=connectors/jcifs/lib-proprietary/jcifs.jar -DgroupId=org.samba.jcifs -DartifactId=jcifs -Dversion=1.3.17 -Dpackaging=jar
-cmd /c mvn install:install-file -Dfile=lib/chemistry-opencmis-server-inmemory.war -DgroupId=org.apache.chemistry.opencmis -DartifactId=chemistry-opencmis-server-inmemory -Dversion=0.6.0 -Dpackaging=war
-
cmd /c mvn install:install-file -Dfile=lib/opensaml-1.0.1.jar -DgroupId=org.opensaml -DartifactId=opensaml -Dversion=1.0.1 -Dpackaging=jar
cmd /c mvn install:install-file -Dfile=lib/xmlsec-1.4.1.jar -DgroupId=xml-security -DartifactId=xmlsec -Dversion=1.4.1 -Dpackaging=jar
Modified: incubator/lcf/branches/CONNECTORS-437/mvn-bootstrap.sh
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/mvn-bootstrap.sh?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/mvn-bootstrap.sh (original)
+++ incubator/lcf/branches/CONNECTORS-437/mvn-bootstrap.sh Sun Apr 1 13:29:47 2012
@@ -23,14 +23,12 @@
ant download-dependencies
-mvn install:install-file -Dfile=lib/jdbcpool-0.99.jar -DgroupId=com.bitmechanic -DartifactId=jdbcpool -Dversion=0.99 -Dpackaging=jar
+mvn install:install-file -Dfile=lib/jdbcpool.jar -DgroupId=com.bitmechanic -DartifactId=jdbcpool -Dversion=0.99 -Dpackaging=jar
-mvn install:install-file -Dfile=lib/commons-httpclient-mcf.jar -DgroupId=commons-httpclient -DartifactId=commons-httpclient-mcf -Dversion=3.1 -Dpackaging=jar
-mvn install:install-file -Dfile=lib/xercesImpl-mcf.jar -DgroupId=xerces -DartifactId=xercesImpl-mcf -Dversion=2.9.1 -Dpackaging=jar
+mvn install:install-file -Dfile=lib/commons-httpclient.jar -DgroupId=commons-httpclient -DartifactId=commons-httpclient -Dversion=3.1-mcf-1 -Dpackaging=jar
+mvn install:install-file -Dfile=lib/xercesImpl.jar -DgroupId=xerces -DartifactId=xercesImpl -Dversion=2.9.1-mcf-1 -Dpackaging=jar
mvn install:install-file -Dfile=connectors/jcifs/lib-proprietary/jcifs.jar -DgroupId=org.samba.jcifs -DartifactId=jcifs -Dversion=1.3.17 -Dpackaging=jar
-mvn install:install-file -Dfile=lib/chemistry-opencmis-server-inmemory.war -DgroupId=org.apache.chemistry.opencmis -DartifactId=chemistry-opencmis-server-inmemory -Dversion=0.6.0 -Dpackaging=war
-
mvn install:install-file -Dfile=lib/opensaml-1.0.1.jar -DgroupId=org.opensaml -DartifactId=opensaml -Dversion=1.0.1 -Dpackaging=jar
mvn install:install-file -Dfile=lib/xmlsec-1.4.1.jar -DgroupId=xml-security -DartifactId=xmlsec -Dversion=1.4.1 -Dpackaging=jar
Modified: incubator/lcf/branches/CONNECTORS-437/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/pom.xml?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/pom.xml Sun Apr 1 13:29:47 2012
@@ -43,6 +43,26 @@
<hsqldb.version>2.2.8</hsqldb.version>
<derby.version>10.8.2.2</derby.version>
<jetty.version>6.1.26</jetty.version>
+ <commons-codec.version>1.5</commons-codec.version>
+ <commons-io.version>2.0.1</commons-codec.version>
+ <commons-logging.version>1.1.1</commons-logging.version>
+ <commons-collections.version>3.2.1</commons-collections.version>
+ <commons-fileupload.version>1.2.2</commons-fileupload.version>
+ <commons-httpclient.version>3.1-mcf-1</commons-httpclient.version>
+ <commons-el.version>1.0</commons-el.version>
+ <commons-lang.version>2.6</commons-lang.version>
+ <xalan.version>2.7.1</xalan.version>
+ <xerces.version>2.9.1-mcf-1</xerces.version>
+ <jtds.version>1.2.4</jtds.version>
+ <servlet-api.version>2.5</servlet-api.version>
+ <jstl.version>1.2</jstl.version>
+ <jsp-api-2.1.version>6.1.14</jsp-api-2.1.version>
+ <jsp-api.version>2.1</jsp-api.version>
+ <jsp-2.1-glassfish.version>2.1.v20091210</jsp-2.1-glassfish.version>
+ <log4j.version>1.2.16</log4j.version>
+ <jdbcpool.version>0.99</jdbcpool.version>
+ <json.version>20090211</json.version>
+ <velocity.version>1.7</velocity.version>
</properties>
<modules>
Modified: incubator/lcf/branches/CONNECTORS-437/tests/alfresco/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/tests/alfresco/pom.xml?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/tests/alfresco/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/tests/alfresco/pom.xml Sun Apr 1 13:29:47 2012
@@ -212,17 +212,17 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-api-2.1</artifactId>
- <version>6.1.14</version>
+ <version>${jsp-api-2.1.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <version>${jsp-api.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1-glassfish</artifactId>
- <version>2.1.v20091210</version>
+ <version>${jsp-2.1-glassfish.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -277,30 +277,19 @@
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient-mcf</artifactId>
- <version>3.1</version>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons-httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.5</version>
+ <version>${commons-codec.version}</version>
</dependency>
- <!-- Apache Chemistry dependencies -->
- <dependency>
- <groupId>org.apache.chemistry.opencmis</groupId>
- <artifactId>chemistry-opencmis-client-impl</artifactId>
- <version>0.5.0</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: incubator/lcf/branches/CONNECTORS-437/tests/cmis/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/tests/cmis/pom.xml?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/tests/cmis/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/tests/cmis/pom.xml Sun Apr 1 13:29:47 2012
@@ -196,17 +196,17 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-api-2.1</artifactId>
- <version>6.1.14</version>
+ <version>${jsp-api-2.1.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <version>${jsp-api.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1-glassfish</artifactId>
- <version>2.1.v20091210</version>
+ <version>${jsp-2.1-glassfish.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -261,18 +261,18 @@
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient-mcf</artifactId>
- <version>3.1</version>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons-httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.5</version>
+ <version>${commons-codec.version}</version>
</dependency>
<!-- Apache Chemistry dependencies -->
Modified: incubator/lcf/branches/CONNECTORS-437/tests/elasticsearch/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/tests/elasticsearch/pom.xml?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/tests/elasticsearch/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/tests/elasticsearch/pom.xml Sun Apr 1 13:29:47 2012
@@ -211,17 +211,17 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-api-2.1</artifactId>
- <version>6.1.14</version>
+ <version>${jsp-api-2.1.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <version>${jsp-api.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1-glassfish</artifactId>
- <version>2.1.v20091210</version>
+ <version>${jsp-2.1-glassfish.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -276,18 +276,18 @@
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient-mcf</artifactId>
- <version>3.1</version>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons-httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.5</version>
+ <version>${commons-codec.version}</version>
</dependency>
<!-- Apache Chemistry dependencies -->
@@ -304,9 +304,9 @@
<!-- Elastic Search dependencies -->
<dependency>
- <groupId>org.elasticsearch</groupId>
- <artifactId>elasticsearch</artifactId>
- <version>0.19.0</version>
+ <groupId>org.elasticsearch</groupId>
+ <artifactId>elasticsearch</artifactId>
+ <version>0.19.0</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
@@ -346,4 +346,4 @@
<version>1.2.0</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/lcf/branches/CONNECTORS-437/tests/filesystem/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/tests/filesystem/pom.xml?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/tests/filesystem/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/tests/filesystem/pom.xml Sun Apr 1 13:29:47 2012
@@ -167,17 +167,17 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-api-2.1</artifactId>
- <version>6.1.14</version>
+ <version>${jsp-api-2.1.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <version>${jsp-api.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1-glassfish</artifactId>
- <version>2.1.v20091210</version>
+ <version>${jsp-2.1-glassfish.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -232,18 +232,18 @@
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient-mcf</artifactId>
- <version>3.1</version>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons-httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.5</version>
+ <version>${commons-codec.version}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: incubator/lcf/branches/CONNECTORS-437/tests/rss/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/tests/rss/pom.xml?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/tests/rss/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/tests/rss/pom.xml Sun Apr 1 13:29:47 2012
@@ -161,17 +161,17 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-api-2.1</artifactId>
- <version>6.1.14</version>
+ <version>${jsp-api-2.1.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <version>${jsp-api.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1-glassfish</artifactId>
- <version>2.1.v20091210</version>
+ <version>${jsp-2.1-glassfish.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -226,18 +226,18 @@
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient-mcf</artifactId>
- <version>3.1</version>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons-httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.5</version>
+ <version>${commons-codec.version}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: incubator/lcf/branches/CONNECTORS-437/tests/sharepoint/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/tests/sharepoint/pom.xml?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/tests/sharepoint/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/tests/sharepoint/pom.xml Sun Apr 1 13:29:47 2012
@@ -93,18 +93,18 @@
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient-mcf</artifactId>
- <version>3.1</version>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons-httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.5</version>
+ <version>${commons-codec.version}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: incubator/lcf/branches/CONNECTORS-437/tests/wiki/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/tests/wiki/pom.xml?rev=1308106&r1=1308105&r2=1308106&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/tests/wiki/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/tests/wiki/pom.xml Sun Apr 1 13:29:47 2012
@@ -162,22 +162,22 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-api-2.1</artifactId>
- <version>6.1.14</version>
+ <version>${jsp-api-2.1.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <version>${jsp-api.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1-glassfish</artifactId>
- <version>2.1.v20091210</version>
+ <version>${jsp-2.1-glassfish.version}</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
- <artifactId>xercesImpl-mcf</artifactId>
- <version>2.9.1</version>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -232,18 +232,18 @@
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient-mcf</artifactId>
- <version>3.1</version>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons-httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.5</version>
+ <version>${commons-codec.version}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file