Return-Path: <commits-return-16720-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 586EB200CCC
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Fri,  7 Jul 2017 08:15:16 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 53E80167AA9; Fri,  7 Jul 2017 06:15:16 +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 A38D1167ABD
	for <archive-asf-public@cust-asf.ponee.io>; Fri,  7 Jul 2017 08:15:15 +0200 (CEST)
Received: (qmail 52414 invoked by uid 500); 7 Jul 2017 06:15:14 -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 51876 invoked by uid 99); 7 Jul 2017 06:15:14 -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; Fri, 07 Jul 2017 06:15:14 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 534ECF3254; Fri,  7 Jul 2017 06:15:12 +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
Date: Fri, 07 Jul 2017 06:15:15 -0000
Message-Id: <f0acb986c32243ff989aa22d7dbb1f03@git.apache.org>
In-Reply-To: <f15425ff95d7421995c6a884781f062b@git.apache.org>
References: <f15425ff95d7421995c6a884781f062b@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [4/7] struts-examples git commit: Modifications for integrating with
 'struts-examples' parent pom.xml file
archived-at: Fri, 07 Jul 2017 06:15:16 -0000

Modifications for integrating with 'struts-examples' parent pom.xml file


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

Branch: refs/heads/master
Commit: d5420bb2e729d6fa33a119dbbb7cd19d1c7b8e1b
Parents: ade34f2
Author: tkofford <tkofford@home.ku.edu>
Authored: Thu Jul 6 08:36:58 2017 -0500
Committer: tkofford <tkofford@home.ku.edu>
Committed: Thu Jul 6 08:36:58 2017 -0500

----------------------------------------------------------------------
 shiro-basic/pom.xml | 40 ++++++++++++++--------------------------
 1 file changed, 14 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts-examples/blob/d5420bb2/shiro-basic/pom.xml
----------------------------------------------------------------------
diff --git a/shiro-basic/pom.xml b/shiro-basic/pom.xml
index 3dfe907..3b716d1 100644
--- a/shiro-basic/pom.xml
+++ b/shiro-basic/pom.xml
@@ -1,22 +1,27 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>struts2shiro</groupId>
-    <artifactId>struts2shiro</artifactId>
-    <version>1.0.0</version>
-    <packaging>war</packaging>
+    <parent>
+        <groupId>org.apache.struts</groupId>
+        <artifactId>struts-examples</artifactId>
+        <version>1.0.0</version>
+    </parent>
+    
+    <artifactId>shiro-basic</artifactId>
+    
+    <name>Struts2 with Basic Shiro Security Integration</name>
     
+    <packaging>war</packaging>
+        
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <shiro.version>1.3.2</shiro.version>
-        <struts.version>2.5.10.1</struts.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>${struts.version}</version>
+            <version>${struts2.version}</version>
         </dependency>
         
         <dependency>
@@ -33,12 +38,12 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.8.2</version>
+            <version>${log4j2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.8.2</version>
+            <version>${log4j2.version}</version>
         </dependency>
         
         <dependency>
@@ -57,23 +62,6 @@
     </dependencies>
 
     <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
-        </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>
 </project>
\ No newline at end of file