[jboss-svn-commits] JBL Code SVN: r36136 - in labs/jbossrules/trunk: drools-api and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Dec 1 05:39:49 EST 2010
Author: ge0ffrey
Date: 2010-12-01 05:39:48 -0500 (Wed, 01 Dec 2010)
New Revision: 36136
Added:
labs/jbossrules/trunk/src/site/
labs/jbossrules/trunk/src/site/site.xml
Modified:
labs/jbossrules/trunk/README.txt
labs/jbossrules/trunk/drools-api/pom.xml
labs/jbossrules/trunk/drools-core/pom.xml
labs/jbossrules/trunk/pom.xml
Log:
update plugin versions + update site plugin (to solve maven 3 warnings) + clean up javadocs plugin
Modified: labs/jbossrules/trunk/README.txt
===================================================================
--- labs/jbossrules/trunk/README.txt 2010-12-01 09:09:49 UTC (rev 36135)
+++ labs/jbossrules/trunk/README.txt 2010-12-01 10:39:48 UTC (rev 36136)
@@ -8,22 +8,15 @@
Drools uses maven to build the system. There are two profiles available which
enable the associated modules "documentation" and "eclipse"; this enables
-quicker building of the core modules for developers. The eclipse profile will
-download eclipse into the drools-eclipse folder, which is over 100MB download,
-however this only needs to be done once; if you wish you can move that eclipse
-download into another location and specify it with
--DlocalEclipseDrop=/folder/jboss-rules/local-eclipse-drop-mirror.
+quicker building of the core modules for developers.
-The following builds all the jars, the documentation and the eclipse zip with a
+The following builds all the jars, the documentation and the eclipse updatesite zip with a
local folder specified to avoid downloading eclipse:
- mvn -Declipse -Ddocumentation clean install
- -DlocalEclipseDrop=/folder/jboss-rules/local-eclipse-drop-mirror
+ mvn -Declipse -Ddocumentation clean install
You can produce distribution builds, which puts everything into zips, as follows:
mvn -Declipse -Ddocumentation clean install
- -DlocalEclipseDrop=/folder/jboss-rules/local-eclipse-drop-mirror
-mvn -Ddocumentation -Declipse -DskipTests package javadoc:javadoc assembly:assembly
- -DlocalEclipseDrop=/folder/jboss-rules/local-eclipse-drop-mirror
+mvn -Ddocumentation -Declipse -DskipTests package javadoc:javadoc assembly:assembly
Note that install must be done first as javadoc:javadoc won't work unless the
jars are in the local maven repo, but the tests can be skipped on the second run.
Modified: labs/jbossrules/trunk/drools-api/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-api/pom.xml 2010-12-01 09:09:49 UTC (rev 36135)
+++ labs/jbossrules/trunk/drools-api/pom.xml 2010-12-01 10:39:48 UTC (rev 36136)
@@ -134,23 +134,12 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<aggregate>false</aggregate>
- <!--doclet>ydoc.doclets.YStandard</doclet>
- <docletPath> ${ydoc.home}/lib/ydoc.jar${path.separator}${ydoc.home}/lib/class2svg.jar${path.separator}${ydoc.home}/resources
- </docletPath>
- <additionalparam>-umlautogen -tag y.precondition -tag y.postcondition -tag y.complexity -tag param -tag return -tag see -tag y.uml
- </additionalparam-->
<links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+ <link>http://download.oracle.com/javase/1.5.0/docs/api</link>
</links>
<minmemory>128m</minmemory>
- <maxmemory>512</maxmemory>
+ <maxmemory>512m</maxmemory>
<author>false</author>
- <bottom>true</bottom>
- <header>JBoss Drools</header>
- <packagenames>org.drools.*</packagenames>
- <use>true</use>
- <version>true</version>
- <windowtitle>${project.name} ${project.version} API</windowtitle>
<breakiterator>true</breakiterator>
<excludePackageNames>org.drools.util*</excludePackageNames>
<overview>src/main/java/overview.html</overview>
Modified: labs/jbossrules/trunk/drools-core/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-core/pom.xml 2010-12-01 09:09:49 UTC (rev 36135)
+++ labs/jbossrules/trunk/drools-core/pom.xml 2010-12-01 10:39:48 UTC (rev 36136)
@@ -200,20 +200,13 @@
<configuration>
<aggregate>false</aggregate>
<links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+ <link>http://download.oracle.com/javase/1.5.0/docs/api</link>
</links>
<minmemory>128m</minmemory>
- <maxmemory>512</maxmemory>
+ <maxmemory>512m</maxmemory>
<author>false</author>
- <bottom>true</bottom>
- <header>JBoss Drools</header>
- <packagenames>org.drools.*</packagenames>
- <use>true</use>
- <version>true</version>
- <windowtitle>${project.name} ${project.version} API</windowtitle>
<breakiterator>true</breakiterator>
- <excludePackageNames>
- org.drools.asm*,org.drools.objenesis.*,org.drools.commons.jci.*</excludePackageNames>
+ <excludePackageNames>org.drools.asm*,org.drools.objenesis.*,org.drools.commons.jci.*</excludePackageNames>
</configuration>
</plugin>
</plugins>
Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml 2010-12-01 09:09:49 UTC (rev 36135)
+++ labs/jbossrules/trunk/pom.xml 2010-12-01 10:39:48 UTC (rev 36136)
@@ -287,64 +287,6 @@
</modules>
<profiles>
- <!--profile>
- <id>ydoc-doclet</id>
- <activation>
- <property>
- <name>ydoc.home</name>
- </property>
- </activation>
-
- <reporting>
- <plugins>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.3</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <aggregate>false</aggregate>
- <doclet>ydoc.doclets.YStandard</doclet>
- <docletPath>
- ${ydoc.home}/lib/ydoc.jar${path.separator}${ydoc.home}/lib/class2svg.jar${path.separator}${ydoc.home}/resources
- </docletPath>
- <author>false</author>
- <bottom>true</bottom>
- <header>JBoss Rules</header>
- <minmemory>128m</minmemory>
- <maxmemory>512</maxmemory>
- <packagenames>org.drools.*</packagenames>
- <use>true</use>
- <version>true</version>
- <windowtitle>${project.name} ${project.version} API</windowtitle>
- <breakiterator>true</breakiterator>
- <excludePackageNames>org.drools.asm*,org.drools.objenesis.*,org.drools.commons.jci.*
- </excludePackageNames>
- <overview>drools-core/target/classes/overview.html</overview>
- <groups>
- <group title="Runtime Core API" packages="org.drools:org.drools.rule"/>
- <group title="Compiler Core API" packages="org.drools.compiler"/>
- <group title="Compiler Utilities" packages="org.drools.lang:org.drools.xml"/>
- <group title="Runtime Utilities"
- packages="org.drools.audit:org.drools.event:org.drools.visualize"/>
- <group title="Decision Tables" packages="org.drools.decisiontable"/>
- <group title="Internal" packages="org.drools*"/>
- </groups>
- <additionalparam>-umlautogen -tag y.precondition -tag y.postcondition -tag y.complexity -tag
- param -tag return -tag see -tag y.uml
- </additionalparam>
- </configuration>
- </plugin>
-
- </plugins>
- </reporting>
- </profile-->
<profile>
<id>default</id>
<activation>
@@ -523,11 +465,6 @@
<artifactId>maven-bundle-plugin</artifactId>
<version>2.1.0</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -608,7 +545,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1</version>
+ <version>2.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -618,15 +555,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
+ <version>2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.0-alpha-4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.3.1</version>
</plugin>
@@ -638,7 +570,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
<configuration>
<tagBase>https://svn.labs.jboss.com/labs/jbossrules/tags</tagBase>
<preparationGoals>-Drelease=true clean install
@@ -650,7 +582,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
<configuration>
<!--<downloadSources>true</downloadSources>-->
</configuration>
@@ -658,13 +590,13 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.1.1</version>
+ <version>1.2</version>
</plugin>
<!--Site -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0.1</version>
+ <version>3.0-beta-3</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -685,27 +617,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <!-- In 2.0-beta-1 an aggregate works after running "mvn site" twice -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javancss-maven-plugin</artifactId>
- <version>2.0-beta-2</version>
- </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -736,38 +647,28 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
<configuration>
<aggregate>false</aggregate>
<links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+ <link>http://download.oracle.com/javase/1.5.0/docs/api</link>
</links>
<minmemory>128m</minmemory>
- <maxmemory>512</maxmemory>
+ <maxmemory>512m</maxmemory>
<author>false</author>
- <bottom>true</bottom>
- <header>JBoss Drools</header>
- <packagenames>org.drools.*</packagenames>
- <use>true</use>
- <version>true</version>
- <windowtitle>${project.name} ${project.version} API</windowtitle>
<breakiterator>true</breakiterator>
- <excludePackageNames>org.drools.brms.client</excludePackageNames>
</configuration>
</plugin>
- <!--
- TODO Changelog is unfinished:
- - has also a problem with the netbeans (cvs)lib dependency
- - is moving from mojo.codehaus.org to maven.apache.org
- -->
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-changelog-plugin</artifactId>-->
- <!--<version>2.0-beta-1</version>-->
- <!--</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
@@ -781,7 +682,13 @@
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
+ <artifactId>javancss-maven-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<formats>
<format>html</format>
@@ -789,53 +696,16 @@
</formats>
</configuration>
</plugin>
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-clover-plugin</artifactId>-->
- <!--<configuration/>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<phase>pre-site</phase>-->
- <!--<goals>-->
- <!--<goal>instrument</goal>-->
- <!--<goal>aggregate</goal>-->
- <!--</goals>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
</plugin>
<!--<plugin>-->
<!--<groupId>org.codehaus.mojo</groupId>-->
<!--<artifactId>findbugs-maven-plugin</artifactId>-->
- <!--<version>1.0-beta-1</version>-->
+ <!--<version>2.3.1</version>-->
<!--</plugin>-->
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-pmd-plugin</artifactId>-->
- <!--<version>2.0</version>-->
- <!--</plugin>-->
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-checkstyle-plugin</artifactId>-->
- <!--<version>2.1</version>-->
- <!--</plugin>-->
- <!--<plugin>-->
- <!--<groupId>org.codehaus.mojo</groupId>-->
- <!--<artifactId>jdepend-maven-plugin</artifactId>-->
- <!--<version>2.0-beta-1</version>-->
- <!--</plugin>-->
- <plugin>
- <!-- In 2.0-beta-1 an aggregate works after running "mvn site" twice -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javancss-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
</plugins>
</reporting>
@@ -850,7 +720,6 @@
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
<dependencyManagement>
Added: labs/jbossrules/trunk/src/site/site.xml
===================================================================
--- labs/jbossrules/trunk/src/site/site.xml (rev 0)
+++ labs/jbossrules/trunk/src/site/site.xml 2010-12-01 10:39:48 UTC (rev 36136)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2010 JBoss Inc
+ ~
+ ~ Licensed 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.
+ -->
+
+<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+
+ <!--
+ TODO remove this file when maven-site-plugin is a higher version than 3.0-beta-3
+ and no longer depends on a SNAPSHOT of the maven-default-skin.
+ -->
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-default-skin</artifactId>
+ <version>1.0</version>
+ </skin>
+
+</project>
More information about the jboss-svn-commits
mailing list