Return-Path: <commits-return-15980-archive-asf-public=cust-asf.ponee.io@struts.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 67516200BB1
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Thu,  3 Nov 2016 12:05:20 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id 65C72160AFF; Thu,  3 Nov 2016 11:05:20 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id AE67C160AFE
	for <archive-asf-public@cust-asf.ponee.io>; Thu,  3 Nov 2016 12:05:19 +0100 (CET)
Received: (qmail 74150 invoked by uid 500); 3 Nov 2016 11:05:18 -0000
Mailing-List: contact commits-help@struts.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@struts.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@struts.apache.org>
List-Post: <mailto:commits@struts.apache.org>
List-Id: <commits.struts.apache.org>
Reply-To: dev@struts.apache.org
Delivered-To: mailing list commits@struts.apache.org
Received: (qmail 74141 invoked by uid 99); 3 Nov 2016 11:05:18 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Nov 2016 11:05:18 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 9DEA2E04EE; Thu,  3 Nov 2016 11:05:18 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: lukaszlenart@apache.org
To: commits@struts.apache.org
Message-Id: <a74cd52377c94215a06fe4ed91c8827e@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: struts-site git commit: Deattach archetypes' version from Struts core
 version
Date: Thu,  3 Nov 2016 11:05:18 +0000 (UTC)
archived-at: Thu, 03 Nov 2016 11:05:20 -0000

Repository: struts-site
Updated Branches:
  refs/heads/master bd1f15081 -> 05186d92e


Deattach archetypes' version from Struts core version


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/05186d92
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/05186d92
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/05186d92

Branch: refs/heads/master
Commit: 05186d92effa888b7c859e00c75f573a14d4dc39
Parents: bd1f150
Author: Lukasz Lenart <lukasz.lenart@gmail.com>
Authored: Thu Nov 3 12:05:10 2016 +0100
Committer: Lukasz Lenart <lukasz.lenart@gmail.com>
Committed: Thu Nov 3 12:05:10 2016 +0100

----------------------------------------------------------------------
 _config.yml                  |  1 +
 source/archetype-catalog.xml | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts-site/blob/05186d92/_config.yml
----------------------------------------------------------------------
diff --git a/_config.yml b/_config.yml
index 09e76f0..2a94410 100644
--- a/_config.yml
+++ b/_config.yml
@@ -24,6 +24,7 @@ root:
 # Simplifies introducing changes related to the latest release
 current_version: 2.5.5
 current_version_short: 255
+archetype_version: 2.5.5
 current_beta_version: 2.5-BETA3
 current_beta_version_short: 25B3
 release_date: 21 October 2016

http://git-wip-us.apache.org/repos/asf/struts-site/blob/05186d92/source/archetype-catalog.xml
----------------------------------------------------------------------
diff --git a/source/archetype-catalog.xml b/source/archetype-catalog.xml
index 5861812..a9905a8 100644
--- a/source/archetype-catalog.xml
+++ b/source/archetype-catalog.xml
@@ -10,44 +10,51 @@ comment: keep these lines
         <archetype>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-archetype-blank</artifactId>
-            <version>{{ site.current_version }}</version>
+            <version>{{ site.archetype_version }}</version>
             <repository>https://repository.apache.org/content/groups/public/</repository>
             <description>Struts 2 Archetypes - Blank</description>
         </archetype>
         <archetype>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-archetype-convention</artifactId>
-            <version>{{ site.current_version }}</version>
+            <version>{{ site.archetype_version }}</version>
             <repository>https://repository.apache.org/content/groups/public/</repository>
             <description>Struts 2 Archetypes - Blank Convention</description>
         </archetype>
         <archetype>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-archetype-dbportlet</artifactId>
-            <version>{{ site.current_version }}</version>
+            <version>{{ site.archetype_version }}</version>
             <repository>https://repository.apache.org/content/groups/public/</repository>
             <description>Struts 2 Archetypes - Database Portlet</description>
         </archetype>
         <archetype>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-archetype-plugin</artifactId>
-            <version>{{ site.current_version }}</version>
+            <version>{{ site.archetype_version }}</version>
             <repository>https://repository.apache.org/content/groups/public/</repository>
             <description>Struts 2 Archetypes - Plugin</description>
         </archetype>
         <archetype>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-archetype-portlet</artifactId>
-            <version>{{ site.current_version }}</version>
+            <version>{{ site.archetype_version }}</version>
             <repository>https://repository.apache.org/content/groups/public/</repository>
             <description>Struts 2 Archetypes - Portlet</description>
         </archetype>
         <archetype>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-archetype-starter</artifactId>
-            <version>{{ site.current_version }}</version>
+            <version>{{ site.archetype_version }}</version>
             <repository>https://repository.apache.org/content/groups/public/</repository>
             <description>Struts 2 Archetypes - Starter</description>
         </archetype>
+        <archetype>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-archetype-angularjs</artifactId>
+            <version>{{ site.archetype_version }}</version>
+            <repository>https://repository.apache.org/content/groups/public/</repository>
+            <description>Struts 2 Archetypes - Angular JS</description>
+        </archetype>
     </archetypes>
 </archetype-catalog>