You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by da...@apache.org on 2016/04/25 13:12:04 UTC
svn commit: r1740809 - in /jackrabbit/oak/branches/1.4: ./
oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/AbstractRandomizedTest.java
oak-parent/pom.xml oak-pojosr/pom.xml oak-upgrade/pom.xml
Author: davide
Date: Mon Apr 25 11:12:03 2016
New Revision: 1740809
URL: http://svn.apache.org/viewvc?rev=1740809&view=rev
Log:
OAK-4136 - release profile in maven
OAK-4148 - RAT plugin complains about derby files
merging revisions: 1737998,1738004,1738963 from trunk
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/AbstractRandomizedTest.java
jackrabbit/oak/branches/1.4/oak-parent/pom.xml
jackrabbit/oak/branches/1.4/oak-pojosr/pom.xml
jackrabbit/oak/branches/1.4/oak-upgrade/pom.xml
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 25 11:12:03 2016
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1734230,1734254,1735052,1735405,1735484,1735549,1735564,1735622,1735638,1735919,1735983,1736176,1738775
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1734230,1734254,1735052,1735405,1735484,1735549,1735564,1735622,1735638,1735919,1735983,1736176,1737998,1738004,1738775,1738963
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.4/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/AbstractRandomizedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/AbstractRandomizedTest.java?rev=1740809&r1=1740808&r2=1740809&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/AbstractRandomizedTest.java (original)
+++ jackrabbit/oak/branches/1.4/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/AbstractRandomizedTest.java Mon Apr 25 11:12:03 2016
@@ -56,7 +56,6 @@ public abstract class AbstractRandomized
@Before
public void setUp() throws Exception {
- System.setProperty("derby.stream.error.file", "target/derby.log");
jackrabbitRepository = JcrUtils.getRepository(
new File("target", "jackrabbit").toURI().toURL().toString());
oakRepository = new Jcr().createRepository();
Modified: jackrabbit/oak/branches/1.4/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-parent/pom.xml?rev=1740809&r1=1740808&r2=1740809&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-parent/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-parent/pom.xml Mon Apr 25 11:12:03 2016
@@ -61,7 +61,8 @@
<logback.version>1.1.0</logback.version>
<h2.version>1.4.190</h2.version>
<findbugs.version>3.0.0</findbugs.version>
-
+ <derby.version>10.12.1.1</derby.version>
+
<!-- specifies on which fixture to run the integration testing tests.
override in profiles or provide from command line to change behaviour. Provide
more fixtures space separated. See org.apache.jackrabbit.oak.jcr.FixturesHelper#AVAILABLE_FIXTURES
@@ -266,6 +267,7 @@
<mongo.url>${mongo.url}</mongo.url>
<segment.db>${segment.db}</segment.db>
<nsfixtures>${fixtures}</nsfixtures>
+ <derby.stream.error.file>${project.build.directory}/derby.log</derby.stream.error.file>
</systemPropertyVariables>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
@@ -281,6 +283,7 @@
<mongo.db>${mongo.db}</mongo.db>
<mongo.db2>${mongo.db2}</mongo.db2>
<nsfixtures>${fixtures}</nsfixtures>
+ <derby.stream.error.file>${project.build.directory}/derby.log</derby.stream.error.file>
</systemPropertyVariables>
</configuration>
</plugin>
@@ -589,6 +592,91 @@
</build>
</profile>
+ <!-- - - - - - - - - - - - - - - - - - - - will run all the required tests before a release -->
+ <profile>
+ <id>release</id>
+ <properties>
+ <nsfixtures />
+ <rdb.jdbc-url>jdbc:derby:./target/derby-release-test;create=true</rdb.jdbc-url>
+ <derby.stream.error.file>${project.build.directory}/derby.log</derby.stream.error.file>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <derby.stream.error.file>${project.build.directory}/derby.log</derby.stream.error.file>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <systemProperties>
+ <derby.stream.error.file>${project.build.directory}/derby.log</derby.stream.error.file>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <failOnViolation>false</failOnViolation>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>${findbugs.version}</version>
+ <configuration>
+ <failOnError>false</failOnError>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - other profiles -->
<profile>
@@ -701,7 +789,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.12.1.1</version>
+ <version>${derby.version}</version>
</dependency>
</dependencies>
</profile>
Modified: jackrabbit/oak/branches/1.4/oak-pojosr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-pojosr/pom.xml?rev=1740809&r1=1740808&r2=1740809&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-pojosr/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-pojosr/pom.xml Mon Apr 25 11:12:03 2016
@@ -84,25 +84,6 @@
</configuration>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <!-- Some component is creating derby.log in test. Need to be deleted-->
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <filesets>
- <fileset>
- <directory>${project.basedir}</directory>
- <includes>
- <include>derby.log</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<dependencies>
Modified: jackrabbit/oak/branches/1.4/oak-upgrade/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-upgrade/pom.xml?rev=1740809&r1=1740808&r2=1740809&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-upgrade/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-upgrade/pom.xml Mon Apr 25 11:12:03 2016
@@ -37,7 +37,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
- <derby.stream.error.file>target/derby.log</derby.stream.error.file>
<s3.properties>${s3.properties}</s3.properties>
</systemPropertyVariables>
</configuration>