Author: tpalsulich
Date: Wed Oct 15 17:34:37 2014
New Revision: 1632134
URL: http://svn.apache.org/r1632134
Log:
Use dependency management for commons-io.
Modified:
oodt/trunk/catalog/pom.xml
oodt/trunk/core/pom.xml
oodt/trunk/crawler/pom.xml
oodt/trunk/curator/pom.xml
oodt/trunk/filemgr/pom.xml
oodt/trunk/grid/web-grid.iml
oodt/trunk/metadata/pom.xml
oodt/trunk/mvn/plugins/cas-install/maven-cas-install-plugin.iml
oodt/trunk/mvn/plugins/cas-install/pom.xml
oodt/trunk/product/pom.xml
oodt/trunk/protocol/sftp/pom.xml
oodt/trunk/resource/pom.xml
oodt/trunk/workflow/pom.xml
oodt/trunk/xmlquery/oodt-xmlquery.iml
Modified: oodt/trunk/catalog/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/catalog/pom.xml?rev=1632134&r1=1632133&r2=1632134&view=diff
==============================================================================
--- oodt/trunk/catalog/pom.xml (original)
+++ oodt/trunk/catalog/pom.xml Wed Oct 15 17:34:37 2014
@@ -154,7 +154,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
Modified: oodt/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/core/pom.xml?rev=1632134&r1=1632133&r2=1632134&view=diff
==============================================================================
--- oodt/trunk/core/pom.xml (original)
+++ oodt/trunk/core/pom.xml Wed Oct 15 17:34:37 2014
@@ -335,6 +335,11 @@ the License.
<artifactId>tika-parsers</artifactId>
<version>1.6</version>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<profiles>
Modified: oodt/trunk/crawler/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/crawler/pom.xml?rev=1632134&r1=1632133&r2=1632134&view=diff
==============================================================================
--- oodt/trunk/crawler/pom.xml (original)
+++ oodt/trunk/crawler/pom.xml Wed Oct 15 17:34:37 2014
@@ -139,7 +139,6 @@ the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: oodt/trunk/curator/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/pom.xml?rev=1632134&r1=1632133&r2=1632134&view=diff
==============================================================================
--- oodt/trunk/curator/pom.xml (original)
+++ oodt/trunk/curator/pom.xml Wed Oct 15 17:34:37 2014
@@ -105,7 +105,6 @@ the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.3.2</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Modified: oodt/trunk/filemgr/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/pom.xml?rev=1632134&r1=1632133&r2=1632134&view=diff
==============================================================================
--- oodt/trunk/filemgr/pom.xml (original)
+++ oodt/trunk/filemgr/pom.xml Wed Oct 15 17:34:37 2014
@@ -203,7 +203,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
Modified: oodt/trunk/grid/web-grid.iml
URL:
http://svn.apache.org/viewvc/oodt/trunk/grid/web-grid.iml?rev=1632134&r1=1632133&r2=1632134&view=diff
==============================================================================
--- oodt/trunk/grid/web-grid.iml (original)
+++ oodt/trunk/grid/web-grid.iml Wed Oct 15 17:34:37 2014
@@ -1,20 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module
org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true"
type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="web" name="Web">
- <configuration>
- <descriptors>
- <deploymentDescriptor name="web.xml"
url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
- </descriptors>
- <webroots>
- <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
- </webroots>
- <sourceRoots>
- <root url="file://$MODULE_DIR$/src/main/java" />
- </sourceRoots>
- </configuration>
- </facet>
- </component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6"
inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
@@ -25,8 +10,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: org.apache.tika:tika-core:0.8"
level="project" />
- <orderEntry type="library" name="Maven: joda-time:joda-time:2.3"
level="project" />
<orderEntry type="module" module-name="oodt-commons" />
<orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.2.1"
level="project" />
<orderEntry type="library" name="Maven:
commons-collections:commons-collections:2.1" level="project" />
@@ -54,42 +37,6 @@
<orderEntry type="module" module-name="oodt-profile" />
<orderEntry type="module" module-name="oodt-xmlquery" />
<orderEntry type="module" module-name="cas-filemgr" />
- <orderEntry type="module" module-name="cas-metadata" />
- <orderEntry type="module" module-name="pcs-input" />
- <orderEntry type="library" name="Maven: commons-io:commons-io:1.4"
level="project" />
- <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.3"
level="project" />
- <orderEntry type="library" name="Maven: org.apache.tika:tika-core:1.6"
level="project" />
- <orderEntry type="library" name="Maven: com.google.guava:guava:10.0.1"
level="project" />
- <orderEntry type="library" name="Maven:
com.google.code.findbugs:jsr305:1.3.9" level="project" />
- <orderEntry type="module" module-name="cas-cli" />
- <orderEntry type="library" name="Maven:
org.springframework:spring-expression:3.0.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven:
commons-httpclient:commons-httpclient:3.0-alpha1" level="project" />
- <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2"
level="project" />
- <orderEntry type="library" name="Maven: org.apache.solr:solr-solrj:1.3.0"
level="project" />
- <orderEntry type="library" name="Maven: org.apache.solr:solr-common:1.3.0"
level="project" />
- <orderEntry type="library" name="Maven:
commons-fileupload:commons-fileupload:1.2" level="project" />
- <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />
- <orderEntry type="library" name="Maven: stax:stax-api:1.0.1"
level="project" />
- <orderEntry type="library" name="Maven:
net.java.dev.stax-utils:stax-utils:20040917" level="project" />
- <orderEntry type="library" name="Maven: org.apache.solr:solr-core:1.3.0"
level="project" />
- <orderEntry type="library" name="Maven:
org.apache.solr:solr-lucene-analyzers:1.3.0" level="project" />
- <orderEntry type="library" name="Maven:
org.apache.solr:solr-lucene-highlighter:1.3.0" level="project" />
- <orderEntry type="library" name="Maven:
org.apache.solr:solr-lucene-queries:1.3.0" level="project" />
- <orderEntry type="library" name="Maven:
org.apache.solr:solr-lucene-snowball:1.3.0" level="project" />
- <orderEntry type="library" name="Maven:
org.apache.solr:solr-lucene-spellchecker:1.3.0" level="project" />
- <orderEntry type="library" name="Maven:
org.apache.solr:solr-commons-csv:1.3.0" level="project" />
- <orderEntry type="library" name="Maven:
org.apache.geronimo.specs:geronimo-stax-api_1.0_spec:1.0.1" level="project" />
- <orderEntry type="library" name="Maven:
org.apache.lucene:lucene-core:2.0.0" level="project" />
- <orderEntry type="library" name="Maven: org.safehaus.jug:jug:asl:2.0.0"
level="project" />
- <orderEntry type="library" name="Maven: hsqldb:hsqldb:1.8.0.7"
level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven:
org.python:jython:2.2-beta1" level="project" />
- <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk:1.7.4"
level="project" />
- <orderEntry type="library" name="Maven:
org.apache.httpcomponents:httpclient:4.2" level="project" />
- <orderEntry type="library" name="Maven:
org.apache.httpcomponents:httpcore:4.2" level="project" />
- <orderEntry type="library" name="Maven:
com.fasterxml.jackson.core:jackson-core:2.1.1" level="project" />
- <orderEntry type="library" name="Maven:
com.fasterxml.jackson.core:jackson-databind:2.1.1" level="project" />
- <orderEntry type="library" name="Maven:
com.fasterxml.jackson.core:jackson-annotations:2.1.1" level="project" />
- <orderEntry type="library" name="Maven: joda-time:joda-time:2.5"
level="project" />
<orderEntry type="library" name="Maven: com.hp.hpl.jena:jena:2.6.3"
level="project" />
<orderEntry type="library" name="Maven: com.hp.hpl.jena:iri:0.8"
level="project" />
<orderEntry type="library" name="Maven: com.ibm.icu:icu4j:3.4.4"
level="project" />
@@ -97,6 +44,8 @@
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.5.8"
level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven:
org.slf4j:slf4j-log4j12:1.5.8" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven:
log4j:log4j:1.2.13" level="project" />
+ <orderEntry type="library" name="Maven:
commons-httpclient:commons-httpclient:3.0-alpha1" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.3"
level="project" />
<orderEntry type="module" module-name="oodt-product" />
<orderEntry type="library" scope="PROVIDED" name="Maven:
javax.servlet:servlet-api:2.4" level="project" />
<orderEntry type="library" name="Maven: xalan:xalan:2.7.1" level="project"
/>
Modified: oodt/trunk/metadata/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/metadata/pom.xml?rev=1632134&r1=1632133&r2=1632134&view=diff
==============================================================================
--- oodt/trunk/metadata/pom.xml (original)
+++ oodt/trunk/metadata/pom.xml Wed Oct 15 17:34:37 2014
@@ -128,7 +128,6 @@ the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: oodt/trunk/mvn/plugins/cas-install/maven-cas-install-plugin.iml
URL:
http://svn.apache.org/viewvc/oodt/trunk/mvn/plugins/cas-install/maven-cas-install-plugin.iml?rev=1632134&r1=1632133&r2=1632134&view=diff
==============================================================================
--- oodt/trunk/mvn/plugins/cas-install/maven-cas-install-plugin.iml (original)
+++ oodt/trunk/mvn/plugins/cas-install/maven-cas-install-plugin.iml Wed Oct 15
17:34:37 2014
@@ -9,42 +9,12 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: xml-apis:xml-apis:2.0.2"
level="project" />
- <orderEntry type="library" name="Maven: org.apache.tika:tika-core:0.8"
level="project" />
<orderEntry type="library" name="Maven:
org.apache.maven:maven-plugin-api:2.0" level="project" />
<orderEntry type="module" module-name="cas-metadata" />
- <orderEntry type="module" module-name="oodt-commons" />
- <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.2.1"
level="project" />
- <orderEntry type="library" name="Maven:
commons-collections:commons-collections:2.1" level="project" />
- <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.2"
level="project" />
- <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2"
level="project" />
- <orderEntry type="library" name="Maven: xerces:xercesImpl:2.9.1"
level="project" />
- <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.3"
level="project" />
- <orderEntry type="library" name="Maven:
commons-logging:commons-logging:1.0.3" level="project" />
- <orderEntry type="library" name="Maven:
org.springframework:spring-core:2.5.4" level="project" />
- <orderEntry type="library" name="Maven:
org.springframework:spring-hibernate3:2.0.8" level="project" />
- <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0"
level="project" />
- <orderEntry type="library" name="Maven: org.hibernate:hibernate:3.2.5.ga"
level="project" />
- <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache:1.2.3"
level="project" />
- <orderEntry type="library" name="Maven: asm:asm-attrs:1.5.3"
level="project" />
- <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project"
/>
- <orderEntry type="library" name="Maven: antlr:antlr:2.7.6" level="project"
/>
- <orderEntry type="library" name="Maven: cglib:cglib:2.1_3" level="project"
/>
- <orderEntry type="library" name="Maven: asm:asm:1.5.3" level="project" />
- <orderEntry type="library" name="Maven:
org.springframework:spring-beans:2.0.8" level="project" />
- <orderEntry type="library" name="Maven:
org.springframework:spring-context:2.0.8" level="project" />
- <orderEntry type="library" name="Maven:
org.springframework:spring-dao:2.0.8" level="project" />
- <orderEntry type="library" name="Maven:
org.springframework:spring-jdbc:2.0.8" level="project" />
- <orderEntry type="library" name="Maven: xmlrpc:xmlrpc:2.0.1"
level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1"
level="project" />
- <orderEntry type="module" module-name="pcs-input" />
- <orderEntry type="library" name="Maven: commons-io:commons-io:1.4"
level="project" />
- <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.3"
level="project" />
- <orderEntry type="library" name="Maven: org.apache.tika:tika-core:1.6"
level="project" />
- <orderEntry type="library" name="Maven: com.google.guava:guava:10.0.1"
level="project" />
- <orderEntry type="library" name="Maven:
com.google.code.findbugs:jsr305:1.3.9" level="project" />
<orderEntry type="library" name="Maven: org.apache.ant:ant:1.7.0"
level="project" />
<orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.7.0"
level="project" />
+ <orderEntry type="library" name="Maven: commons-io:commons-io:1.4"
level="project" />
</component>
</module>
Modified: oodt/trunk/mvn/plugins/cas-install/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/mvn/plugins/cas-install/pom.xml?rev=1632134&r1=1632133&r2=1632134&view=diff
==============================================================================
--- oodt/trunk/mvn/plugins/cas-install/pom.xml (original)
+++ oodt/trunk/mvn/plugins/cas-install/pom.xml Wed Oct 15 17:34:37 2014
@@ -52,7 +52,6 @@ the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
<scope>compile</scope>
</dependency>
</dependencies>
Modified: oodt/trunk/product/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/product/pom.xml?rev=1632134&r1=1632133&r2=1632134&view=diff
==============================================================================
--- oodt/trunk/product/pom.xml (original)
+++ oodt/trunk/product/pom.xml Wed Oct 15 17:34:37 2014
@@ -93,7 +93,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
Modified: oodt/trunk/protocol/sftp/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/protocol/sftp/pom.xml?rev=1632134&r1=1632133&r2=1632134&view=diff
==============================================================================
--- oodt/trunk/protocol/sftp/pom.xml (original)
+++ oodt/trunk/protocol/sftp/pom.xml Wed Oct 15 17:34:37 2014
@@ -87,7 +87,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: oodt/trunk/resource/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/resource/pom.xml?rev=1632134&r1=1632133&r2=1632134&view=diff
==============================================================================
--- oodt/trunk/resource/pom.xml (original)
+++ oodt/trunk/resource/pom.xml Wed Oct 15 17:34:37 2014
@@ -108,7 +108,6 @@ the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
Modified: oodt/trunk/workflow/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/workflow/pom.xml?rev=1632134&r1=1632133&r2=1632134&view=diff
==============================================================================
--- oodt/trunk/workflow/pom.xml (original)
+++ oodt/trunk/workflow/pom.xml Wed Oct 15 17:34:37 2014
@@ -170,7 +170,6 @@ the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
<groupId>xmlrpc</groupId>
@@ -206,7 +205,7 @@ the License.
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>2.1</version>
+ <version>2.5</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: oodt/trunk/xmlquery/oodt-xmlquery.iml
URL:
http://svn.apache.org/viewvc/oodt/trunk/xmlquery/oodt-xmlquery.iml?rev=1632134&r1=1632133&r2=1632134&view=diff
==============================================================================
--- oodt/trunk/xmlquery/oodt-xmlquery.iml (original)
+++ oodt/trunk/xmlquery/oodt-xmlquery.iml Wed Oct 15 17:34:37 2014
@@ -12,7 +12,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: xml-apis:xml-apis:2.0.2"
level="project" />
<orderEntry type="module" module-name="oodt-commons" />
<orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.2.1"
level="project" />
<orderEntry type="library" name="Maven:
commons-collections:commons-collections:2.1" level="project" />
