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 to...@apache.org on 2017/05/09 08:32:45 UTC
svn commit: r1794506 - in /jackrabbit/oak/branches/1.0:
oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/AbstractRandomizedTest.java
oak-parent/pom.xml oak-pojosr/README.md oak-pojosr/pom.xml
Author: tomekr
Date: Tue May 9 08:32:44 2017
New Revision: 1794506
URL: http://svn.apache.org/viewvc?rev=1794506&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.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/AbstractRandomizedTest.java
jackrabbit/oak/branches/1.0/oak-parent/pom.xml
jackrabbit/oak/branches/1.0/oak-pojosr/README.md
jackrabbit/oak/branches/1.0/oak-pojosr/pom.xml
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/AbstractRandomizedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/AbstractRandomizedTest.java?rev=1794506&r1=1794505&r2=1794506&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/AbstractRandomizedTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/AbstractRandomizedTest.java Tue May 9 08:32:44 2017
@@ -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.0/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-parent/pom.xml?rev=1794506&r1=1794505&r2=1794506&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-parent/pom.xml (original)
+++ jackrabbit/oak/branches/1.0/oak-parent/pom.xml Tue May 9 08:32:44 2017
@@ -60,6 +60,17 @@
<h2.version>1.4.190</h2.version>
<findbugs.version>3.0.0</findbugs.version>
<java.version.signature>java16</java.version.signature>
+ <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
+ for the possible values: SEGMENT_MK DOCUMENT_NS DOCUMENT_RDB -->
+ <fixtures>SEGMENT_MK</fixtures>
+
+ <!-- whether skip the surefire unit testing during the integration testing.
+ Override with -Dsurefire.skip.ut=true when needed -->
+ <surefire.skip.ut>false</surefire.skip.ut>
</properties>
<issueManagement>
@@ -173,6 +184,8 @@
<mongo.db>${mongo.db}</mongo.db>
<mongo.db2>${mongo.db2}</mongo.db2>
<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>
@@ -187,6 +200,8 @@
<mongo.port>${mongo.port}</mongo.port>
<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>
@@ -427,6 +442,91 @@
</plugins>
</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>
+
<profile>
<id>rat</id>
<build>
@@ -531,7 +631,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.0/oak-pojosr/README.md
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-pojosr/README.md?rev=1794506&r1=1794505&r2=1794506&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-pojosr/README.md (original)
+++ jackrabbit/oak/branches/1.0/oak-pojosr/README.md Tue May 9 08:32:44 2017
@@ -13,4 +13,26 @@ To make use of this following dependenci
3. Apache Felix Config Admin
4. Apache Felix Fileinstall - To provision configuration
-[1]: https://code.google.com/p/pojosr/
\ No newline at end of file
+[1]: https://code.google.com/p/pojosr/
+
+License
+-------
+
+(see the top-level [LICENSE.txt](../LICENSE.txt) for full license details)
+
+Collective work: Copyright 2012 The Apache Software Foundation.
+
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
Modified: jackrabbit/oak/branches/1.0/oak-pojosr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-pojosr/pom.xml?rev=1794506&r1=1794505&r2=1794506&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-pojosr/pom.xml (original)
+++ jackrabbit/oak/branches/1.0/oak-pojosr/pom.xml Tue May 9 08:32:44 2017
@@ -31,39 +31,58 @@
<name>Oak PojoSR</name>
<properties>
+ <groovy.version>2.3.1</groovy.version>
<skip.deployment>true</skip.deployment>
</properties>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>README.md</exclude>
- <exclude>src/test/resources/**/*.config</exclude>
- </excludes>
- </configuration>
- </plugin>
- <!-- 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>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.4</version>
+ <!--suppress MavenModelInspection -->
+ <configuration>
+ <providerSelection>2.0</providerSelection>
+ <sourceEncoding>UTF-8</sourceEncoding>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generateTestStubs</goal>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/org.apache.felix.jaas.Configuration.factory-GuestLoginModule.config</exclude>
+ <exclude>**/org.apache.felix.jaas.Configuration.factory-LoginModuleImpl.config</exclude>
+ <exclude>**/org.apache.felix.jaas.Configuration.factory-TokenLoginModule.config</exclude>
+ <exclude>**/org.apache.felix.jaas.ConfigurationSpi.config</exclude>
+ <exclude>**/org.apache.jackrabbit.oak.jcr.osgi.RepositoryManager.config</exclude>
+ <exclude>**/org.apache.jackrabbit.oak.security.authorization.AuthorizationConfigurationImpl.config</exclude>
+ <exclude>**/org.apache.jackrabbit.oak.security.user.UserConfigurationImpl.config</exclude>
+ <exclude>**/org.apache.jackrabbit.oak.spi.security.user.action.DefaultAuthorizableActionProvider.config</exclude>
+ <exclude>**/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.config</exclude>
+ <exclude>**/org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.config</exclude>
+ <exclude>**/oak-base-config.json</exclude>
+ <exclude>**/oak-tar-config.json</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>