Permalink
Browse files

resolving conflicting versions

  • Loading branch information...
1 parent ffbc319 commit c0b8301223a7f5b5d282dbb1a4ca2382f538deb7 @Tibor17 committed Jun 19, 2012
Binary file not shown.
Oops, something went wrong.
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ProjectsViewInfo>
- <DiagramOpenInfos>
+ <DiagramOpenInfos activeDiagramId="MuZj0.yGAqCiAQN2">
<Info bounds="Re:0.0,0.0,1153.0,613.0" diagramId="MuZj0.yGAqCiAQN2" maximized="true" offsetX="0" offsetY="0"/>
</DiagramOpenInfos>
</ProjectsViewInfo>
@@ -36,6 +36,22 @@
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
</dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.3.02</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -11,6 +11,8 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+ <orderEntry type="library" name="Maven: xerces:xmlParserAPIs:2.6.2" level="project" />
</component>
</module>
@@ -15,4 +15,11 @@
<name>1st internal bundle</name>
+ <dependencies>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </dependency>
+ </dependencies>
+
</project>
@@ -108,8 +108,7 @@
</option>
<option name="activeProfiles">
<list>
- <option value="release" />
- <option value="development" />
+ <option value="trunk" />
</list>
</option>
</component>
@@ -373,5 +372,29 @@
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="" />
</component>
+ <component name="libraryTable">
+ <library name="Maven: dom4j:dom4j:1.6.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+ <library name="Maven: xerces:xmlParserAPIs:2.6.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+ </component>
</project>
Oops, something went wrong.

0 comments on commit c0b8301

Please sign in to comment.