You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2014/11/30 17:13:24 UTC
[1/2] deltaspike git commit: DELTASPIKE-777 moved config to profile
Repository: deltaspike
Updated Branches:
refs/heads/master df77dfb33 -> 311aef6b5
DELTASPIKE-777 moved config to profile
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/cd805aab
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/cd805aab
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/cd805aab
Branch: refs/heads/master
Commit: cd805aabc4191545ca84f8f0832efe7d193c77e1
Parents: df77dfb
Author: gpetracek <gp...@apache.org>
Authored: Sun Nov 30 16:55:16 2014 +0100
Committer: gpetracek <gp...@apache.org>
Committed: Sun Nov 30 16:56:51 2014 +0100
----------------------------------------------------------------------
deltaspike/javadoc.sh | 2 +-
deltaspike/pom.xml | 141 ++++++++++++++++++++++++---------------------
2 files changed, 76 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cd805aab/deltaspike/javadoc.sh
----------------------------------------------------------------------
diff --git a/deltaspike/javadoc.sh b/deltaspike/javadoc.sh
index d0bb742..5073dc1 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
\ No newline at end of file
+mvn clean javadoc:aggregate scm-publish:publish-scm -Ppublish-javadoc
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cd805aab/deltaspike/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/pom.xml b/deltaspike/pom.xml
index 6447428..67bad09 100644
--- a/deltaspike/pom.xml
+++ b/deltaspike/pom.xml
@@ -114,72 +114,6 @@
</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>
@@ -205,6 +139,81 @@
</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>
[2/2] deltaspike git commit: DELTASPIKE-777 added plugin-version
Posted by gp...@apache.org.
DELTASPIKE-777 added plugin-version
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/311aef6b
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/311aef6b
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/311aef6b
Branch: refs/heads/master
Commit: 311aef6b54715b6ac6141ed9dbe5e04abeda40aa
Parents: cd805aa
Author: gpetracek <gp...@apache.org>
Authored: Sun Nov 30 17:12:03 2014 +0100
Committer: gpetracek <gp...@apache.org>
Committed: Sun Nov 30 17:12:03 2014 +0100
----------------------------------------------------------------------
deltaspike/pom.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/311aef6b/deltaspike/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/pom.xml b/deltaspike/pom.xml
index 67bad09..d7f8764 100644
--- a/deltaspike/pom.xml
+++ b/deltaspike/pom.xml
@@ -146,6 +146,7 @@
<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>
@@ -201,6 +202,7 @@
<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>