shiro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lhazlew...@apache.org
Subject svn commit: r1627858 - in /shiro/branches/2.0-api-design-changes: RELEASE-NOTES pom.xml samples/aspectj/pom.xml support/aspectj/pom.xml
Date Fri, 26 Sep 2014 18:55:04 GMT
Author: lhazlewood
Date: Fri Sep 26 18:55:04 2014
New Revision: 1627858

URL: http://svn.apache.org/r1627858
Log:
Made JDK 1.7 the minimum default (1.5 and 1.6 have been long end-of-lifed)

Modified:
    shiro/branches/2.0-api-design-changes/RELEASE-NOTES
    shiro/branches/2.0-api-design-changes/pom.xml
    shiro/branches/2.0-api-design-changes/samples/aspectj/pom.xml
    shiro/branches/2.0-api-design-changes/support/aspectj/pom.xml

Modified: shiro/branches/2.0-api-design-changes/RELEASE-NOTES
URL: http://svn.apache.org/viewvc/shiro/branches/2.0-api-design-changes/RELEASE-NOTES?rev=1627858&r1=1627857&r2=1627858&view=diff
==============================================================================
--- shiro/branches/2.0-api-design-changes/RELEASE-NOTES (original)
+++ shiro/branches/2.0-api-design-changes/RELEASE-NOTES Fri Sep 26 18:55:04 2014
@@ -59,7 +59,7 @@ Design Changes
 
   or, even simpler for Groovy or JSTL:
 
-  subject.attributes[username]
+  subject.attributes['username']
 
   This change affords a huge number of simplifications/conveniences for the Shriro user community,
dev team, and
   bean-compatible tools and frameworks.
@@ -72,7 +72,7 @@ Design Changes
 
   2. 'Account' is an inherently more intuitive name.  The < 2.0 'AuthenticationInfo' interface
name actually always
      represented an Account, and the name 'AuthenticationInfo' is abstract and fairly unintuitive.
 Now it is more
-     obvious/explicity.
+     obvious/explicit.
 
   3. Shiro's old PrincipalCollection concept is being removed.  Account instead represents
principals with a
      new name, called 'attributes' as a simple Map<String,Object> collections, as described
above.

Modified: shiro/branches/2.0-api-design-changes/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/2.0-api-design-changes/pom.xml?rev=1627858&r1=1627857&r2=1627858&view=diff
==============================================================================
--- shiro/branches/2.0-api-design-changes/pom.xml (original)
+++ shiro/branches/2.0-api-design-changes/pom.xml Fri Sep 26 18:55:04 2014
@@ -73,7 +73,7 @@
         <!-- Compile 3rd party dependencies: -->
         <!-- Don't change this version without also changing the shiro-aspect and shiro-features
              modules' OSGi metadata: -->
-        <aspectj.version>1.6.12</aspectj.version>
+        <aspectj.version>1.8.2</aspectj.version>
         <commons.cli.version>1.2</commons.cli.version>
         <commons.codec.version>1.4</commons.codec.version>
         <crowd.version>1.5.2</crowd.version>
@@ -83,7 +83,7 @@
         <!-- Don't change this version without also changing the shiro-hazelcast and shiro-features
OSGi metadata: -->
         <hazelcast.version>2.4.1</hazelcast.version>
         <hsqldb.version>1.8.0.7</hsqldb.version>
-        <jdk.version>1.5</jdk.version>
+        <jdk.version>1.7</jdk.version>
         <jetty.version>6.1.26</jetty.version>
         <openid4j.version>0.9.5</openid4j.version>
         <!-- Don't change this version without also changing the shiro-quartz and shiro-features
@@ -1026,7 +1026,7 @@
                 <version>2.5</version>
                 <configuration>
                     <sourceEncoding>utf-8</sourceEncoding>
-                    <targetJdk>1.5</targetJdk>
+                    <targetJdk>${jdk.version}</targetJdk>
                 </configuration>
             </plugin>
             <plugin>

Modified: shiro/branches/2.0-api-design-changes/samples/aspectj/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/2.0-api-design-changes/samples/aspectj/pom.xml?rev=1627858&r1=1627857&r2=1627858&view=diff
==============================================================================
--- shiro/branches/2.0-api-design-changes/samples/aspectj/pom.xml (original)
+++ shiro/branches/2.0-api-design-changes/samples/aspectj/pom.xml Fri Sep 26 18:55:04 2014
@@ -36,10 +36,11 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>aspectj-maven-plugin</artifactId>
-				<version>1.4</version>
+				<version>1.7</version>
 				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
+                    <complianceLevel>${jdk.version}</complianceLevel>
+					<source>${jdk.version}</source>
+					<target>${jdk.version}</target>
 					<showWeaveInfo>true</showWeaveInfo>
 					<aspectLibraries>
 						<aspectLibrary>

Modified: shiro/branches/2.0-api-design-changes/support/aspectj/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/2.0-api-design-changes/support/aspectj/pom.xml?rev=1627858&r1=1627857&r2=1627858&view=diff
==============================================================================
--- shiro/branches/2.0-api-design-changes/support/aspectj/pom.xml (original)
+++ shiro/branches/2.0-api-design-changes/support/aspectj/pom.xml Fri Sep 26 18:55:04 2014
@@ -64,11 +64,18 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>
-                <version>1.4</version>
+                <version>1.7</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.aspectj</groupId>
+                        <artifactId>aspectjtools</artifactId>
+                        <version>${aspectj.version}</version>
+                    </dependency>
+                </dependencies>
                 <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                    <showWeaveInfo>true</showWeaveInfo>
+                    <complianceLevel>${jdk.version}</complianceLevel>
+                    <source>${jdk.version}</source>
+                    <target>${jdk.version}</target>
                 </configuration>
                 <executions>
                     <execution>
@@ -90,7 +97,7 @@
                         <Export-Package>org.apache.shiro.aspectj*;version=${project.version}</Export-Package>
                         <Import-Package>
                             org.apache.shiro*;version="${shiro.osgi.importRange}",
-                            org.aspectj*;version="[1.6.0, 2.0.0)",
+                            org.aspectj*;version="[1.8.0, 2.0.0)",
                             *
                         </Import-Package>
                     </instructions>



Mime
View raw message