You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by jg...@apache.org on 2016/06/22 17:36:54 UTC
svn commit: r1749749 - in /openjpa/branches/2.2.x: ./
openjpa-integration/daytrader/ openjpa-integration/examples/
openjpa-integration/slf4j/ openjpa-integration/tck/
openjpa-integration/validation/ openjpa-project/
openjpa-project/src/doc/manual/
Author: jgrassel
Date: Wed Jun 22 17:36:54 2016
New Revision: 1749749
URL: http://svn.apache.org/viewvc?rev=1749749&view=rev
Log:
OPENJPA-2645: Doc Build for most branch releases are broken
Modified:
openjpa/branches/2.2.x/openjpa-integration/daytrader/pom.xml
openjpa/branches/2.2.x/openjpa-integration/examples/pom.xml
openjpa/branches/2.2.x/openjpa-integration/slf4j/pom.xml
openjpa/branches/2.2.x/openjpa-integration/tck/pom.xml
openjpa/branches/2.2.x/openjpa-integration/validation/pom.xml
openjpa/branches/2.2.x/openjpa-project/pom.xml
openjpa/branches/2.2.x/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml
openjpa/branches/2.2.x/pom.xml
Modified: openjpa/branches/2.2.x/openjpa-integration/daytrader/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-integration/daytrader/pom.xml?rev=1749749&r1=1749748&r2=1749749&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-integration/daytrader/pom.xml (original)
+++ openjpa/branches/2.2.x/openjpa-integration/daytrader/pom.xml Wed Jun 22 17:36:54 2016
@@ -36,6 +36,7 @@
<description>OpenJPA Integration Tests - Daytrader</description>
<properties>
+ <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
<daytrader.version>2.2-SNAPSHOT</daytrader.version>
<dbcp.maxActive>10</dbcp.maxActive>
<dbcp.maxIdle>5</dbcp.maxIdle>
Modified: openjpa/branches/2.2.x/openjpa-integration/examples/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-integration/examples/pom.xml?rev=1749749&r1=1749748&r2=1749749&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-integration/examples/pom.xml (original)
+++ openjpa/branches/2.2.x/openjpa-integration/examples/pom.xml Wed Jun 22 17:36:54 2016
@@ -46,6 +46,9 @@
<name>OpenJPA Integration Tests - Examples</name>
<description>OpenJPA Integration Tests - Examples</description>
+ <properties>
+ <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
+ </properties>
<profiles>
<profile>
<id>examples-profile</id>
Modified: openjpa/branches/2.2.x/openjpa-integration/slf4j/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-integration/slf4j/pom.xml?rev=1749749&r1=1749748&r2=1749749&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-integration/slf4j/pom.xml (original)
+++ openjpa/branches/2.2.x/openjpa-integration/slf4j/pom.xml Wed Jun 22 17:36:54 2016
@@ -36,6 +36,7 @@
<description>OpenJPA Integration Tests - SLF4JLogFactory</description>
<properties>
+ <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
<!-- use SLF4JLogFactory for logging -->
<openjpa.Log>slf4j</openjpa.Log>
</properties>
Modified: openjpa/branches/2.2.x/openjpa-integration/tck/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-integration/tck/pom.xml?rev=1749749&r1=1749748&r2=1749749&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-integration/tck/pom.xml (original)
+++ openjpa/branches/2.2.x/openjpa-integration/tck/pom.xml Wed Jun 22 17:36:54 2016
@@ -85,6 +85,7 @@
<description>OpenJPA Integration Tests - JPA TCK</description>
<properties>
+ <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
<openjpa.Log>DefaultLevel=WARN</openjpa.Log>
<tck2.level>20110815</tck2.level>
</properties>
Modified: openjpa/branches/2.2.x/openjpa-integration/validation/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-integration/validation/pom.xml?rev=1749749&r1=1749748&r2=1749749&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-integration/validation/pom.xml (original)
+++ openjpa/branches/2.2.x/openjpa-integration/validation/pom.xml Wed Jun 22 17:36:54 2016
@@ -36,6 +36,10 @@
<name>OpenJPA Integration Tests - Bean Validation</name>
<description>OpenJPA Integration Tests - Bean Validation</description>
+ <properties>
+ <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
+ </properties>
+
<profiles>
<!-- Default profile for testing with Apache BVAL provider -->
<!-- See http://incubator.apache.org/projects/beanvalidation.html -->
Modified: openjpa/branches/2.2.x/openjpa-project/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-project/pom.xml?rev=1749749&r1=1749748&r2=1749749&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-project/pom.xml (original)
+++ openjpa/branches/2.2.x/openjpa-project/pom.xml Wed Jun 22 17:36:54 2016
@@ -80,7 +80,7 @@
</parent.site.docs>
<docbook.source>${project.basedir}/src/doc/manual</docbook.source>
- <docbook.target>${project.basedir}/target/docbook</docbook.target>
+ <docbook.target>${project.build.directory}/docbook</docbook.target>
<docbook.version>1.67.2</docbook.version>
<local.repository>${settings.localRepository}</local.repository>
@@ -144,6 +144,7 @@
<configuration>
<descriptors>
<descriptor>assembly.xml</descriptor>
+ <descriptor>source-assembly.xml</descriptor>
</descriptors>
<outputDirectory>${openjpa.assembly.outputDirectory}</outputDirectory>
<workDirectory>target/work</workDirectory>
@@ -274,22 +275,22 @@
</htmlCustomization>
<postProcess>
<!-- rename manual to index -->
- <move file="${docbook.target}/manual/manual.html" tofile="${docbook.target}/manual/index.html" />
+ <move file="${docbook.target}/manual.html" tofile="${docbook.target}/index.html" />
<!-- Replace a 'base href' token to 'base target' in the index.html -->
<!-- This base href was inserted by manual-xhtml-chunk.xsl parameter 'html.base' -->
- <replace file="${docbook.target}/manual/index.html" token="base href" value="base target" />
+ <replace file="${docbook.target}/index.html" token="base href" value="base target" />
<!-- Copy main.html from original location to docbook target -->
- <copy file="${docbook.source}/main.html" tofile="${docbook.target}/manual/main.html" />
+ <copy file="${docbook.source}/main.html" tofile="${docbook.target}/main.html" />
<!-- copy over images and styles -->
- <mkdir dir="${docbook.target}/manual/img" />
- <copy todir="${docbook.target}/manual/img">
+ <mkdir dir="${docbook.target}/img" />
+ <copy todir="${docbook.target}/img">
<fileset dir="${docbook.source}/img">
<include name="*.*" />
</fileset>
</copy>
- <mkdir dir="${docbook.target}/manual/css" />
- <copy todir="${docbook.target}/manual/css">
+ <mkdir dir="${docbook.target}/css" />
+ <copy todir="${docbook.target}/css">
<fileset dir="${docbook.source}/css">
<include name="*.*" />
</fileset>
@@ -299,7 +300,7 @@
expanded access in upload -->
<mkdir dir="${parent.site.docs}" />
<copy todir="${parent.site.docs}">
- <fileset dir="${docbook.target}/manual">
+ <fileset dir="${docbook.target}">
<include name="*.*" />
</fileset>
</copy>
@@ -342,6 +343,7 @@
<version>4.4</version>
<scope>runtime</scope>
</dependency>
+ <!--
<dependency>
<groupId>${jai.groupId}</groupId>
<artifactId>jai_core</artifactId>
@@ -354,6 +356,7 @@
<version>${jai.version}</version>
<scope>runtime</scope>
</dependency>
+ -->
</dependencies>
</plugin>
</plugins>
@@ -364,6 +367,7 @@
<value>true</value>
</property>
</activation>
+ <!--
<pluginRepositories>
<pluginRepository>
<id>agilejava</id>
@@ -378,6 +382,7 @@
<url>${jai.maven.repo}</url>
</repository>
</repositories>
+ -->
</profile>
<!--
Upload distribution files, javadoc and manual to openjpa.apache.org/builds/${nightly.version}.
Modified: openjpa/branches/2.2.x/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml?rev=1749749&r1=1749748&r2=1749749&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml (original)
+++ openjpa/branches/2.2.x/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml Wed Jun 22 17:36:54 2016
@@ -3035,7 +3035,7 @@ javax.persistence.query.timeout, in mill
is used for Query operations. This property, when set to true, will allow the query timeout hint
to apply to EntityManager operations. For example, when a 'find' is executed and the resultant
entity updated, the query timeout will apply to the SQL update operation. This property defaults
-to false.</methodname>.
+to false.
</para>
</listitem>
<listitem id="DBDictionary.SupportsRestrictDeleteAction">
Modified: openjpa/branches/2.2.x/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/pom.xml?rev=1749749&r1=1749748&r2=1749749&view=diff
==============================================================================
--- openjpa/branches/2.2.x/pom.xml (original)
+++ openjpa/branches/2.2.x/pom.xml Wed Jun 22 17:36:54 2016
@@ -42,6 +42,10 @@
<version>2.2.3-SNAPSHOT</version>
<properties>
+ <rootpom.basedir>${basedir}</rootpom.basedir>
+ <java.class.version>1.6</java.class.version>
+ <java.testclass.version>1.6</java.testclass.version>
+
<openjpa.version>${project.version}</openjpa.version>
<openjpa.Log>DefaultLevel=INFO</openjpa.Log>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -79,10 +83,13 @@
<!-- other common versions -->
<slf4jVersion>1.6.1</slf4jVersion>
<!-- Compile Java source/target class level -->
- <compile.class.source>1.6</compile.class.source>
- <compile.class.target>1.6</compile.class.target>
- <compile.testclass.source>1.6</compile.testclass.source>
- <compile.testclass.target>1.6</compile.testclass.target>
+ <compile.class.source>${java.class.version}</compile.class.source>
+ <compile.class.target>${java.class.version}</compile.class.target>
+ <compile.testclass.source>${java.testclass.version}</compile.testclass.source>
+ <compile.testclass.target>${java.testclass.version}</compile.testclass.target>
+
+ <maven.javadoc.version>2.10.3</maven.javadoc.version>
+ <maven.surefire.version>2.19.1</maven.surefire.version>
</properties>
<licenses>
@@ -242,6 +249,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
+ <version>1.6</version>
</plugin>
</plugins>
</build>
@@ -285,6 +293,36 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven.javadoc.version}</version>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ <additionalparam>
+ ${javadoc.additionalparam}
+ </additionalparam>
+ <subpackages>org.apache.openjpa</subpackages>
+ <verbose>false</verbose>
+ <maxmemory>1024m</maxmemory>
+ <links>
+ <link>http://download.oracle.com/javase/6/docs/api/</link>
+ <link>http://download.oracle.com/javaee/6/api/</link>
+ <link>http://commons.apache.org/collections/api-release/</link>
+ </links>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>aggregate-jar</goal>
+ </goals>
+ </execution>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
@@ -620,7 +658,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.5.1</version>
<configuration>
<source>${compile.class.source}</source>
<target>${compile.class.target}</target>
@@ -629,6 +667,16 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven.javadoc.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.5</version>
<configuration>
@@ -696,12 +744,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.5.5</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.0-beta-4</version>
+ <version>1.4</version>
<configuration>
<getRevisionOnlyOnce>true</getRevisionOnlyOnce>
<revisionOnScmFailure>offline</revisionOnScmFailure>
@@ -720,18 +768,28 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.7</version>
+ <version>0.11</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.1</version>
+ <version>2.10</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.4</version>
+ <!--
+ <configuration>
+ <siteDirectory>target/filtered-site</siteDirectory>
+ </configuration>
+ -->
</plugin>
<!-- inherited from apache-7.pom, but need config updates -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.1</version>
+ <version>2.5.3</version>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<goals>deploy site site-deploy</goals>
@@ -787,12 +845,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.4</version>
+ <version>2.4.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.6</version>
+ <version>2.9</version>
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -804,7 +862,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.6</version>
<executions>
<execution>
<id>default-jar</id>
@@ -834,7 +892,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.2.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -851,53 +909,11 @@
<version>${project.version}</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadoc</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>javadoc</goal>
- </goals>
- <configuration>
- <additionalparam>
- ${javadoc.additionalparam}
- </additionalparam>
- <aggregate>true</aggregate>
- <subpackages>org.apache.openjpa</subpackages>
- <verbose>false</verbose>
- <maxmemory>512m</maxmemory>
- <links>
- <link>http://download.oracle.com/javase/6/docs/api/</link>
- <link>http://download.oracle.com/javaee/6/api/</link>
- <link>http://commons.apache.org/collections/api-release/</link>
- </links>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
<!-- Newer versions of plugin will cause PDF build failures -->
<plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
- <version>2.0.13</version>
+ <version>2.0.17</version>
</plugin>
<!-- Ignore/Execute plugin execution -->
@@ -1159,23 +1175,23 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.1</version>
+ <version>2.9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>${maven.javadoc.version}</version>
<configuration>
<show>package</show>
<quiet>true</quiet>
- <source>1.6</source>
+ <source>${java.class.version}</source>
<links>
<link>http://download.oracle.com/javase/6/docs/api/</link>
<link>http://download.oracle.com/javaee/6/api/</link>
<link>http://commons.apache.org/collections/api-release/</link>
</links>
</configuration>
- <reportSets>
+ <reportSets>
<reportSet>
<reports>
<report>javadoc</report>