You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2015/08/25 08:31:53 UTC
[1/4] struts-examples git commit: Uses the latest Struts snapshot
Repository: struts-examples
Updated Branches:
refs/heads/master 1dae91de2 -> 56b22f011
Uses the latest Struts snapshot
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/d251dde3
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/d251dde3
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/d251dde3
Branch: refs/heads/master
Commit: d251dde341146bf61909e5477bd48768b49da7eb
Parents: 1af364c
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Mon Dec 29 11:06:45 2014 +0100
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Mon Dec 29 11:06:45 2014 +0100
----------------------------------------------------------------------
pom.xml | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/d251dde3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9e9d737..354e3b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <struts2.version>2.3.18-SNAPSHOT</struts2.version>
+ <struts2.version>2.3.21-SNAPSHOT</struts2.version>
<log4j.version>1.2.17</log4j.version>
</properties>
@@ -88,5 +88,16 @@
</plugins>
</build>
+
+ <repositories>
+ <repository>
+ <id>apache-snapshots</id>
+ <url>https://repository.apache.org/content/groups/snapshots/</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
</project>
[4/4] struts-examples git commit: Uses the latest BETA version and
corrects some merge issue
Posted by lu...@apache.org.
Uses the latest BETA version and corrects some merge issue
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/56b22f01
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/56b22f01
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/56b22f01
Branch: refs/heads/master
Commit: 56b22f01126f9b3237ed4d5032cc04228d1b5a48
Parents: 069632f
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Tue Aug 25 08:31:20 2015 +0200
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Tue Aug 25 08:31:20 2015 +0200
----------------------------------------------------------------------
pom.xml | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/56b22f01/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 42acf00..a8ad427 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <struts2.version>2.5-SNAPSHOT</struts2.version>
+ <struts2.version>2.5-BETA1</struts2.version>
<log4j2.version>2.3</log4j2.version>
</properties>
@@ -49,6 +49,10 @@
<id>apache.snapshots</id>
<name>ASF Maven 2 Snapshot</name>
<url>https://repository.apache.org/content/groups/snapshots/</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
</repository>
</repositories>
@@ -114,15 +118,4 @@
</build>
- <repositories>
- <repository>
- <id>apache-snapshots</id>
- <url>https://repository.apache.org/content/groups/snapshots/</url>
- <layout>default</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
</project>
[2/4] struts-examples git commit: Updates SNAPSHOT version
Posted by lu...@apache.org.
Updates SNAPSHOT version
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/fe90f7ed
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/fe90f7ed
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/fe90f7ed
Branch: refs/heads/master
Commit: fe90f7ed28c34e342a5d27c43e15026923933dc5
Parents: d251dde
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Fri Jan 16 10:09:26 2015 +0100
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Fri Jan 16 10:09:26 2015 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/fe90f7ed/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 354e3b4..b953972 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <struts2.version>2.3.21-SNAPSHOT</struts2.version>
+ <struts2.version>2.3.22-SNAPSHOT</struts2.version>
<log4j.version>1.2.17</log4j.version>
</properties>
[3/4] struts-examples git commit: Merge branch 'develop'
Posted by lu...@apache.org.
Merge branch 'develop'
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/069632f7
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/069632f7
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/069632f7
Branch: refs/heads/master
Commit: 069632f731e3b7e5d06ac870c8d226114212d112
Parents: 1dae91d fe90f7e
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Tue Aug 25 08:28:01 2015 +0200
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Tue Aug 25 08:28:01 2015 +0200
----------------------------------------------------------------------
pom.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/069632f7/pom.xml
----------------------------------------------------------------------