You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bd...@apache.org on 2016/07/07 20:31:46 UTC
[1/3] shiro git commit: Replaced cobertura with jacoco and added an
aggregated coverage report
Repository: shiro
Updated Branches:
refs/heads/master 00beeef0f -> 5b59da340
Replaced cobertura with jacoco and added an aggregated coverage report
Project: http://git-wip-us.apache.org/repos/asf/shiro/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/791867fb
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/791867fb
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/791867fb
Branch: refs/heads/master
Commit: 791867fb39f1b3ba9673cef2dc85ed4bf9615e44
Parents: 00beeef
Author: Brian Demers <bd...@stormpath.com>
Authored: Fri Jun 24 16:24:11 2016 -0700
Committer: Brian Demers <bd...@apache.org>
Committed: Thu Jul 7 15:09:25 2016 -0400
----------------------------------------------------------------------
all/pom.xml | 14 ++++++++++++++
pom.xml | 41 ++++++++++++++++++++++++++++++-----------
2 files changed, 44 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/shiro/blob/791867fb/all/pom.xml
----------------------------------------------------------------------
diff --git a/all/pom.xml b/all/pom.xml
index 98df96b..e555355 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -135,6 +135,20 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <!-- Ideally we want to override the parent here, so the normal report is not generated
+ For configuration, we would add the 'combine.self="override"' attribute. -->
+ <reportSets>
+ <reportSet>
+ <id>javadoc-aggregate</id>
+ <reports>
+ <report>report-aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
</plugins>
</reporting>
</project>
http://git-wip-us.apache.org/repos/asf/shiro/blob/791867fb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index adb8fbd..a1a689d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -380,6 +380,11 @@
<artifactId>dependency-maven-plugin</artifactId>
<version>1.0</version>
</plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.7.7.201606060606</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -405,6 +410,19 @@
<printSummary>true</printSummary>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare-agent</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<!-- Allow Groovy tests to run: -->
<plugin>
<groupId>org.codehaus.gmaven</groupId>
@@ -1001,17 +1019,6 @@
</reportSets>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <formats>
- <format>xml</format>
- <format>html</format>
- </formats>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.1</version>
<configuration>
@@ -1099,6 +1106,18 @@
<artifactId>dashboard-maven-plugin</artifactId>
<version>1.0.0-beta-1</version>
</plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <id>javadoc-aggregate</id>
+ <reports>
+ <report>report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
</plugins>
</reporting>
[2/3] shiro git commit: Dressed up the generated site a little bit
with the fluid skin and header images
Posted by bd...@apache.org.
Dressed up the generated site a little bit with the fluid skin and header images
Project: http://git-wip-us.apache.org/repos/asf/shiro/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/2d0db71a
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/2d0db71a
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/2d0db71a
Branch: refs/heads/master
Commit: 2d0db71ad65f443bd72dfeea3b646c72eaa5f837
Parents: 791867f
Author: Brian Demers <bd...@stormpath.com>
Authored: Fri Jun 24 16:27:04 2016 -0700
Committer: Brian Demers <bd...@apache.org>
Committed: Thu Jul 7 15:09:27 2016 -0400
----------------------------------------------------------------------
src/site/resources/images/apache-shiro-logo.png | Bin 0 -> 20928 bytes
src/site/resources/images/asf_logo.png | Bin 0 -> 18372 bytes
src/site/site.xml | 53 +++++++++++++++++++
3 files changed, 53 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/shiro/blob/2d0db71a/src/site/resources/images/apache-shiro-logo.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/apache-shiro-logo.png b/src/site/resources/images/apache-shiro-logo.png
new file mode 100644
index 0000000..10a01c8
Binary files /dev/null and b/src/site/resources/images/apache-shiro-logo.png differ
http://git-wip-us.apache.org/repos/asf/shiro/blob/2d0db71a/src/site/resources/images/asf_logo.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/asf_logo.png b/src/site/resources/images/asf_logo.png
new file mode 100644
index 0000000..8b5e05f
Binary files /dev/null and b/src/site/resources/images/asf_logo.png differ
http://git-wip-us.apache.org/repos/asf/shiro/blob/2d0db71a/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
new file mode 100644
index 0000000..6026901
--- /dev/null
+++ b/src/site/site.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<project name="${project.artifactId}">
+
+ <bannerLeft>
+ <name>Shiro</name>
+ <src>http://shiro.apache.org/images/apache-shiro-logo.png</src>
+ <href>http://shiro.apache.org</href>
+ </bannerLeft>
+
+ <bannerRight>
+ <src>http://shiro.apache.org/images/asf_logo.png</src>
+ </bannerRight>
+
+ <publishDate position="right"/>
+ <version position="right"/>
+
+ <body>
+
+ <breadcrumbs>
+ <item name="${project.name}" href="./index.html"/>
+ </breadcrumbs>
+
+ <menu ref="parent" inherit="bottom"/>
+ <menu ref="modules" inherit="bottom"/>
+ <menu ref="reports" inherit="bottom"/>
+
+ </body>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.5</version>
+ </skin>
+
+</project>
\ No newline at end of file
[3/3] shiro git commit: SHIRO-483 always use English locale in
ProvidedHashFormat
Posted by bd...@apache.org.
SHIRO-483 always use English locale in ProvidedHashFormat
One of the provided hash values is 'SHIRO1' which causes a problem with Turkish locales, because of the letter 'i'
http://www.i18nguy.com/unicode/turkish-i18n.html
Project: http://git-wip-us.apache.org/repos/asf/shiro/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/5b59da34
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/5b59da34
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/5b59da34
Branch: refs/heads/master
Commit: 5b59da340aad44c098b138db55efd043e18123d7
Parents: 2d0db71
Author: Brian Demers <bd...@apache.org>
Authored: Thu Jul 7 16:25:56 2016 -0400
Committer: Brian Demers <bd...@apache.org>
Committed: Thu Jul 7 16:25:56 2016 -0400
----------------------------------------------------------------------
.../credential/DefaultPasswordServiceTest.groovy | 18 ++++++++++++++++++
.../crypto/hash/format/ProvidedHashFormat.java | 6 +++++-
2 files changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/shiro/blob/5b59da34/core/src/test/groovy/org/apache/shiro/authc/credential/DefaultPasswordServiceTest.groovy
----------------------------------------------------------------------
diff --git a/core/src/test/groovy/org/apache/shiro/authc/credential/DefaultPasswordServiceTest.groovy b/core/src/test/groovy/org/apache/shiro/authc/credential/DefaultPasswordServiceTest.groovy
index 7b600bc..5365e75 100644
--- a/core/src/test/groovy/org/apache/shiro/authc/credential/DefaultPasswordServiceTest.groovy
+++ b/core/src/test/groovy/org/apache/shiro/authc/credential/DefaultPasswordServiceTest.groovy
@@ -153,4 +153,22 @@ class DefaultPasswordServiceTest {
assertTrue service.passwordsMatch("12345", formatted)
}
+ @Test
+ void testTurkishLocal() {
+
+ Locale locale = Locale.getDefault();
+
+ // tr_TR
+ Locale.setDefault(new Locale("tr", "TR"));
+
+ try {
+ PasswordService passwordService = new DefaultPasswordService();
+ String password = "333";
+ String enc = passwordService.encryptPassword(password);
+ assertTrue(passwordService.passwordsMatch(password, enc));
+ }
+ finally {
+ Locale.setDefault(locale);
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/shiro/blob/5b59da34/crypto/hash/src/main/java/org/apache/shiro/crypto/hash/format/ProvidedHashFormat.java
----------------------------------------------------------------------
diff --git a/crypto/hash/src/main/java/org/apache/shiro/crypto/hash/format/ProvidedHashFormat.java b/crypto/hash/src/main/java/org/apache/shiro/crypto/hash/format/ProvidedHashFormat.java
index bfd90a5..3813123 100644
--- a/crypto/hash/src/main/java/org/apache/shiro/crypto/hash/format/ProvidedHashFormat.java
+++ b/crypto/hash/src/main/java/org/apache/shiro/crypto/hash/format/ProvidedHashFormat.java
@@ -18,6 +18,8 @@
*/
package org.apache.shiro.crypto.hash.format;
+import java.util.Locale;
+
/**
* An enum representing Shiro's default provided {@link HashFormat} implementations.
*
@@ -55,7 +57,9 @@ public enum ProvidedHashFormat {
return null;
}
try {
- return valueOf(id.toUpperCase());
+ // Use English Locale, some Locales handle uppercase/lower differently. i.e. Turkish and upper case 'i'
+ // is not 'I'. And 'SHIRO1' would be 'SH\u0130RO1'
+ return valueOf(id.toUpperCase(Locale.ENGLISH));
} catch (IllegalArgumentException ignored) {
return null;
}