You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2017/06/27 20:23:06 UTC

svn commit: r1800086 - in /tomee/site/trunk/generators/site-tomee-ng: ./ pom.xml src/main/java/org/apache/tomee/website/PDFify.java src/main/jbake/content/developer/testing/applicationcomposer/index.adoc

Author: andygumbrecht
Date: Tue Jun 27 20:23:05 2017
New Revision: 1800086

URL: http://svn.apache.org/viewvc?rev=1800086&view=rev
Log:
Update versions.
Doctype `article` generates too many errors/warnings - Use `manpage`

Modified:
    tomee/site/trunk/generators/site-tomee-ng/   (props changed)
    tomee/site/trunk/generators/site-tomee-ng/pom.xml
    tomee/site/trunk/generators/site-tomee-ng/src/main/java/org/apache/tomee/website/PDFify.java
    tomee/site/trunk/generators/site-tomee-ng/src/main/jbake/content/developer/testing/applicationcomposer/index.adoc

Propchange: tomee/site/trunk/generators/site-tomee-ng/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun 27 20:23:05 2017
@@ -0,0 +1,2 @@
+.idea
+*.iml

Modified: tomee/site/trunk/generators/site-tomee-ng/pom.xml
URL: http://svn.apache.org/viewvc/tomee/site/trunk/generators/site-tomee-ng/pom.xml?rev=1800086&r1=1800085&r2=1800086&view=diff
==============================================================================
--- tomee/site/trunk/generators/site-tomee-ng/pom.xml (original)
+++ tomee/site/trunk/generators/site-tomee-ng/pom.xml Tue Jun 27 20:23:05 2017
@@ -10,7 +10,7 @@
   <name>Apache TomEE :: WebSite NG</name>
 
   <properties>
-    <tomee.version>7.0.1</tomee.version>
+    <tomee.version>7.0.3</tomee.version>
     <jbake.http>false</jbake.http>
     <jbake.pdf>false</jbake.pdf>
 
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.16.6</version>
+      <version>1.16.12</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -47,12 +47,12 @@
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-client</artifactId>
-      <version>3.1.5</version>
+      <version>3.1.8</version>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
-      <version>7.0</version>
+      <version>7.0-1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
@@ -73,12 +73,17 @@
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy</artifactId>
-      <version>2.3.6</version>
+      <version>2.3.11</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-templates</artifactId>
-      <version>2.3.6</version>
+      <version>2.3.11</version>
+    </dependency>
+    <dependency>
+      <groupId>org.pegdown</groupId>
+      <artifactId>pegdown</artifactId>
+      <version>1.6.0</version>
     </dependency>
   </dependencies>
 
@@ -87,7 +92,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5</version>
+        <version>3.5.1</version>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>
@@ -96,7 +101,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
         <executions>
           <execution>
             <id>tomee-site</id>

Modified: tomee/site/trunk/generators/site-tomee-ng/src/main/java/org/apache/tomee/website/PDFify.java
URL: http://svn.apache.org/viewvc/tomee/site/trunk/generators/site-tomee-ng/src/main/java/org/apache/tomee/website/PDFify.java?rev=1800086&r1=1800085&r2=1800086&view=diff
==============================================================================
--- tomee/site/trunk/generators/site-tomee-ng/src/main/java/org/apache/tomee/website/PDFify.java (original)
+++ tomee/site/trunk/generators/site-tomee-ng/src/main/java/org/apache/tomee/website/PDFify.java Tue Jun 27 20:23:05 2017
@@ -55,7 +55,9 @@ public class PDFify {
                         if (attributes.containsKey("jbake-tomeepdf") && !attributes.containsKey("jbake-tomeepdf-manual")) {
                             asciidoctor.convertFile(
                                     asFile,
-                                    options().backend("pdf").attributes(AttributesBuilder.attributes().attribute("source-highlighter", "coderay")).toFile(target).get());
+                                    options().docType("manpage").backend
+                                            ("pdf")
+                                    .attributes(AttributesBuilder.attributes().attribute("source-highlighter", "coderay")).toFile(target).get());
                             System.out.println("Generated " + target);
                         }
                     });

Modified: tomee/site/trunk/generators/site-tomee-ng/src/main/jbake/content/developer/testing/applicationcomposer/index.adoc
URL: http://svn.apache.org/viewvc/tomee/site/trunk/generators/site-tomee-ng/src/main/jbake/content/developer/testing/applicationcomposer/index.adoc?rev=1800086&r1=1800085&r2=1800086&view=diff
==============================================================================
--- tomee/site/trunk/generators/site-tomee-ng/src/main/jbake/content/developer/testing/applicationcomposer/index.adoc (original)
+++ tomee/site/trunk/generators/site-tomee-ng/src/main/jbake/content/developer/testing/applicationcomposer/index.adoc Tue Jun 27 20:23:05 2017
@@ -1,4 +1,4 @@
-= ApplicationComposer: the swiss knife of TomEE
+= ApplicationComposer: The TomEE Swiss Knife
 :jbake-date: 2016-03-16
 :jbake-type: page
 :jbake-status: published