You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by ra...@apache.org on 2014/12/01 17:32:17 UTC
[1/3] deltaspike git commit: Revert "DELTASPIKE-777 added
plugin-version"
Repository: deltaspike
Updated Branches:
refs/heads/master 311aef6b5 -> 6c1377e2a
Revert "DELTASPIKE-777 added plugin-version"
This reverts commit 311aef6b54715b6ac6141ed9dbe5e04abeda40aa.
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/5d019f9d
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/5d019f9d
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/5d019f9d
Branch: refs/heads/master
Commit: 5d019f9d99d477b0fdd5390345f2a039346bf7f9
Parents: 311aef6
Author: Rafael Benevides <ra...@gmail.com>
Authored: Mon Dec 1 14:10:46 2014 -0200
Committer: Rafael Benevides <ra...@gmail.com>
Committed: Mon Dec 1 14:10:46 2014 -0200
----------------------------------------------------------------------
deltaspike/pom.xml | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5d019f9d/deltaspike/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/pom.xml b/deltaspike/pom.xml
index d7f8764..67bad09 100644
--- a/deltaspike/pom.xml
+++ b/deltaspike/pom.xml
@@ -146,7 +146,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
<configuration>
<charset>UTF-8</charset>
<additionalJOption>-Xdoclint:none</additionalJOption>
@@ -202,7 +201,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
- <version>1.1</version>
<configuration>
<content>${project.reporting.outputDirectory}/apidocs</content>
<pubScmUrl>scm:svn:${svn.scmPubUrl}</pubScmUrl>
[3/3] deltaspike git commit: DELTASPIKE-792 - Fix javadoc generation
for JDK < 8
Posted by ra...@apache.org.
DELTASPIKE-792 - Fix javadoc generation for JDK < 8
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/6c1377e2
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/6c1377e2
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/6c1377e2
Branch: refs/heads/master
Commit: 6c1377e2a0bac531a41cdf9ecfc6525527b8f9a4
Parents: 8d91054
Author: Rafael Benevides <ra...@gmail.com>
Authored: Mon Dec 1 14:28:19 2014 -0200
Committer: Rafael Benevides <ra...@gmail.com>
Committed: Mon Dec 1 14:28:19 2014 -0200
----------------------------------------------------------------------
deltaspike/pom.xml | 163 +++++++++++++++++++++++++++---------------------
1 file changed, 93 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/6c1377e2/deltaspike/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/pom.xml b/deltaspike/pom.xml
index 6447428..5c98815 100644
--- a/deltaspike/pom.xml
+++ b/deltaspike/pom.xml
@@ -46,9 +46,9 @@
<url>http://deltaspike.apache.org</url>
<properties>
- <svn.scmPubUrl>https://svn.apache.org/repos/asf/deltaspike/site/trunk/content/javadoc/${project.version}</svn.scmPubUrl>
- <svn.scmPubCheckoutDirectory>${project.build.directory}/co-site</svn.scmPubCheckoutDirectory>
- </properties>
+ <svn.scmPubUrl>https://svn.apache.org/repos/asf/deltaspike/site/trunk/content/javadoc/${project.version}</svn.scmPubUrl>
+ <svn.scmPubCheckoutDirectory>${project.build.directory}/co-site</svn.scmPubCheckoutDirectory>
+ </properties>
<scm>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/deltaspike.git</connection>
@@ -114,73 +114,74 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <charset>UTF-8</charset>
- <additionalJOption>-Xdoclint:none</additionalJOption>
- <excludePackageNames>org.apache.deltaspike.example.*:org.apache.deltaspike.playground*:org.apache.deltaspike.test.*:org.apache.deltaspike.cdise.tck*:org.apache.deltaspike.cdise.servlet*:*impl*</excludePackageNames>
- <groups>
- <group>
- <title>Core Module</title>
- <packages>org.apache.deltaspike.core.*</packages>
- </group>
- <group>
- <title>Bean Validation Module</title>
- <packages>org.apache.deltaspike.beanvalidation*</packages>
- </group>
- <group>
- <title>Container Control Module</title>
- <packages>org.apache.deltaspike.cdise.api*</packages>
- </group>
- <group>
- <title>Data Module</title>
- <packages>org.apache.deltaspike.data.*</packages>
- </group>
- <group>
- <title>JPA Module</title>
- <packages>org.apache.deltaspike.jpa.*</packages>
- </group>
- <group>
- <title>JSF Module</title>
- <packages>org.apache.deltaspike.jsf.*</packages>
- </group>
- <group>
- <title>Partial Bean Module</title>
- <packages>org.apache.deltaspike.partialbean.*</packages>
- </group>
- <group>
- <title>Scheduler Module</title>
- <packages>org.apache.deltaspike.scheduler.*</packages>
- </group>
- <group>
- <title>Security Module</title>
- <packages>org.apache.deltaspike.security.*</packages>
- </group>
- <group>
- <title>Servlet Module</title>
- <packages>org.apache.deltaspike.servlet.*</packages>
- </group>
- <group>
- <title>Test Control Module</title>
- <packages>org.apache.deltaspike.testcontrol.*</packages>
- </group>
- </groups>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <configuration>
- <content>${project.reporting.outputDirectory}/apidocs</content>
- <pubScmUrl>scm:svn:${svn.scmPubUrl}</pubScmUrl>
- <tryUpdate>true</tryUpdate>
- <checkoutDirectory>${svn.scmPubCheckoutDirectory}</checkoutDirectory>
- <serverId>deltaspike-site</serverId>
- </configuration>
- </plugin>
- </plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <charset>UTF-8</charset>
+ <detectLinks>true</detectLinks>
+ <excludePackageNames>org.apache.deltaspike.example.*:org.apache.deltaspike.playground*:org.apache.deltaspike.test.*:org.apache.deltaspike.cdise.tck*:org.apache.deltaspike.cdise.servlet*:*impl*</excludePackageNames>
+ <groups>
+ <group>
+ <title>Core Module</title>
+ <packages>org.apache.deltaspike.core.*</packages>
+ </group>
+ <group>
+ <title>Bean Validation Module</title>
+ <packages>org.apache.deltaspike.beanvalidation*</packages>
+ </group>
+ <group>
+ <title>Container Control Module</title>
+ <packages>org.apache.deltaspike.cdise.api*</packages>
+ </group>
+ <group>
+ <title>Data Module</title>
+ <packages>org.apache.deltaspike.data.*</packages>
+ </group>
+ <group>
+ <title>JPA Module</title>
+ <packages>org.apache.deltaspike.jpa.*</packages>
+ </group>
+ <group>
+ <title>JSF Module</title>
+ <packages>org.apache.deltaspike.jsf.*</packages>
+ </group>
+ <group>
+ <title>Partial Bean Module</title>
+ <packages>org.apache.deltaspike.partialbean.*</packages>
+ </group>
+ <group>
+ <title>Scheduler Module</title>
+ <packages>org.apache.deltaspike.scheduler.*</packages>
+ </group>
+ <group>
+ <title>Security Module</title>
+ <packages>org.apache.deltaspike.security.*</packages>
+ </group>
+ <group>
+ <title>Servlet Module</title>
+ <packages>org.apache.deltaspike.servlet.*</packages>
+ </group>
+ <group>
+ <title>Test Control Module</title>
+ <packages>org.apache.deltaspike.testcontrol.*</packages>
+ </group>
+ </groups>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <configuration>
+ <content>${project.reporting.outputDirectory}/apidocs</content>
+ <pubScmUrl>scm:svn:${svn.scmPubUrl}</pubScmUrl>
+ <tryUpdate>true</tryUpdate>
+ <checkoutDirectory>${svn.scmPubCheckoutDirectory}</checkoutDirectory>
+ <serverId>deltaspike-site</serverId>
+ </configuration>
+ </plugin>
+ </plugins>
</pluginManagement>
</build>
@@ -204,6 +205,28 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <!-- It disables javadoc doclint for JDK > 8-->
+ <id>javadoc-xdoclint-disable-jdk8+</id>
+ <activation>
+ <jdk>[1.8,)</jdk>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <additionalJOption>-Xdoclint:none</additionalJOption>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+
<profile>
<id>distribution</id>
<modules>
[2/3] deltaspike git commit: Revert "DELTASPIKE-777 moved config to
profile"
Posted by ra...@apache.org.
Revert "DELTASPIKE-777 moved config to profile"
This reverts commit cd805aabc4191545ca84f8f0832efe7d193c77e1.
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/8d910540
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/8d910540
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/8d910540
Branch: refs/heads/master
Commit: 8d91054014ecfcc1d68e1520f0ca29093ac453ed
Parents: 5d019f9
Author: Rafael Benevides <ra...@gmail.com>
Authored: Mon Dec 1 14:10:55 2014 -0200
Committer: Rafael Benevides <ra...@gmail.com>
Committed: Mon Dec 1 14:10:55 2014 -0200
----------------------------------------------------------------------
deltaspike/javadoc.sh | 2 +-
deltaspike/pom.xml | 141 +++++++++++++++++++++------------------------
2 files changed, 67 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/8d910540/deltaspike/javadoc.sh
----------------------------------------------------------------------
diff --git a/deltaspike/javadoc.sh b/deltaspike/javadoc.sh
index 5073dc1..d0bb742 100755
--- a/deltaspike/javadoc.sh
+++ b/deltaspike/javadoc.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
#####################################################################################
-mvn clean javadoc:aggregate scm-publish:publish-scm -Ppublish-javadoc
\ No newline at end of file
+mvn clean javadoc:aggregate scm-publish:publish-scm
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/8d910540/deltaspike/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/pom.xml b/deltaspike/pom.xml
index 67bad09..6447428 100644
--- a/deltaspike/pom.xml
+++ b/deltaspike/pom.xml
@@ -114,6 +114,72 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <charset>UTF-8</charset>
+ <additionalJOption>-Xdoclint:none</additionalJOption>
+ <excludePackageNames>org.apache.deltaspike.example.*:org.apache.deltaspike.playground*:org.apache.deltaspike.test.*:org.apache.deltaspike.cdise.tck*:org.apache.deltaspike.cdise.servlet*:*impl*</excludePackageNames>
+ <groups>
+ <group>
+ <title>Core Module</title>
+ <packages>org.apache.deltaspike.core.*</packages>
+ </group>
+ <group>
+ <title>Bean Validation Module</title>
+ <packages>org.apache.deltaspike.beanvalidation*</packages>
+ </group>
+ <group>
+ <title>Container Control Module</title>
+ <packages>org.apache.deltaspike.cdise.api*</packages>
+ </group>
+ <group>
+ <title>Data Module</title>
+ <packages>org.apache.deltaspike.data.*</packages>
+ </group>
+ <group>
+ <title>JPA Module</title>
+ <packages>org.apache.deltaspike.jpa.*</packages>
+ </group>
+ <group>
+ <title>JSF Module</title>
+ <packages>org.apache.deltaspike.jsf.*</packages>
+ </group>
+ <group>
+ <title>Partial Bean Module</title>
+ <packages>org.apache.deltaspike.partialbean.*</packages>
+ </group>
+ <group>
+ <title>Scheduler Module</title>
+ <packages>org.apache.deltaspike.scheduler.*</packages>
+ </group>
+ <group>
+ <title>Security Module</title>
+ <packages>org.apache.deltaspike.security.*</packages>
+ </group>
+ <group>
+ <title>Servlet Module</title>
+ <packages>org.apache.deltaspike.servlet.*</packages>
+ </group>
+ <group>
+ <title>Test Control Module</title>
+ <packages>org.apache.deltaspike.testcontrol.*</packages>
+ </group>
+ </groups>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <configuration>
+ <content>${project.reporting.outputDirectory}/apidocs</content>
+ <pubScmUrl>scm:svn:${svn.scmPubUrl}</pubScmUrl>
+ <tryUpdate>true</tryUpdate>
+ <checkoutDirectory>${svn.scmPubCheckoutDirectory}</checkoutDirectory>
+ <serverId>deltaspike-site</serverId>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -139,81 +205,6 @@
</build>
</profile>
<profile>
- <id>publish-javadoc</id>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <charset>UTF-8</charset>
- <additionalJOption>-Xdoclint:none</additionalJOption>
- <excludePackageNames>org.apache.deltaspike.example.*:org.apache.deltaspike.playground*:org.apache.deltaspike.test.*:org.apache.deltaspike.cdise.tck*:org.apache.deltaspike.cdise.servlet*:*impl*</excludePackageNames>
- <groups>
- <group>
- <title>Core Module</title>
- <packages>org.apache.deltaspike.core.*</packages>
- </group>
- <group>
- <title>Bean Validation Module</title>
- <packages>org.apache.deltaspike.beanvalidation*</packages>
- </group>
- <group>
- <title>Container Control Module</title>
- <packages>org.apache.deltaspike.cdise.api*</packages>
- </group>
- <group>
- <title>Data Module</title>
- <packages>org.apache.deltaspike.data.*</packages>
- </group>
- <group>
- <title>JPA Module</title>
- <packages>org.apache.deltaspike.jpa.*</packages>
- </group>
- <group>
- <title>JSF Module</title>
- <packages>org.apache.deltaspike.jsf.*</packages>
- </group>
- <group>
- <title>Partial Bean Module</title>
- <packages>org.apache.deltaspike.partialbean.*</packages>
- </group>
- <group>
- <title>Scheduler Module</title>
- <packages>org.apache.deltaspike.scheduler.*</packages>
- </group>
- <group>
- <title>Security Module</title>
- <packages>org.apache.deltaspike.security.*</packages>
- </group>
- <group>
- <title>Servlet Module</title>
- <packages>org.apache.deltaspike.servlet.*</packages>
- </group>
- <group>
- <title>Test Control Module</title>
- <packages>org.apache.deltaspike.testcontrol.*</packages>
- </group>
- </groups>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <configuration>
- <content>${project.reporting.outputDirectory}/apidocs</content>
- <pubScmUrl>scm:svn:${svn.scmPubUrl}</pubScmUrl>
- <tryUpdate>true</tryUpdate>
- <checkoutDirectory>${svn.scmPubCheckoutDirectory}</checkoutDirectory>
- <serverId>deltaspike-site</serverId>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- <profile>
<id>distribution</id>
<modules>
<module>checkstyle-rules</module>