[1/3] struts-archetypes git commit: Drops useless declaration of Log4j2 - it's already included in Struts
Repository: struts-archetypes
Updated Branches:
refs/heads/master a88a347aa -> 049f0d41d
Drops useless declaration of Log4j2 - it's already included in Struts
Project: http://git-wip-us.apache.org/repos/asf/struts-archetypes/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-archetypes/commit/8237fcc6
Tree: http://git-wip-us.apache.org/repos/asf/struts-archetypes/tree/8237fcc6
Diff: http://git-wip-us.apache.org/repos/asf/struts-archetypes/diff/8237fcc6
Branch: refs/heads/master
Commit: 8237fcc60c3a72c4148cdcbfd6b4e9fdd36b686c
Parents: a88a347
Author: Lukasz Lenart
Authored: Thu Nov 3 11:38:45 2016 +0100
Committer: Lukasz Lenart
Committed: Thu Nov 3 11:38:45 2016 +0100
--
.../src/main/resources/archetype-resources/pom.xml | 9 -
.../src/main/resources/archetype-resources/pom.xml | 7 ---
.../src/main/resources/archetype-resources/pom.xml | 7 ---
.../src/main/resources/archetype-resources/pom.xml | 6 --
.../src/main/resources/archetype-resources/pom.xml | 9 +
5 files changed, 1 insertion(+), 37 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/8237fcc6/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
--
diff --git
a/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
index 70c58c4..8559f18 100644
--- a/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
@@ -10,7 +10,6 @@
${project.version}
-${log4j2.version}
UTF-8
@@ -48,20 +47,12 @@
-org.apache.logging.log4j
-log4j-core
-\${log4j2.version}
-
-
-
-
junit
junit
4.5
test
-
javax.servlet
javax.servlet-api
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/8237fcc6/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
--
diff --git
a/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
index 4a1bd24..b432767 100644
--- a/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
@@ -10,7 +10,6 @@
${project.version}
-${log4j2.version}
UTF-8
@@ -36,12 +35,6 @@
-org.apache.logging.log4j
-log4j-core
-\${log4j2.version}
-
-
-
junit
junit
4.5
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/8237fcc6/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
--
diff --git
a/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
index 9bca7cc..b7b715a 100644
---
a/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
+++
b/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
@@ -10,7 +10,6 @@
${project.version}
-${log4j2.version}
UTF-8
@@ -42,12 +41,6 @@
-org.apache.logging.log4j
-log4j-core
-\${log4j2.version}
-
-
-
junit
junit
4.5
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/8237fcc6/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
--
diff --git
a/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
index 49d9e88..e1826d9 100644
--- a/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
@@ -92,12 +92,6 @@
provided
-
-org.apache.logging.log4j
-log4j-core
-\${log4j2.version}
-
-
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/8237fcc6/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
--
[2/3] struts-archetypes git commit: Reformats code
Reformats code
Project: http://git-wip-us.apache.org/repos/asf/struts-archetypes/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-archetypes/commit/df51fa4e
Tree: http://git-wip-us.apache.org/repos/asf/struts-archetypes/tree/df51fa4e
Diff: http://git-wip-us.apache.org/repos/asf/struts-archetypes/diff/df51fa4e
Branch: refs/heads/master
Commit: df51fa4ee1ca5935f2d0e91ddbb31e76b9d67a03
Parents: 8237fcc
Author: Lukasz Lenart
Authored: Thu Nov 3 11:44:35 2016 +0100
Committer: Lukasz Lenart
Committed: Thu Nov 3 11:44:35 2016 +0100
--
pom.xml | 7 +-
struts2-archetype-blank/pom.xml | 3 +-
struts2-archetype-convention/pom.xml| 3 +-
.../main/resources/archetype-resources/pom.xml | 6 +-
struts2-archetype-dbportlet/pom.xml | 3 +-
.../main/resources/archetype-resources/pom.xml | 66 -
struts2-archetype-plugin/pom.xml| 3 +-
.../main/resources/archetype-resources/pom.xml | 4 +-
struts2-archetype-portlet/pom.xml | 3 +-
.../main/resources/archetype-resources/pom.xml | 76 ++--
struts2-archetype-starter/pom.xml | 3 +-
.../main/resources/archetype-resources/pom.xml | 66 -
12 files changed, 125 insertions(+), 118 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/df51fa4e/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 09a07b8..75c0e4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,8 @@
* under the License.
*/
-->
-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";>
+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";>
4.0.0
org.apache.struts
@@ -64,7 +65,7 @@
The Apache Software License, Version 2.0
http://www.apache.org/licenses/LICENSE-2.0.txt
repo
-
+
@@ -84,7 +85,7 @@
- UTF-8
+UTF-8
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/df51fa4e/struts2-archetype-blank/pom.xml
--
diff --git a/struts2-archetype-blank/pom.xml b/struts2-archetype-blank/pom.xml
index 476bbfe..b017964 100644
--- a/struts2-archetype-blank/pom.xml
+++ b/struts2-archetype-blank/pom.xml
@@ -1,5 +1,6 @@
-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";>
+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";>
org.apache.struts
struts-archetypes
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/df51fa4e/struts2-archetype-convention/pom.xml
--
diff --git a/struts2-archetype-convention/pom.xml
b/struts2-archetype-convention/pom.xml
index 244fa0d..03230e3 100644
--- a/struts2-archetype-convention/pom.xml
+++ b/struts2-archetype-convention/pom.xml
@@ -1,4 +1,5 @@
-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";>
+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";>
org.apache.struts
struts-archetypes
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/df51fa4e/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
--
diff --git
a/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
index b7b715a..da94717 100644
---
a/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
+++
b/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
@@ -35,9 +35,9 @@
- org.apache.struts
- struts2-config-browser-plugin
- \${struts2.version}
+org.apache.struts
+struts2-config-browser-plugin
+\${struts2.version}
[3/3] struts-archetypes git commit: Uses fixed Struts version
Uses fixed Struts version
Project: http://git-wip-us.apache.org/repos/asf/struts-archetypes/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-archetypes/commit/049f0d41
Tree: http://git-wip-us.apache.org/repos/asf/struts-archetypes/tree/049f0d41
Diff: http://git-wip-us.apache.org/repos/asf/struts-archetypes/diff/049f0d41
Branch: refs/heads/master
Commit: 049f0d41dbcc1abf52983984690b395f14a4afc1
Parents: df51fa4
Author: Lukasz Lenart
Authored: Thu Nov 3 11:55:04 2016 +0100
Committer: Lukasz Lenart
Committed: Thu Nov 3 11:55:04 2016 +0100
--
pom.xml| 1 +
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
7 files changed, 7 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/049f0d41/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 75c0e4c..c865b2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,6 +86,7 @@
UTF-8
+2.5.5
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/049f0d41/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
--
diff --git
a/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
index 8559f18..da81dbd 100644
--- a/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
@@ -9,7 +9,7 @@
\${artifactId}
-${project.version}
+${supported.struts2.version}
UTF-8
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/049f0d41/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
--
diff --git
a/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
index b432767..7694190 100644
--- a/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
@@ -9,7 +9,7 @@
\${artifactId}
-${project.version}
+${supported.struts2.version}
UTF-8
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/049f0d41/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
--
diff --git
a/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
index da94717..ffbfd61 100644
---
a/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
+++
b/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
@@ -9,7 +9,7 @@
\${artifactId}
-${project.version}
+${supported.struts2.version}
UTF-8
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/049f0d41/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
--
diff --git
a/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
index 7bf5ab2..8fa84a7 100644
--- a/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
@@ -11,7 +11,7 @@
Struts 2 Database Portlet
-${project.version}
+${supported.struts2.version}
UTF-8
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/049f0d41/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
--
diff --git
a/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
b/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
index 4fe82cf..ece9bca 100644
--- a/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
@@ -11,
struts-archetypes git commit: Adds .gitignore
Repository: struts-archetypes Updated Branches: refs/heads/master 049f0d41d -> e9bb8c1ea Adds .gitignore Project: http://git-wip-us.apache.org/repos/asf/struts-archetypes/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-archetypes/commit/e9bb8c1e Tree: http://git-wip-us.apache.org/repos/asf/struts-archetypes/tree/e9bb8c1e Diff: http://git-wip-us.apache.org/repos/asf/struts-archetypes/diff/e9bb8c1e Branch: refs/heads/master Commit: e9bb8c1ea8c84c3c63750a1df4df00eba499ac2a Parents: 049f0d4 Author: Lukasz Lenart Authored: Thu Nov 3 12:04:15 2016 +0100 Committer: Lukasz Lenart Committed: Thu Nov 3 12:04:15 2016 +0100 -- .gitignore | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/e9bb8c1e/.gitignore -- diff --git a/.gitignore b/.gitignore index 36ffb6e..3f189d9 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ Servers/ # jenv .java-version + +# Maven +target \ No newline at end of file
struts-site git commit: Deattach archetypes' version from Struts core version
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
Authored: Thu Nov 3 12:05:10 2016 +0100
Committer: Lukasz Lenart
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
org.apache.struts
struts2-archetype-blank
-{{ site.current_version }}
+{{ site.archetype_version }}
https://repository.apache.org/content/groups/public/
Struts 2 Archetypes - Blank
org.apache.struts
struts2-archetype-convention
-{{ site.current_version }}
+{{ site.archetype_version }}
https://repository.apache.org/content/groups/public/
Struts 2 Archetypes - Blank Convention
org.apache.struts
struts2-archetype-dbportlet
-{{ site.current_version }}
+{{ site.archetype_version }}
https://repository.apache.org/content/groups/public/
Struts 2 Archetypes - Database Portlet
org.apache.struts
struts2-archetype-plugin
-{{ site.current_version }}
+{{ site.archetype_version }}
https://repository.apache.org/content/groups/public/
Struts 2 Archetypes - Plugin
org.apache.struts
struts2-archetype-portlet
-{{ site.current_version }}
+{{ site.archetype_version }}
https://repository.apache.org/content/groups/public/
Struts 2 Archetypes - Portlet
org.apache.struts
struts2-archetype-starter
-{{ site.current_version }}
+{{ site.archetype_version }}
https://repository.apache.org/content/groups/public/
Struts 2 Archetypes - Starter
+
+org.apache.struts
+struts2-archetype-angularjs
+{{ site.archetype_version }}
+
https://repository.apache.org/content/groups/public/
+Struts 2 Archetypes - Angular JS
+
svn commit: r1000432 - /websites/production/struts/content/archetype-catalog.xml
Author: lukaszlenart Date: Thu Nov 3 11:07:17 2016 New Revision: 1000432 Log: Updates production Modified: websites/production/struts/content/archetype-catalog.xml Modified: websites/production/struts/content/archetype-catalog.xml == Binary files - no diff available.
