Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Deps for 1.10.x #373

Merged
merged 2 commits into from
Oct 5, 2022
Merged

Update Deps for 1.10.x #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3811a1
Fix integration test package versions
bdemers Oct 4, 2022
354f79b
Update various dependencies:
bdemers Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crypto/cipher/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.64</version>
<version>1.70</version>
<scope>test</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion crypto/hash/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.64</version>
<version>1.70</version>
<scope>test</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions integration-tests/jaxrs/app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
<parent>
<groupId>org.apache.shiro.integrationtests.jaxrs</groupId>
<artifactId>shiro-its-jaxrs</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

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

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/jaxrs/meecrowave/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.shiro.integrationtests.jaxrs</groupId>
<artifactId>shiro-its-jaxrs</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<artifactId>shiro-its-jaxrs-meecrowave</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/jaxrs/openliberty/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.shiro.integrationtests.jaxrs</groupId>
<artifactId>shiro-its-jaxrs</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<artifactId>shiro-its-jaxrs-openliberty</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/jaxrs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.shiro.integrationtests</groupId>
<artifactId>shiro-integration-tests</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<groupId>org.apache.shiro.integrationtests.jaxrs</groupId>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/jaxrs/tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.shiro.integrationtests.jaxrs</groupId>
<artifactId>shiro-its-jaxrs</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<artifactId>shiro-its-jaxrs-tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/meecrowave-support/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<artifactId>shiro-integration-tests</artifactId>
<groupId>org.apache.shiro.integrationtests</groupId>
<version>2.0.0-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
</parent>

<artifactId>shiro-its-meecrowave-support</artifactId>
Expand Down
34 changes: 17 additions & 17 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@

<properties>

<shiro.previousVersion>1.7.1</shiro.previousVersion>
<shiro.previousVersion>1.9.0</shiro.previousVersion>
<!-- Replaced by the build number plugin at build time: -->
<buildNumber>${user.name}-${maven.build.timestamp}</buildNumber>
<project.build.outputTimestamp>2022-06-23T18:55:19Z</project.build.outputTimestamp>
Expand All @@ -82,17 +82,17 @@
<aspectj.version>1.9.7</aspectj.version>
<cas.client.core.version>3.2.2</cas.client.core.version>
<commons.beanutils.version>1.9.4</commons.beanutils.version>
<commons.cli.version>1.4</commons.cli.version>
<commons.codec.version>1.14</commons.codec.version>
<commons.cli.version>1.5.0</commons.cli.version>
<commons.codec.version>1.15</commons.codec.version>
<commons.collection.version>3.2.2</commons.collection.version>
<commons.configuration2.version>2.8.0</commons.configuration2.version>
<commons.lang3.version>3.9</commons.lang3.version>
<commons.lang3.version>3.12.0</commons.lang3.version>
<commons.logging.version>1.2</commons.logging.version>
<!-- Don't change this version without also changing the shiro-ehcache and shiro-features
modules' OSGi metadata: -->
<ehcache.version>2.6.11</ehcache.version>
<!-- Don't change this version without also changing the shiro-hazelcast and shiro-features OSGi metadata: -->
<hazelcast.version>3.12.12</hazelcast.version>
<hazelcast.version>3.12.13</hazelcast.version>
<hsqldb.version>2.5.0</hsqldb.version>
<javax.annotation.api.version>1.3.2</javax.annotation.api.version>
<jdk.version>1.8</jdk.version>
Expand All @@ -103,24 +103,24 @@
<quartz.version>2.3.2</quartz.version>
<slf4j.version>1.7.36</slf4j.version>
<logback.version>1.2.11</logback.version>
<log4j.version>2.17.1</log4j.version>
<spring.version>5.3.20</spring.version>
<spring-boot.version>2.7.0</spring-boot.version>
<guice.version>4.2.2</guice.version>
<jaxrs.api.version>2.0.1</jaxrs.api.version>
<htmlunit.version>2.39.0</htmlunit.version>
<log4j.version>2.19.0</log4j.version>
<spring.version>5.3.23</spring.version>
<spring-boot.version>2.7.4</spring-boot.version>
<guice.version>4.2.3</guice.version>
<jaxrs.api.version>2.1.1</jaxrs.api.version>
<htmlunit.version>2.65.1</htmlunit.version>

<!-- Test 3rd-party dependencies: -->
<easymock.version>4.1</easymock.version>
<gmaven.version>1.8.0</gmaven.version>
<groovy.version>2.5.14</groovy.version>
<junit.version>4.12</junit.version>
<easymock.version>4.3</easymock.version>
<gmaven.version>1.13.1</gmaven.version>
<groovy.version>2.5.18</groovy.version>
<junit.version>4.13.2</junit.version>
<junit.server.jetty.version>0.11.0</junit.server.jetty.version>
<hibernate.version>5.4.3.Final</hibernate.version>
<hibernate.version>5.6.12.Final</hibernate.version>
<taglibs.standard.version>1.2.5</taglibs.standard.version>
<!-- so we can mock static methods in 3rd party libraries that sometimes don't use proper interfaces
ahem, hazelcast, ahem... -->
<powermock.version>2.0.2</powermock.version>
<powermock.version>2.0.9</powermock.version>

<maven.compiler.source>${jdk.version}</maven.compiler.source>
<maven.compiler.target>${jdk.version}</maven.compiler.target>
Expand Down
2 changes: 1 addition & 1 deletion samples/jaxrs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
<profile>
<id>cxf</id>
<properties>
<cxf.version>3.3.5</cxf.version>
<cxf.version>3.5.3</cxf.version>
</properties>
<dependencies>
<dependency>
Expand Down