You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2022/01/11 11:29:54 UTC

[tinkerpop] branch master updated (7be0fd1 -> 3c4fa54)

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.


    from 7be0fd1  Merge branch '3.5-dev'
     add a4bc39b  TinkerPop 3.5.2 release
     new 3c4fa54  Merge branch '3.5-dev'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGELOG.asciidoc                      | 49 +++++++++++++++++++++++++++++++--
 docs/src/upgrade/release-3.4.x.asciidoc |  2 +-
 docs/src/upgrade/release-3.5.x.asciidoc |  5 ++--
 pom.xml                                 | 38 +++++++++++++++++++++++++
 4 files changed, 88 insertions(+), 6 deletions(-)

[tinkerpop] 01/01: Merge branch '3.5-dev'

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 3c4fa54cb57ddd0119c40a5e1b156b8a9bd45bc9
Merge: 7be0fd1 a4bc39b
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Tue Jan 11 06:29:39 2022 -0500

    Merge branch '3.5-dev'

 CHANGELOG.asciidoc                      | 49 +++++++++++++++++++++++++++++++--
 docs/src/upgrade/release-3.4.x.asciidoc |  2 +-
 docs/src/upgrade/release-3.5.x.asciidoc |  5 ++--
 pom.xml                                 | 38 +++++++++++++++++++++++++
 4 files changed, 88 insertions(+), 6 deletions(-)

diff --cc pom.xml
index dcc4ae9,68f9d82..d75f368
--- a/pom.xml
+++ b/pom.xml
@@@ -264,9 -257,47 +264,47 @@@ limitations under the License
                  <artifactId>maven-assembly-plugin</artifactId>
              </plugin>
              <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-javadoc-plugin</artifactId>
+                 <configuration>
+                     <additionalJOption>-Xdoclint:none</additionalJOption>
+                     <tags>
+                         <tag>
+                             <name>example</name>
+                             <placement>aoptcmf</placement>
+                             <head>Example:</head>
+                         </tag>
+                     </tags>
+                 </configuration>
+                 <executions>
+                     <execution>
+                         <id>aggregate-in-site-lifecycle</id>
+                         <goals>
+                             <goal>aggregate</goal>
+                         </goals>
+                         <phase>site</phase>
+                         <configuration>
+                             <additionalJOption>-Xdoclint:none</additionalJOption>
+                             <includeDependencySources>true</includeDependencySources>
+                             <dependencySourceIncludes>
+                                 <dependencySourceInclude>org.apache.tinkerpop:*</dependencySourceInclude>
+                             </dependencySourceIncludes>
+                             <overview>${basedir}/docs/javadoc/overview.html</overview>
+                             <quiet>true</quiet>
+                         </configuration>
+                     </execution>
+                     <execution>
+                         <id>attach-javadoc</id>
+                         <goals>
+                             <goal>jar</goal>
+                         </goals>
+                     </execution>
+                 </executions>
+             </plugin>
+             <plugin>
                  <groupId>org.codehaus.mojo</groupId>
                  <artifactId>buildnumber-maven-plugin</artifactId>
 -                <version>1.4</version>
 +                <version>3.0.0</version>
                  <executions>
                      <execution>
                          <goals>