JAMES-1842 Add profile for MPT testing and run it on java 6
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2d55c4cb Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2d55c4cb Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2d55c4cb Branch: refs/heads/master Commit: 2d55c4cb51b2989f48ab722397c9bf8ec2023dd8 Parents: ee4a608 Author: Benoit Tellier <[email protected]> Authored: Wed Nov 9 15:27:27 2016 +0700 Committer: Benoit Tellier <[email protected]> Committed: Wed Nov 9 16:14:57 2016 +0700 ---------------------------------------------------------------------- dockerfiles/compilation/java-6/compile.sh | 4 +- mpt/impl/imap-mailbox/lucenesearch/pom.xml | 212 +++--------------------- mpt/impl/imap-mailbox/pom.xml | 10 +- 3 files changed, 33 insertions(+), 193 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/2d55c4cb/dockerfiles/compilation/java-6/compile.sh ---------------------------------------------------------------------- diff --git a/dockerfiles/compilation/java-6/compile.sh b/dockerfiles/compilation/java-6/compile.sh index 4655c0f..b0c1f82 100755 --- a/dockerfiles/compilation/java-6/compile.sh +++ b/dockerfiles/compilation/java-6/compile.sh @@ -44,9 +44,9 @@ git checkout $SHA1 # Compilation if [ "$SKIPTESTS" = "skipTests" ]; then - mvn package -DskipTests -Pjpa,lucene,with-assembly + mvn package -DskipTests -Pjpa,lucene,jpa-lucene,with-assembly else - mvn package -Pjpa,lucene,with-assembly + mvn package -Pjpa,lucene,jpa-lucene,with-assembly fi # Retrieve result http://git-wip-us.apache.org/repos/asf/james-project/blob/2d55c4cb/mpt/impl/imap-mailbox/lucenesearch/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/lucenesearch/pom.xml b/mpt/impl/imap-mailbox/lucenesearch/pom.xml index a707ac0..2476d6a 100644 --- a/mpt/impl/imap-mailbox/lucenesearch/pom.xml +++ b/mpt/impl/imap-mailbox/lucenesearch/pom.xml @@ -33,12 +33,32 @@ <dependencies> <dependency> <groupId>org.apache.james</groupId> - <artifactId>apache-james-mpt-imapmailbox-core</artifactId> + <artifactId>apache-james-mailbox-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-mailbox-lucene</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-mailbox-lucene</artifactId> </dependency> <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-james-mailbox-jpa</artifactId> - <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-mailbox-store</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-mpt-imapmailbox-core</artifactId> </dependency> <dependency> <groupId>com.h2database</groupId> @@ -47,192 +67,4 @@ </dependency> </dependencies> - <profiles> - <profile> - <id>disable-build-for-older-jdk</id> - <activation> - <jdk>(,1.8)</jdk> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>default-jar</id> - <phase>none</phase> - </execution> - <execution> - <id>jar</id> - <phase>none</phase> - </execution> - <execution> - <id>test-jar</id> - <phase>none</phase> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <executions> - <execution> - <id>default-compile</id> - <phase>none</phase> - </execution> - <execution> - <id>default-testCompile</id> - <phase>none</phase> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>default-test</id> - <phase>none</phase> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <phase>none</phase> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-install-plugin</artifactId> - <executions> - <execution> - <id>default-install</id> - <phase>none</phase> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>default-resources</id> - <phase>none</phase> - </execution> - <execution> - <id>default-testResources</id> - <phase>none</phase> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <executions> - <execution> - <id>attach-descriptor</id> - <phase>none</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>build-for-jdk-8</id> - <activation> - <jdk>[1.8,)</jdk> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>apache-james-mailbox-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>apache-james-mailbox-lucene</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>apache-james-mailbox-lucene</artifactId> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>apache-james-mailbox-jpa</artifactId> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>apache-james-mailbox-store</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>apache-james-mpt-imapmailbox-core</artifactId> - </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass>fully.qualified.MainClass</mainClass> - </manifest> - </archive> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>animal-sniffer-java-8</id> - <activation> - <jdk>[1.8,)</jdk> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-maven-plugin</artifactId> - <configuration> - <signature> - <groupId>org.codehaus.mojo.signature</groupId> - <artifactId>java18</artifactId> - <version>1.0</version> - </signature> - </configuration> - <executions> - <execution> - <id>check_java_8</id> - <phase>test</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> http://git-wip-us.apache.org/repos/asf/james-project/blob/2d55c4cb/mpt/impl/imap-mailbox/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/pom.xml b/mpt/impl/imap-mailbox/pom.xml index 9e392df..e4e13d9 100644 --- a/mpt/impl/imap-mailbox/pom.xml +++ b/mpt/impl/imap-mailbox/pom.xml @@ -120,6 +120,7 @@ <maildir.includes>empty</maildir.includes> <cyrus.includes>empty</cyrus.includes> <elasticsearch.includes>empty</elasticsearch.includes> + <jpa-lucene.includes>empty</jpa-lucene.includes> </properties> <profiles> @@ -154,6 +155,12 @@ </properties> </profile> <profile> + <id>jpa-lucene</id> + <properties> + <jpa-lucene.includes>**/lucenesearch/**/*.java</jpa-lucene.includes> + </properties> + </profile> + <profile> <id>maildir</id> <properties> <maildir.includes>**/maildir/**/*.java</maildir.includes> @@ -185,7 +192,8 @@ <exclude>**/suite/**/*.java</exclude> </excludes> <includes> - <include>${cassandra.includes}, ${hbase.includes}, ${inmemory.includes}, ${jcr.includes}, ${jpa.includes}, ${maildir.includes}, ${cyrus.includes}, ${elasticsearch.includes}</include> + <include>${cassandra.includes}, ${hbase.includes}, ${inmemory.includes}, ${jcr.includes}, ${jpa.includes}, ${maildir.includes}, ${cyrus.includes}, +${elasticsearch.includes}, ${jpa-lucene.includes}</include> </includes> </configuration> </plugin> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
