Repository: deltaspike Updated Branches: refs/heads/master 5c82e1a7b -> cc45eac0f
DELTASPIKE-814 - Create a root pom.xml to share common properties Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/cc45eac0 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/cc45eac0 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/cc45eac0 Branch: refs/heads/master Commit: cc45eac0fc28605ff7b8de22514a7513b18ddcd6 Parents: 5c82e1a Author: Rafael Benevides <[email protected]> Authored: Tue Dec 30 17:50:41 2014 -0200 Committer: Rafael Benevides <[email protected]> Committed: Tue Dec 30 19:15:35 2014 -0200 ---------------------------------------------------------------------- deltaspike/NOTICE | 12 +- deltaspike/javadoc.sh | 2 +- deltaspike/pom.xml | 114 ++++++++--------- documentation/pom.xml | 205 ++++++++++++------------------ pom.xml | 145 +++++++++++++++++++++ site/pom.xml | 204 ++++++++++++----------------- site/src/main/asciidoc/download.adoc | 32 ++--- site/src/main/asciidoc/javadoc.adoc | 8 +- 8 files changed, 382 insertions(+), 340 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cc45eac0/deltaspike/NOTICE ---------------------------------------------------------------------- diff --git a/deltaspike/NOTICE b/deltaspike/NOTICE index fc358e3..09a3ced 100644 --- a/deltaspike/NOTICE +++ b/deltaspike/NOTICE @@ -1,6 +1,6 @@ -Apache DeltaSpike -Copyright 2011 - 2014 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - +Apache DeltaSpike +Copyright 2011 - 2014 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cc45eac0/deltaspike/javadoc.sh ---------------------------------------------------------------------- diff --git a/deltaspike/javadoc.sh b/deltaspike/javadoc.sh index d0bb742..0c56984 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 http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cc45eac0/deltaspike/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/pom.xml b/deltaspike/pom.xml index b2404be..eece822 100644 --- a/deltaspike/pom.xml +++ b/deltaspike/pom.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -21,42 +22,31 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache</groupId> - <artifactId>apache</artifactId> - <version>14</version> + <groupId>org.apache.deltaspike</groupId> + <artifactId>deltaspike-root</artifactId> + <version>1.2.2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <!-- + <!-- * Please do not use this pom for other deltaspike modules. * Instead use the one from parent/pom.xml! * - * This very pom.xml contains only the basic build layout + * This very pom.xml contains only the basic build layout * and no build-rules at all. See parent/pom.xml for all - * the dependencyManagement and plugin configuration stuff. + * the dependencyManagement and plugin configuration stuff. --> <groupId>org.apache.deltaspike</groupId> <artifactId>deltaspike-project</artifactId> <version>1.2.2-SNAPSHOT</version> <packaging>pom</packaging> - <name>Apache DeltaSpike</name> + <name>Apache DeltaSpike Sources</name> <description> Apache DeltaSpike CDI Extensions. </description> <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> - - <scm> - <connection>scm:git:https://git-wip-us.apache.org/repos/asf/deltaspike.git</connection> - <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/deltaspike.git</developerConnection> - <url>https://git-wip-us.apache.org/repos/asf/deltaspike.git</url> - <tag>HEAD</tag> - </scm> - <modules> <module>checkstyle-rules</module> <module>parent</module> @@ -127,46 +117,46 @@ <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> + <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> @@ -207,7 +197,7 @@ </profile> <profile> - <!-- It disables javadoc doclint for JDK > 8--> + <!-- It disables javadoc doclint for JDK > 8 --> <id>javadoc-xdoclint-disable-jdk8+</id> <activation> <jdk>[1.8,)</jdk> @@ -222,7 +212,7 @@ <additionalJOption>-Xdoclint:none</additionalJOption> </configuration> </plugin> - </plugins> + </plugins> </pluginManagement> </build> </profile> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cc45eac0/documentation/pom.xml ---------------------------------------------------------------------- diff --git a/documentation/pom.xml b/documentation/pom.xml index 1cc3f26..b1f087c 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -1,137 +1,90 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <!-- Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with this - work for additional information regarding copyright ownership. The ASF licenses - this file to you 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. --> - <modelVersion>4.0.0</modelVersion> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you 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 - <parent> - <groupId>org.apache</groupId> - <artifactId>apache</artifactId> - <version>11</version> - </parent> + http://www.apache.org/licenses/LICENSE-2.0 - <!-- * Please do not use this pom for other deltaspike modules. * Instead - use the one from parent/pom.xml! * * This very pom.xml contains only the - basic build layout * and no build-rules at all. See parent/pom.xml for all - * the dependencyManagement and plugin configuration stuff. --> - <groupId>org.apache.deltaspike</groupId> - <artifactId>deltaspike-documentation</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>pom</packaging> + 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. +--> + <modelVersion>4.0.0</modelVersion> - <name>Apache DeltaSpike - Documentation</name> - <description> + <parent> + <groupId>org.apache.deltaspike</groupId> + <artifactId>deltaspike-root</artifactId> + <version>1.2.2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.apache.deltaspike</groupId> + <artifactId>deltaspike-documentation</artifactId> + <version>1.2.2-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>Apache DeltaSpike Documentation</name> + <description> Documentation of DeltaSpike project. </description> - <url>http://deltaspike.apache.org</url> - - <properties> - <asciidoctor.version>1.5.0</asciidoctor.version> - <svn.scmPubUrl>https://svn.apache.org/repos/asf/deltaspike/site/trunk/content/documentation/</svn.scmPubUrl> - <svn.scmPubUrlStaging>https://svn.apache.org/repos/asf/deltaspike/site/trunk/content/staging/documentation/</svn.scmPubUrlStaging> - <svn.scmPubCheckoutDirectory>${project.build.directory}/co-site</svn.scmPubCheckoutDirectory> - <version.deltaspike.latest.stable>1.2.1</version.deltaspike.latest.stable> - <version.deltaspike.latest.snapshot>1.2.2-SNAPSHOT</version.deltaspike.latest.snapshot> - </properties> + <url>http://deltaspike.apache.org/documentation</url> - <distributionManagement> - <site> - <id>apache.website</id> - <url>${svn.scmPubUrl}</url> - </site> - </distributionManagement> + <properties> + <svn.scmPubUrl>https://svn.apache.org/repos/asf/deltaspike/site/trunk/content/documentation/</svn.scmPubUrl> + <svn.scmPubUrlStaging>https://svn.apache.org/repos/asf/deltaspike/site/trunk/content/staging/documentation/</svn.scmPubUrlStaging> + </properties> - <build> - <plugins> - <plugin> - <groupId>org.asciidoctor</groupId> - <artifactId>asciidoctor-maven-plugin</artifactId> - <version>${asciidoctor.version}</version> - <executions> - <execution> - <id>output-html</id> - <phase>site</phase> - <goals> - <goal>process-asciidoc</goal> - </goals> - </execution> - </executions> - <configuration> - <sourceDirectory>src/main/asciidoc</sourceDirectory> - <outputDirectory>${project.build.directory}/site</outputDirectory> - <sourceHighlighter>coderay</sourceHighlighter> - <backend>html</backend> - <templateDir>../template</templateDir> - <eruby>erb</eruby> - <preserveDirectories>true</preserveDirectories> - <attributes> - <toc>true</toc> - <basedir>..</basedir> - <icons>font</icons> - <latestStable>${version.deltaspike.latest.stable}</latestStable> - <latestSnapshot>${version.deltaspike.latest.snapshot}</latestSnapshot> - </attributes> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-scm-publish-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <id>scm-publish</id> - <phase>site-deploy</phase> - <!-- deploy site with maven-scm-publish-plugin --> - <goals> - <goal>publish-scm</goal> - </goals> - </execution> - </executions> - <configuration> - <content>${project.reporting.outputDirectory}</content> - <pubScmUrl>scm:svn:${svn.scmPubUrl}</pubScmUrl> - <tryUpdate>true</tryUpdate> - <checkoutDirectory>${svn.scmPubCheckoutDirectory}</checkoutDirectory> - <serverId>deltaspike-site</serverId> - </configuration> - </plugin> - <!-- this is a hack, to make site not really run. --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <configuration> - <skip>true</skip> - <skipDeploy>true</skipDeploy> - </configuration> - </plugin> - </plugins> - </build> + <distributionManagement> + <site> + <id>apache.website</id> + <url>${svn.scmPubUrl}</url> + </site> + </distributionManagement> - <profiles> - <profile> - <!-- Profile used to publish documentation under staging folder. --> - <id>staging</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-scm-publish-plugin</artifactId> - <version>1.1</version> - <configuration> - <pubScmUrl>scm:svn:${svn.scmPubUrlStaging}</pubScmUrl> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <build> + <plugins> + <plugin> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctor-maven-plugin</artifactId> + <executions> + <execution> + <id>output-html</id> + <phase>site</phase> + <goals> + <goal>process-asciidoc</goal> + </goals> + </execution> + </executions> + <configuration> + <attributes> + <basedir>..</basedir> + </attributes> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-scm-publish-plugin</artifactId> + <executions> + <execution> + <id>scm-publish</id> + <phase>site-deploy</phase> + <!-- deploy site with maven-scm-publish-plugin --> + <goals> + <goal>publish-scm</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cc45eac0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..e20dad1 --- /dev/null +++ b/pom.xml @@ -0,0 +1,145 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you 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. +--> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache</groupId> + <artifactId>apache</artifactId> + <version>14</version> + </parent> + + <!-- + * Please do not use this pom for other deltaspike modules. + * Instead use the one from parent/pom.xml! + * + * This very pom.xml contains only the basic build layout + * and no build-rules at all. See parent/pom.xml for all + * the dependencyManagement and plugin configuration stuff. + --> + <groupId>org.apache.deltaspike</groupId> + <artifactId>deltaspike-root</artifactId> + <version>1.2.2-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>Apache DeltaSpike</name> + <description> + Apache DeltaSpike CDI Extensions. + </description> + <url>http://deltaspike.apache.org</url> + + <properties> + <asciidoctor.version>1.5.2</asciidoctor.version> + <version.deltaspike.latest.stable>1.2.1</version.deltaspike.latest.stable> + <version.deltaspike.latest.snapshot>1.2.2-SNAPSHOT</version.deltaspike.latest.snapshot> + <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> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/deltaspike.git</developerConnection> + <url>https://git-wip-us.apache.org/repos/asf/deltaspike.git</url> + <tag>HEAD</tag> + </scm> + + <modules> + <module>deltaspike</module> + <module>documentation</module> + <module>site</module> + </modules> + + <build> + <pluginManagement> + <plugins> + <!-- this is a hack to make mvn site not really run. --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <skip>true</skip> + <skipDeploy>true</skipDeploy> + </configuration> + </plugin> + + <!-- SCM Publish plugin to publish documentation and site --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-scm-publish-plugin</artifactId> + <version>1.1</version> + <configuration> + <content>${project.reporting.outputDirectory}</content> + <pubScmUrl>scm:svn:${svn.scmPubUrl}</pubScmUrl> + <tryUpdate>true</tryUpdate> + <skipDeletedFiles>true</skipDeletedFiles> + <checkoutDirectory>${svn.scmPubCheckoutDirectory}</checkoutDirectory> + <serverId>deltaspike-site</serverId> + </configuration> + </plugin> + + <!-- Configure ASCIIDOC plugin --> + <plugin> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctor-maven-plugin</artifactId> + <version>${asciidoctor.version}</version> + <configuration> + <sourceDirectory>src/main/asciidoc</sourceDirectory> + <outputDirectory>${project.reporting.outputDirectory}</outputDirectory> + <sourceHighlighter>coderay</sourceHighlighter> + <backend>html</backend> + <templateDir>../template</templateDir> + <eruby>erb</eruby> + <preserveDirectories>true</preserveDirectories> + <attributes> + <toc>true</toc> + <icons>font</icons> + <latestStable>${version.deltaspike.latest.stable}</latestStable> + <latestSnapshot>${version.deltaspike.latest.snapshot}</latestSnapshot> + </attributes> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + + <profiles> + <profile> + <!-- Profile used to publish documentation and site under staging + folder. --> + <id>staging</id> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-scm-publish-plugin</artifactId> + <version>1.1</version> + <configuration> + <pubScmUrl>scm:svn:${svn.scmPubUrlStaging}</pubScmUrl> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + </profile> + </profiles> + +</project> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cc45eac0/site/pom.xml ---------------------------------------------------------------------- diff --git a/site/pom.xml b/site/pom.xml index 2268b78..9b15799 100644 --- a/site/pom.xml +++ b/site/pom.xml @@ -1,134 +1,90 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <!-- Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with this - work for additional information regarding copyright ownership. The ASF licenses - this file to you 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. --> - <modelVersion>4.0.0</modelVersion> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you 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 - <parent> - <groupId>org.apache</groupId> - <artifactId>apache</artifactId> - <version>11</version> - </parent> + http://www.apache.org/licenses/LICENSE-2.0 - <!-- * Please do not use this pom for other deltaspike modules. * Instead - use the one from parent/pom.xml! * * This very pom.xml contains only the - basic build layout * and no build-rules at all. See parent/pom.xml for all - * the dependencyManagement and plugin configuration stuff. --> - <groupId>org.apache.deltaspike</groupId> - <artifactId>deltaspike-site</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>pom</packaging> + 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. +--> + <modelVersion>4.0.0</modelVersion> - <name>Apache DeltaSpike - Site</name> - <description> - DeltaSpike website - </description> - <url>http://deltaspike.apache.org</url> + <parent> + <groupId>org.apache.deltaspike</groupId> + <artifactId>deltaspike-root</artifactId> + <version>1.2.2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.apache.deltaspike</groupId> + <artifactId>deltaspike-site</artifactId> + <version>1.2.2-SNAPSHOT</version> + <packaging>pom</packaging> - <properties> - <asciidoctor.version>1.5.0</asciidoctor.version> - <svn.scmPubUrl>https://svn.apache.org/repos/asf/deltaspike/site/trunk/content/</svn.scmPubUrl> - <svn.scmPubUrlStaging>https://svn.apache.org/repos/asf/deltaspike/site/trunk/content/staging/</svn.scmPubUrlStaging> - <svn.scmPubCheckoutDirectory>${project.build.directory}/co-site</svn.scmPubCheckoutDirectory> - </properties> + <name>Apache DeltaSpike Site</name> + <description> + DeltaSpike website + </description> + <url>http://deltaspike.apache.org</url> - <distributionManagement> - <site> - <id>apache.website</id> - <url>${svn.scmPubUrl}</url> - </site> - </distributionManagement> + <properties> + <svn.scmPubUrl>https://svn.apache.org/repos/asf/deltaspike/site/trunk/content/</svn.scmPubUrl> + <svn.scmPubUrlStaging>https://svn.apache.org/repos/asf/deltaspike/site/trunk/content/staging/</svn.scmPubUrlStaging> + </properties> - <build> - <plugins> - <plugin> - <groupId>org.asciidoctor</groupId> - <artifactId>asciidoctor-maven-plugin</artifactId> - <version>${asciidoctor.version}</version> - <executions> - <execution> - <id>output-html</id> - <phase>site</phase> - <goals> - <goal>process-asciidoc</goal> - </goals> - </execution> - </executions> - <configuration> - <sourceDirectory>src/main/asciidoc</sourceDirectory> - <outputDirectory>${project.build.directory}/site</outputDirectory> - <sourceHighlighter>coderay</sourceHighlighter> - <backend>html</backend> - <templateDir>../template</templateDir> - <eruby>erb</eruby> - <preserveDirectories>true</preserveDirectories> - <attributes> - <toc>true</toc> - <basedir>.</basedir> - <icons>font</icons> - </attributes> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-scm-publish-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <id>scm-publish</id> - <phase>site-deploy</phase> - <!-- deploy site with maven-scm-publish-plugin --> - <goals> - <goal>publish-scm</goal> - </goals> - </execution> - </executions> - <configuration> - <content>${project.reporting.outputDirectory}</content> - <pubScmUrl>scm:svn:${svn.scmPubUrl}</pubScmUrl> - <tryUpdate>true</tryUpdate> - <skipDeletedFiles>true</skipDeletedFiles> - <checkoutDirectory>${svn.scmPubCheckoutDirectory}</checkoutDirectory> - <serverId>deltaspike-site</serverId> - </configuration> - </plugin> - <!-- this is a hack, to make site not really run. --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <configuration> - <skip>true</skip> - <skipDeploy>true</skipDeploy> - </configuration> - </plugin> - </plugins> - </build> + <distributionManagement> + <site> + <id>apache.website</id> + <url>${svn.scmPubUrl}</url> + </site> + </distributionManagement> - <profiles> - <profile> - <!-- Profile used to publish documentation under staging folder. --> - <id>staging</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-scm-publish-plugin</artifactId> - <version>1.1</version> - <configuration> - <pubScmUrl>scm:svn:${svn.scmPubUrlStaging}</pubScmUrl> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <build> + <plugins> + <plugin> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctor-maven-plugin</artifactId> + <executions> + <execution> + <id>output-html</id> + <phase>site</phase> + <goals> + <goal>process-asciidoc</goal> + </goals> + </execution> + </executions> + <configuration> + <attributes> + <basedir>.</basedir> + </attributes> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-scm-publish-plugin</artifactId> + <executions> + <execution> + <id>scm-publish</id> + <phase>site-deploy</phase> + <!-- deploy site with maven-scm-publish-plugin --> + <goals> + <goal>publish-scm</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cc45eac0/site/src/main/asciidoc/download.adoc ---------------------------------------------------------------------- diff --git a/site/src/main/asciidoc/download.adoc b/site/src/main/asciidoc/download.adoc index 2c1998c..55b6662 100644 --- a/site/src/main/asciidoc/download.adoc +++ b/site/src/main/asciidoc/download.adoc @@ -7,30 +7,30 @@ == Latest Release -v1.2.1 +v{latestStable} == Binary Distribution -* http://www.apache.org/dyn/closer.cgi/deltaspike/1.2.1/distribution-full-1.2.1.zip[distribution-full-1.2.1.zip] -* http://www.apache.org/dist/deltaspike/1.2.1/distribution-full-1.2.1.zip.asc[distribution-full-1.2.1.zip.asc] -* http://www.apache.org/dist/deltaspike/1.2.1/distribution-full-1.2.1.zip.md5[distribution-full-1.2.1.zip.md5] -* http://www.apache.org/dist/deltaspike/1.2.1/distribution-full-1.2.1.zip.sha1[distribution-full-1.2.1.zip.sha1] +* http://www.apache.org/dyn/closer.cgi/deltaspike/{latestStable}/distribution-full-{latestStable}.zip[distribution-full-{latestStable}.zip] +* http://www.apache.org/dist/deltaspike/{latestStable}/distribution-full-{latestStable}.zip.asc[distribution-full-{latestStable}.zip.asc] +* http://www.apache.org/dist/deltaspike/{latestStable}/distribution-full-{latestStable}.zip.md5[distribution-full-{latestStable}.zip.md5] +* http://www.apache.org/dist/deltaspike/{latestStable}/distribution-full-{latestStable}.zip.sha1[distribution-full-{latestStable}.zip.sha1] -* http://www.apache.org/dyn/closer.cgi/deltaspike/1.2.1/distribution-full-1.2.1.tar.gz[distribution-full-1.2.1.tar.gz] -* http://www.apache.org/dist/deltaspike/1.2.1/distribution-full-1.2.1.tar.gz.asc[distribution-full-1.2.1.tar.gz.asc] -* http://www.apache.org/dist/deltaspike/1.2.1/distribution-full-1.2.1.tar.gz.md5[distribution-full-1.2.1.tar.gz.md5] -* http://www.apache.org/dist/deltaspike/1.2.1/distribution-full-1.2.1.tar.gz.sha1[distribution-full-1.2.1.tar.gz.sha1] +* http://www.apache.org/dyn/closer.cgi/deltaspike/{latestStable}/distribution-full-{latestStable}.tar.gz[distribution-full-{latestStable}.tar.gz] +* http://www.apache.org/dist/deltaspike/{latestStable}/distribution-full-{latestStable}.tar.gz.asc[distribution-full-{latestStable}.tar.gz.asc] +* http://www.apache.org/dist/deltaspike/{latestStable}/distribution-full-{latestStable}.tar.gz.md5[distribution-full-{latestStable}.tar.gz.md5] +* http://www.apache.org/dist/deltaspike/{latestStable}/distribution-full-{latestStable}.tar.gz.sha1[distribution-full-{latestStable}.tar.gz.sha1] == Source Distribution -* http://www.apache.org/dyn/closer.cgi/deltaspike/1.2.1/deltaspike-project-1.2.1-source-release.zip[deltaspike-project-1.2.1-source-release.zip] -* http://www.apache.org/dist/deltaspike/1.2.1/deltaspike-project-1.2.1-source-release.zip.asc[deltaspike-project-1.2.1-source-release.zip.asc] -* http://www.apache.org/dist/deltaspike/1.2.1/deltaspike-project-1.2.1-source-release.zip.md5[deltaspike-project-1.2.1-source-release.zip.md5] -* http://www.apache.org/dist/deltaspike/1.2.1/deltaspike-project-1.2.1-source-release.zip.sha1[deltaspike-project-1.2.1-source-release.zip.sha1] +* http://www.apache.org/dyn/closer.cgi/deltaspike/{latestStable}/deltaspike-project-{latestStable}-source-release.zip[deltaspike-project-{latestStable}-source-release.zip] +* http://www.apache.org/dist/deltaspike/{latestStable}/deltaspike-project-{latestStable}-source-release.zip.asc[deltaspike-project-{latestStable}-source-release.zip.asc] +* http://www.apache.org/dist/deltaspike/{latestStable}/deltaspike-project-{latestStable}-source-release.zip.md5[deltaspike-project-{latestStable}-source-release.zip.md5] +* http://www.apache.org/dist/deltaspike/{latestStable}/deltaspike-project-{latestStable}-source-release.zip.sha1[deltaspike-project-{latestStable}-source-release.zip.sha1] == Maven Dependencies @@ -63,19 +63,19 @@ the signatures using e.g.: ------------------------------------------------------ $ pgpk -a KEYS -$ pgpv deltaspike-project-1.2.1-source-release.zip.asc +$ pgpv deltaspike-project-{latestStable}-source-release.zip.asc ------------------------------------------------------ or ----------------------------------------------------- $ pgp -ka KEYS -$ pgp deltaspike-project-1.2.1-source-release.zip.asc +$ pgp deltaspike-project-{latestStable}-source-release.zip.asc ----------------------------------------------------- or -------------------------------------------------------------- $ gpg --import KEYS -$ gpg --verify deltaspike-project-1.2.1-source-release.zip.asc +$ gpg --verify deltaspike-project-{latestStable}-source-release.zip.asc -------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cc45eac0/site/src/main/asciidoc/javadoc.adoc ---------------------------------------------------------------------- diff --git a/site/src/main/asciidoc/javadoc.adoc b/site/src/main/asciidoc/javadoc.adoc index d35de1d..658f939 100644 --- a/site/src/main/asciidoc/javadoc.adoc +++ b/site/src/main/asciidoc/javadoc.adoc @@ -6,14 +6,12 @@ == Latest version -* link:/javadoc/1.2.1-SNAPSHOT/[1.2.1-SNAPSHOT] +* link:/javadoc/{latestSnapshot}/[{latestSnapshot}] -== Stable Releases - -* link:/javadoc/1.2.0/[1.2.0] -* link:/javadoc/1.1.0/[1.1.0] +== Stable Release +* link:/javadoc/{latestStable}/[{latestStable}] == Contribute
