Skip to content

Commit

Permalink
[maven-release-plugin] prepare release shiro-root-2.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
FlowLogix Jenkins committed May 25, 2024
1 parent 6f6cc13 commit b4d2047
Show file tree
Hide file tree
Showing 62 changed files with 138 additions and 214 deletions.
6 changes: 2 additions & 4 deletions bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<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">
<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">
<parent>
<artifactId>shiro-root</artifactId>
<groupId>org.apache.shiro</groupId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
5 changes: 2 additions & 3 deletions cache/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<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 https://maven.apache.org/maven-v4_0_0.xsd">
<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 https://maven.apache.org/maven-v4_0_0.xsd">

<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
5 changes: 2 additions & 3 deletions config/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<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 https://maven.apache.org/maven-v4_0_0.xsd">
<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 https://maven.apache.org/maven-v4_0_0.xsd">

<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-config</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
5 changes: 2 additions & 3 deletions config/ogdl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<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 https://maven.apache.org/maven-v4_0_0.xsd">
<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 https://maven.apache.org/maven-v4_0_0.xsd">

<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-config</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
5 changes: 2 additions & 3 deletions config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<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 https://maven.apache.org/maven-v4_0_0.xsd">
<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 https://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<artifactId>shiro-config</artifactId>
Expand Down
5 changes: 2 additions & 3 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<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 https://maven.apache.org/maven-v4_0_0.xsd">
<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 https://maven.apache.org/maven-v4_0_0.xsd">

<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
5 changes: 2 additions & 3 deletions crypto/cipher/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<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 https://maven.apache.org/maven-v4_0_0.xsd">
<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 https://maven.apache.org/maven-v4_0_0.xsd">

<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-crypto</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
5 changes: 2 additions & 3 deletions crypto/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<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 https://maven.apache.org/maven-v4_0_0.xsd">
<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 https://maven.apache.org/maven-v4_0_0.xsd">

<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-crypto</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
5 changes: 2 additions & 3 deletions crypto/hash/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<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 https://maven.apache.org/maven-v4_0_0.xsd">
<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 https://maven.apache.org/maven-v4_0_0.xsd">

<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-crypto</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
5 changes: 2 additions & 3 deletions crypto/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<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 https://maven.apache.org/maven-v4_0_0.xsd">
<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 https://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<artifactId>shiro-crypto</artifactId>
Expand Down
6 changes: 2 additions & 4 deletions crypto/support/hashes/argon2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,13 @@
~ under the License.
-->

<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">
<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>

<parent>
<groupId>org.apache.shiro.crypto</groupId>
<artifactId>shiro-crypto-support</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
6 changes: 2 additions & 4 deletions crypto/support/hashes/bcrypt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,13 @@
~ under the License.
-->

<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">
<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>

<parent>
<groupId>org.apache.shiro.crypto</groupId>
<artifactId>shiro-crypto-support</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
6 changes: 2 additions & 4 deletions crypto/support/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,13 @@
~ under the License.
-->

<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">
<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>

<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-crypto</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<groupId>org.apache.shiro.crypto</groupId>
Expand Down
5 changes: 2 additions & 3 deletions event/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<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 https://maven.apache.org/maven-v4_0_0.xsd">
<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 https://maven.apache.org/maven-v4_0_0.xsd">

<parent>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
5 changes: 2 additions & 3 deletions integration-tests/guice3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,13 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<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">
<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>

<parent>
<groupId>org.apache.shiro.integrationtests</groupId>
<artifactId>shiro-integration-tests</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<artifactId>shiro-its-guice3</artifactId>
Expand Down
5 changes: 2 additions & 3 deletions integration-tests/guice4/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,13 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<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">
<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>

<parent>
<groupId>org.apache.shiro.integrationtests</groupId>
<artifactId>shiro-integration-tests</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<artifactId>shiro-its-guice4</artifactId>
Expand Down
7 changes: 3 additions & 4 deletions integration-tests/jakarta-ee-support/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,18 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<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">
<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>org.apache.shiro.integrationtests</groupId>
<artifactId>jakarta-ee-support</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
<name>Apache Shiro :: ITs :: Jakarta EE Support</name>
<packaging>pom</packaging>

<parent>
<groupId>org.apache.shiro.integrationtests</groupId>
<artifactId>shiro-integration-tests</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<build>
Expand Down
16 changes: 7 additions & 9 deletions integration-tests/jakarta-ee/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,18 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<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">
<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>org.apache.shiro.integrationtests</groupId>
<artifactId>shiro-its-jakarta-ee</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
<packaging>war</packaging>
<name>Apache Shiro :: ITs :: Jakarta EE</name>

<parent>
<groupId>org.apache.shiro.integrationtests</groupId>
<artifactId>shiro-integration-tests</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<properties>
Expand All @@ -45,7 +44,7 @@
<payara.start.skip>${skipITs}</payara.start.skip>
<asadmin.cmd>asadmin</asadmin.cmd>
<unix-sed-skip>${payara.start.skip}</unix-sed-skip>
<mac-backup-file/>
<mac-backup-file />
<create-domain-skip>true</create-domain-skip>
<domain.name>domain1</domain.name>

Expand Down Expand Up @@ -313,8 +312,7 @@
int portbase = 4900 + (executor_number as int) * port_increment
int adminPort
// find a free port
for (; portbase < 10000; portbase += port_increment) {
def server_socket
for (; portbase < 10000; portbase += port_increment) { def server_socket
adminPort = portbase + admin_port_increment
try {
server_socket = new ServerSocket()
Expand Down Expand Up @@ -373,7 +371,7 @@
<phase>pre-integration-test</phase>
<configuration>
<executable>sed</executable>
<commandlineArgs>-i ${mac-backup-file} -e 's/jvm-options>\[17|/jvm-options>\[16|/g'
<commandlineArgs>-i ${mac-backup-file} -e 's/jvm-options&gt;\[17|/jvm-options&gt;\[16|/g'
-e 's/property name="HZ_LISTENER_PORT" value="5900/property name="HZ_LISTENER_PORT" value="5920/g'
-e 's/hazelcast-runtime-configuration start-port="5900/hazelcast-runtime-configuration start-port="5920/g'
${project.build.directory}/dependency/payara5/glassfish/domains/${domain.name}/config/domain.xml
Expand Down Expand Up @@ -484,7 +482,7 @@
<id>payara-server-local</id>
<properties>
<payara.start.skip>true</payara.start.skip>
<payara.argLine/>
<payara.argLine />
</properties>
</profile>
<profile>
Expand Down
8 changes: 3 additions & 5 deletions integration-tests/jaxrs/app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,17 @@
~ under the License.
-->

<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">
<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>

<parent>
<groupId>org.apache.shiro.integrationtests.jaxrs</groupId>
<artifactId>shiro-its-jaxrs</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<artifactId>shiro-its-jaxrs-app</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
<name>Apache Shiro :: ITs :: JAX-RS :: App</name>
<packaging>war</packaging>

Expand Down
6 changes: 2 additions & 4 deletions integration-tests/jaxrs/meecrowave/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,13 @@
~ under the License.
-->

<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">
<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>

<parent>
<groupId>org.apache.shiro.integrationtests.jaxrs</groupId>
<artifactId>shiro-its-jaxrs</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
</parent>

<artifactId>shiro-its-jaxrs-meecrowave</artifactId>
Expand Down
Loading

0 comments on commit b4d2047

Please sign in to comment.