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/13 18:01:04 UTC
svn commit: r1738963 - in /jackrabbit/oak/trunk: oak-core/pom.xml
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 pom.xml
Author: davide
Date: Wed Apr 13 16:01:04 2016
New Revision: 1738963
URL: http://svn.apache.org/viewvc?rev=1738963&view=rev
Log:
OAK-4148 - RAT plugin complains about derby files
redirected derby.log under target and removed from RAT ignore.
Modified:
jackrabbit/oak/trunk/oak-core/pom.xml
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/AbstractRandomizedTest.java
jackrabbit/oak/trunk/oak-parent/pom.xml
jackrabbit/oak/trunk/oak-pojosr/pom.xml
jackrabbit/oak/trunk/oak-upgrade/pom.xml
jackrabbit/oak/trunk/pom.xml
Modified: jackrabbit/oak/trunk/oak-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1738963&r1=1738962&r2=1738963&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Wed Apr 13 16:01:04 2016
@@ -132,7 +132,6 @@
<configuration>
<excludes>
<exclude>**/test.json</exclude>
- <exclude>derby.log</exclude>
</excludes>
</configuration>
</plugin>
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/AbstractRandomizedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/AbstractRandomizedTest.java?rev=1738963&r1=1738962&r2=1738963&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/AbstractRandomizedTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/AbstractRandomizedTest.java Wed Apr 13 16:01:04 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/trunk/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1738963&r1=1738962&r2=1738963&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Wed Apr 13 16:01:04 2016
@@ -267,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>
@@ -282,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>
@@ -596,13 +598,19 @@
<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>
+ <plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
@@ -610,6 +618,11 @@
<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>
Modified: jackrabbit/oak/trunk/oak-pojosr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/pom.xml?rev=1738963&r1=1738962&r2=1738963&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-pojosr/pom.xml Wed Apr 13 16:01:04 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/trunk/oak-upgrade/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/pom.xml?rev=1738963&r1=1738962&r2=1738963&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-upgrade/pom.xml Wed Apr 13 16:01:04 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>
Modified: jackrabbit/oak/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/pom.xml?rev=1738963&r1=1738962&r2=1738963&view=diff
==============================================================================
--- jackrabbit/oak/trunk/pom.xml (original)
+++ jackrabbit/oak/trunk/pom.xml Wed Apr 13 16:01:04 2016
@@ -82,7 +82,6 @@
<exclude>oak-doc/.*/**</exclude>
<exclude>oak-doc/*.iml</exclude>
<exclude>oak-doc/target/**</exclude>
- <exclude>**/derby.log</exclude>
</excludes>
</configuration>
</plugin>