Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

support api generation via vscaladoc2_genjson

  • Loading branch information...
commit 5034f52cea03c4f6b71090f6967f3965b92ed45b 1 parent f6fb416
@davidB davidB authored
View
6 framework/lift-base/pom.xml
@@ -74,6 +74,12 @@
<build>
<!-- <pluginManagement/> -->
<!-- <plugins/> -->
+ <plugins>
+ <plugin>
+ <groupId>org.scala-tools</groupId>
+ <artifactId>maven-scala-plugin</artifactId>
+ </plugin>
+ </plugins>
</build>
<!--
View
6 framework/lift-modules/pom.xml
@@ -86,6 +86,12 @@
<build>
<!-- <pluginManagement/> -->
<!-- <plugins/> -->
+ <plugins>
+ <plugin>
+ <groupId>org.scala-tools</groupId>
+ <artifactId>maven-scala-plugin</artifactId>
+ </plugin>
+ </plugins>
</build>
<!--
View
6 framework/lift-persistence/pom.xml
@@ -77,6 +77,12 @@
<build>
<!-- <pluginManagement/> -->
<!-- <plugins/> -->
+ <plugins>
+ <plugin>
+ <groupId>org.scala-tools</groupId>
+ <artifactId>maven-scala-plugin</artifactId>
+ </plugin>
+ </plugins>
</build>
<!--
View
16 framework/pom.xml
@@ -79,9 +79,6 @@
</site>
</distributionManagement>
<properties>
- <!-- vscaladoc settings -->
- <!-- FIXME: 280 vscaladoc isn't 2.8 ready yet -->
- <!-- <maven.scaladoc.vscaladocVersion>1.2-m1</maven.scaladoc.vscaladocVersion> -->
<vscaladoc.links.liftweb.baseurl>${project.basedir}/../..</vscaladoc.links.liftweb.baseurl>
<vscaladoc.links.liftweb.pathsufix>target/site/scaladocs/</vscaladoc.links.liftweb.pathsufix>
@@ -179,11 +176,8 @@
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<configuration>
- <aggregateDirectOnly>false</aggregateDirectOnly>
- <forceAggregate>true</forceAggregate>
<jvmArgs>
<jvmArg>-Xmx2g</jvmArg>
- <jvmArg>-DpackageLinkDefs=file://${project.build.directory}/packageLinkDefs.properties</jvmArg>
</jvmArgs>
</configuration>
</plugin>
@@ -209,6 +203,11 @@
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
+ <inherited>false</inherited>
+ <configuration>
+ <!-- this configuration should not be inherited, it's to avoid framework_... as artifactId in doc -->
+ <artifactId>lift_${scala.version}</artifactId>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -305,15 +304,12 @@
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
- <version>2.14.3</version>
+ <version>2.15.1</version>
<configuration>
- <aggregateDirectOnly>false</aggregateDirectOnly>
- <forceAggregate>true</forceAggregate>
<charset>${project.build.sourceEncoding}</charset>
<!--<bottom>Copyright &#169; {inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.</bottom>-->
<jvmArgs>
<jvmArg>-Xmx2g</jvmArg>
- <jvmArg>-DpackageLinkDefs=file://${project.build.directory}/packageLinkDefs.properties</jvmArg>
</jvmArgs>
</configuration>
</plugin>
View
6 resources/lift-parent/pom.xml
@@ -889,9 +889,13 @@
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
- <version>2.14.3</version>
+ <version>2.15.1</version>
<configuration>
<charset>${project.build.sourceEncoding}</charset>
+ <logo><![CDATA[<a href="http://liftweb.net/"><img src="http://static.liftweb.com/logo.jpg" /></a>]]></logo>
+ <license><![CDATA[<a href="http://www.apache.org/licenses/LICENSE-2.0.txt" >Apache License, Version 2.0</a>]]></license>
+ <tags>web lift</tags>
+ <linksources>embed:/</linksources>
</configuration>
<executions>
<execution>
Please sign in to comment.
Something went wrong with that request. Please try again.