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

[SHIRO-632] Removes duplicate classes from classpath #75

Closed
wants to merge 1 commit into from
Closed

[SHIRO-632] Removes duplicate classes from classpath #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 0 additions & 28 deletions all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,34 +33,6 @@
<packaging>pom</packaging>

<dependencies>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-lang</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-config-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-config-ogdl</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-crypto-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-crypto-hash</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-crypto-cipher</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-event</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
Expand Down
21 changes: 0 additions & 21 deletions cache/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>shiro-cache</artifactId>
<name>Apache Shiro :: Cache</name>
<packaging>bundle</packaging>

<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>org.apache.shiro.cache</Bundle-SymbolicName>
<Export-Package>org.apache.shiro.cache*;version=${project.version}</Export-Package>
<Import-Package>
org.apache.shiro*;version="${shiro.osgi.importRange}",
*
</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
Expand Down
22 changes: 0 additions & 22 deletions config/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,6 @@
<artifactId>shiro-config-core</artifactId>
<name>Apache Shiro :: Configuration :: Core</name>

<packaging>bundle</packaging>

<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>org.apache.shiro.config.core</Bundle-SymbolicName>
<Export-Package>org.apache.shiro.config*;version=${project.version}</Export-Package>
<Import-Package>
org.apache.shiro*;version="${shiro.osgi.importRange}",
*
</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.apache.shiro</groupId>
Expand Down
16 changes: 0 additions & 16 deletions config/ogdl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
<name>Apache Shiro :: Configuration :: OGDL</name>
<description>Support for Shiro's Object Graph Definition Language (mostly used in Ini configuration) where
declared name/value pairs are interpreted to create an object graph</description>
<packaging>bundle</packaging>

<build>
<plugins>
Expand All @@ -47,21 +46,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>org.apache.shiro.config.core</Bundle-SymbolicName>
<Export-Package>org.apache.shiro.config*;version=${project.version}</Export-Package>
<Import-Package>
org.apache.shiro*;version="${shiro.osgi.importRange}",
*
</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
9 changes: 8 additions & 1 deletion core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
<Export-Package>org.apache.shiro*;version=${project.version}</Export-Package>
<Import-Package>
org.apache.shiro*;version="${shiro.osgi.importRange}",
org.apache.commons.beanutils*;resolution:=optional,
*
</Import-Package>
</instructions>
Expand Down Expand Up @@ -93,6 +92,14 @@
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-event</artifactId>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<!-- Test dependencies -->
<dependency>
Expand Down
21 changes: 0 additions & 21 deletions crypto/cipher/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>shiro-crypto-cipher</artifactId>
<name>Apache Shiro :: Cryptography :: Ciphers</name>
<packaging>bundle</packaging>

<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>org.apache.shiro.crypto.cipher</Bundle-SymbolicName>
<Export-Package>org.apache.shiro.crypto.*;version=${project.version}</Export-Package>
<Import-Package>
org.apache.shiro.crypto**;version="${shiro.osgi.importRange}",
*
</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
Expand Down
21 changes: 0 additions & 21 deletions crypto/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>shiro-crypto-core</artifactId>
<name>Apache Shiro :: Cryptography :: Core</name>
<packaging>bundle</packaging>

<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>org.apache.shiro.crypto.core</Bundle-SymbolicName>
<Export-Package>org.apache.shiro.crypto*;version=${project.version}</Export-Package>
<Import-Package>
org.apache.shiro.crypto*;version="${shiro.osgi.importRange}",
*
</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
Expand Down
21 changes: 0 additions & 21 deletions crypto/hash/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>shiro-crypto-hash</artifactId>
<name>Apache Shiro :: Cryptography :: Hashing</name>
<packaging>bundle</packaging>

<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>org.apache.shiro.crypto.hash</Bundle-SymbolicName>
<Export-Package>org.apache.shiro.crypto.hash*;version=${project.version}</Export-Package>
<Import-Package>
org.apache.shiro.crypto.core*;version="${shiro.osgi.importRange}",
*
</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
Expand Down
21 changes: 0 additions & 21 deletions event/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>shiro-event</artifactId>
<name>Apache Shiro :: Event</name>
<packaging>bundle</packaging>

<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>org.apache.shiro.event</Bundle-SymbolicName>
<Export-Package>org.apache.shiro.event*;version=${project.version}</Export-Package>
<Import-Package>
org.apache.shiro*;version="${shiro.osgi.importRange}",
*
</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
Expand Down
21 changes: 0 additions & 21 deletions integration-tests/support/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,6 @@
<name>Apache Shiro :: ITs :: Support</name>

<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
Expand All @@ -61,17 +51,6 @@
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jsp</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jstl</artifactId>
<version>${jetty.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.github.mjeanroy</groupId>
<artifactId>junit-servers-jetty</artifactId>
Expand Down
24 changes: 0 additions & 24 deletions lang/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
The lang module encapsulates only language-specific utilities that are used by various
other modules. It exists to augment what we would have liked to see in the JDK but does not exist.
</description>
<packaging>bundle</packaging>

<dependencies>

Expand All @@ -52,27 +51,4 @@
<artifactId>log4j</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>org.apache.shiro.lang</Bundle-SymbolicName>
<Export-Package>org.apache.shiro.*;version=${project.version}</Export-Package>
<!-- javax.servlet.jsp* marked as optional per SHIRO-390: -->
<Import-Package>
org.apache.shiro*;version="${shiro.osgi.importRange}",
javax.servlet.jsp*;resolution:=optional,
*
</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>

</project>
Loading