Author: rombert Date: Tue Aug 8 15:56:07 2017 New Revision: 1804438 URL: http://svn.apache.org/viewvc?rev=1804438&view=rev Log: OAK-6533 - Adjust test classpath order to reduce number of error markers in Eclipse
Modified: jackrabbit/oak/trunk/oak-examples/standalone/pom.xml jackrabbit/oak/trunk/oak-pojosr/pom.xml jackrabbit/oak/trunk/oak-solr-core/pom.xml Modified: jackrabbit/oak/trunk/oak-examples/standalone/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/standalone/pom.xml?rev=1804438&r1=1804437&r2=1804438&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-examples/standalone/pom.xml (original) +++ jackrabbit/oak/trunk/oak-examples/standalone/pom.xml Tue Aug 8 15:56:07 2017 @@ -141,6 +141,11 @@ </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-pojosr</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-server</artifactId> <version>${jackrabbit.version}</version> </dependency> @@ -160,11 +165,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>oak-pojosr</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>oak-lucene</artifactId> <version>${project.version}</version> Modified: jackrabbit/oak/trunk/oak-pojosr/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/pom.xml?rev=1804438&r1=1804437&r2=1804438&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-pojosr/pom.xml (original) +++ jackrabbit/oak/trunk/oak-pojosr/pom.xml Tue Aug 8 15:56:07 2017 @@ -86,6 +86,26 @@ </build> <dependencies> + + <!-- Pojo SR --> + <!-- Added first to ensure that in an IDE the transitive dependencies of the oak modules + don't bring in an older version of the OSGi jars --> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.connect</artifactId> + <version>0.1.0</version> + <exclusions> + <exclusion> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + </exclusion> + <exclusion> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>oak-segment-tar</artifactId> @@ -124,22 +144,8 @@ <artifactId>jsr305</artifactId> </dependency> - <!-- Pojo SR --> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.connect</artifactId> - <version>0.1.0</version> - <exclusions> - <exclusion> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - </exclusion> - <exclusion> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - </exclusion> - </exclusions> - </dependency> + + <!-- OSGi dependencies --> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.scr</artifactId> Modified: jackrabbit/oak/trunk/oak-solr-core/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/pom.xml?rev=1804438&r1=1804437&r2=1804438&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/pom.xml (original) +++ jackrabbit/oak/trunk/oak-solr-core/pom.xml Tue Aug 8 15:56:07 2017 @@ -95,6 +95,25 @@ <dependencies> + <!-- Added first to ensure older Lucene brought in by oak-jcr does not get selected in Eclipse --> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-test-framework</artifactId> + <version>${lucene.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + <version>${lucene.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-analyzers-common</artifactId> + <version>${lucene.version}</version> + <scope>test</scope> + </dependency> <!-- TEST --> <dependency> <groupId>junit</groupId> @@ -162,24 +181,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-test-framework</artifactId> - <version>${lucene.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - <version>${lucene.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-analyzers-common</artifactId> - <version>${lucene.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.tika</groupId> <artifactId>tika-parsers</artifactId> <version>${tika.version}</version>