Remove mvn/plugins/cas-install/maven-cas-install-plugin.iml.orig and mvn/plugins/cas-install/maven-cas-install-plugin.iml.rej from SCM
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/fed87b2b Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/fed87b2b Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/fed87b2b Branch: refs/heads/development Commit: fed87b2bccc9890b0f5e45883936cc31fcd12f8f Parents: 3cac96e Author: Lewis John McGibbney <lewis.mcgibb...@gmail.com> Authored: Mon Apr 30 09:59:26 2018 -0700 Committer: Lewis John McGibbney <lewis.mcgibb...@gmail.com> Committed: Mon Apr 30 09:59:26 2018 -0700 ---------------------------------------------------------------------- .../maven-cas-install-plugin.iml.orig | 48 -------------- .../maven-cas-install-plugin.iml.rej | 70 -------------------- 2 files changed, 118 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/fed87b2b/mvn/plugins/cas-install/maven-cas-install-plugin.iml.orig ---------------------------------------------------------------------- diff --git a/mvn/plugins/cas-install/maven-cas-install-plugin.iml.orig b/mvn/plugins/cas-install/maven-cas-install-plugin.iml.orig deleted file mode 100755 index c78919b..0000000 --- a/mvn/plugins/cas-install/maven-cas-install-plugin.iml.orig +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <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" /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <excludeFolder url="file://$MODULE_DIR$/target" /> - </content> - <orderEntry type="library" name="Clover IDEA Plugin" level="application" /> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <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: xml-apis:xml-apis:2.0.2" 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: xmlrpc:xmlrpc:2.0.1" level="project" /> - <orderEntry type="library" name="Maven: xerces:xercesImpl:2.9.1" level="project" /> - <orderEntry type="module" module-name="pcs-input" /> - <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: commons-codec:commons-codec:1.3" level="project" /> - <orderEntry type="library" name="Maven: org.apache.tika:tika-core:1.7" 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: 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" scope="TEST" name="Maven: junit:junit:3.8.1" 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> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/oodt/blob/fed87b2b/mvn/plugins/cas-install/maven-cas-install-plugin.iml.rej ---------------------------------------------------------------------- diff --git a/mvn/plugins/cas-install/maven-cas-install-plugin.iml.rej b/mvn/plugins/cas-install/maven-cas-install-plugin.iml.rej deleted file mode 100755 index 4eff02b..0000000 --- a/mvn/plugins/cas-install/maven-cas-install-plugin.iml.rej +++ /dev/null @@ -1,70 +0,0 @@ ---- mvn/plugins/cas-install/maven-cas-install-plugin.iml -+++ mvn/plugins/cas-install/maven-cas-install-plugin.iml -@@ -9,13 +9,13 @@ - </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:1.6" level="project" /> -+ <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" 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: xml-apis:xml-apis:1.0.b2" level="project" /> -+ <orderEntry type="library" name="Maven: xml-apis:xml-apis:2.0.2" 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: xmlrpc:xmlrpc:2.0.1" level="project" /> ---- mvn/plugins/cas-install/maven-cas-install-plugin.iml -+++ mvn/plugins/cas-install/maven-cas-install-plugin.iml -@@ -1,49 +0,0 @@ --<?xml version="1.0" encoding="UTF-8"?> --<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> -- <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" /> -- <content url="file://$MODULE_DIR$"> -- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> -- <excludeFolder url="file://$MODULE_DIR$/target" /> -- </content> -- <orderEntry type="inheritedJdk" /> -- <orderEntry type="sourceFolder" forTests="false" /> -- <orderEntry type="library" name="Maven: org.apache.tika:tika-core:1.6" level="project" /> -- <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" 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: xml-apis:xml-apis:2.0.2" 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: xmlrpc:xmlrpc:2.0.1" level="project" /> -- <orderEntry type="library" name="Maven: xerces:xercesImpl:2.9.1" level="project" /> -- <orderEntry type="module" module-name="pcs-input" /> -- <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: commons-codec:commons-codec:1.3" level="project" /> -- <orderEntry type="library" name="Maven: org.apache.tika:tika-core:1.7" 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: 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" scope="TEST" name="Maven: junit:junit:3.8.1" 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> \ No newline at end of file
