From 587d4b2db6e7175f315334e0bede1671c98df157 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Mon, 16 Feb 2015 14:24:48 -0500 Subject: [PATCH] further pom file cleanup --- openid-connect-client/pom.xml | 116 ++-- openid-connect-common/pom.xml | 204 +++---- openid-connect-server-webapp/pom.xml | 206 +++---- openid-connect-server/pom.xml | 59 +- pom.xml | 786 ++++++++++++++------------- 5 files changed, 693 insertions(+), 678 deletions(-) diff --git a/openid-connect-client/pom.xml b/openid-connect-client/pom.xml index 2854c19d7..edd4a02e3 100644 --- a/openid-connect-client/pom.xml +++ b/openid-connect-client/pom.xml @@ -1,3 +1,4 @@ + - + - 4.0.0 - - openid-connect-parent - org.mitre - 1.2.0-SNAPSHOT - .. - - openid-connect-client - OpenID Connect Client filter for Spring Security - OpenID Connect Client - - - org.mitre - openid-connect-common - ${project.version} - - - jar - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java-version} - ${java-version} - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-sources - - jar - - - - - - + 4.0.0 + + openid-connect-parent + org.mitre + 1.2.0-SNAPSHOT + .. + + openid-connect-client + OpenID Connect Client filter for Spring Security + OpenID Connect Client + + + org.mitre + openid-connect-common + ${project.version} + + + jar + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java-version} + ${java-version} + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-sources + + jar + + + + + + diff --git a/openid-connect-common/pom.xml b/openid-connect-common/pom.xml index 154353236..7bf3bed16 100644 --- a/openid-connect-common/pom.xml +++ b/openid-connect-common/pom.xml @@ -1,3 +1,4 @@ + - + - 4.0.0 - - openid-connect-parent - org.mitre - 1.2.0-SNAPSHOT - .. - - openid-connect-common - OpenID Connect Common modules - OpenID Connect Common - - - org.springframework - spring-core - - - org.springframework - spring-webmvc - - - org.springframework.security - spring-security-core - - - com.google.guava - guava - - - org.apache.httpcomponents - httpclient - - - org.springframework.security.oauth - spring-security-oauth2 + 4.0.0 + + openid-connect-parent + org.mitre + 1.2.0-SNAPSHOT + .. + + openid-connect-common + OpenID Connect Common modules + OpenID Connect Common + + + org.springframework + spring-core - - com.nimbusds - nimbus-jose-jwt - - - org.eclipse.persistence - javax.persistence - - - com.google.code.gson - gson - - - org.slf4j - slf4j-api - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-annotations - - - - jar - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java-version} - ${java-version} - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-sources - - jar - - - - - - + + org.springframework + spring-webmvc + + + org.springframework.security + spring-security-core + + + com.google.guava + guava + + + org.apache.httpcomponents + httpclient + + + org.springframework.security.oauth + spring-security-oauth2 + + + com.nimbusds + nimbus-jose-jwt + + + org.eclipse.persistence + javax.persistence + + + com.google.code.gson + gson + + + org.slf4j + slf4j-api + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + + + + jar + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java-version} + ${java-version} + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-sources + + jar + + + + + + diff --git a/openid-connect-server-webapp/pom.xml b/openid-connect-server-webapp/pom.xml index d7f07b6df..37e3017c6 100644 --- a/openid-connect-server-webapp/pom.xml +++ b/openid-connect-server-webapp/pom.xml @@ -1,29 +1,46 @@ - - 4.0.0 - - org.mitre - openid-connect-parent - 1.2.0-SNAPSHOT - - openid-connect-server-webapp - war - OpenID Connect Server Webapp - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java-version} - ${java-version} - - - - org.apache.maven.plugins - maven-war-plugin - - openid-connect-server-webapp + + + 4.0.0 + + org.mitre + openid-connect-parent + 1.2.0-SNAPSHOT + + openid-connect-server-webapp + war + OpenID Connect Server Webapp + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java-version} + ${java-version} + + + + org.apache.maven.plugins + maven-war-plugin + + openid-connect-server-webapp gif ico @@ -37,83 +54,74 @@ true - - - - org.apache.maven.plugins - maven-dependency-plugin - - - install - install - - sources - - - - - - org.eclipse.jetty - jetty-maven-plugin - - - /openid-connect-server-webapp - - - - - - - - org.mitre - openid-connect-server - ${project.version} - - - org.springframework - spring-orm - - - - commons-logging - commons-logging - - - - - org.slf4j - jcl-over-slf4j - runtime - - - org.slf4j - slf4j-log4j12 - runtime - - - log4j - log4j - - - commons-dbcp - commons-dbcp - + + + + org.apache.maven.plugins + maven-dependency-plugin + + + install + install + + sources + + + + + + org.eclipse.jetty + jetty-maven-plugin + + + /openid-connect-server-webapp + + + + + + + + org.mitre + openid-connect-server + ${project.version} + + + org.springframework + spring-orm + + + org.slf4j + jcl-over-slf4j + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + + commons-dbcp + commons-dbcp + org.hsqldb hsqldb - - org.eclipse.persistence - org.eclipse.persistence.jpa - - - org.springframework.security - spring-security-taglibs - - - javax.servlet - jstl - + + org.eclipse.persistence + org.eclipse.persistence.jpa + + + org.springframework.security + spring-security-taglibs + + + javax.servlet + jstl + - + diff --git a/openid-connect-server/pom.xml b/openid-connect-server/pom.xml index 9a10146aa..4eb195d4c 100644 --- a/openid-connect-server/pom.xml +++ b/openid-connect-server/pom.xml @@ -15,40 +15,41 @@ See the License for the specific language governing permissions and limitations under the License. --> - - 4.0.0 - openid-connect-server - OpenID Connect Server Library - - org.mitre - openid-connect-parent - 1.2.0-SNAPSHOT - .. - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java-version} - ${java-version} - - - - - + + 4.0.0 + openid-connect-server + OpenID Connect Server Library + + org.mitre + openid-connect-parent + 1.2.0-SNAPSHOT + .. + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java-version} + ${java-version} + + + + + org.mitre openid-connect-common ${project.version} - org.springframework - spring-tx - - + org.springframework + spring-tx + + - OpenID Connect server libraries for Spring and Spring Security. - + OpenID Connect server libraries for Spring and Spring Security. + diff --git a/pom.xml b/pom.xml index 3acfc94df..bcf6c4e10 100644 --- a/pom.xml +++ b/pom.xml @@ -14,33 +14,35 @@ 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. ---> - 4.0.0 - org.mitre - openid-connect-parent - 1.2.0-SNAPSHOT - MITREid Connect - pom - - org.sonatype.oss - oss-parent - 9 - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - A business-friendly OSS license - - - - openid-connect-common - openid-connect-client +--> + + 4.0.0 + org.mitre + openid-connect-parent + 1.2.0-SNAPSHOT + MITREid Connect + pom + + org.sonatype.oss + oss-parent + 9 + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + A business-friendly OSS license + + + + openid-connect-common + openid-connect-client openid-connect-server - openid-connect-server-webapp - - + openid-connect-server-webapp + + scm:git:https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server.git scm:git:git@github.com:mitreid-connect/OpenID-Connect-Java-Spring-Server.git @@ -69,58 +71,58 @@ - - 1.7 - 4.1.1.RELEASE - 3.2.5.RELEASE - 1.7.7 - - A reference implementation of OpenID Connect (http://openid.net/connect/) and OAuth 2.0 built on top of Java, Spring, and Spring Security. The project contains a fully functioning server, client, and utility library. - https://github.com/mitreid-connect - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - org.apache.maven.plugins - maven-war-plugin - 2.2 - - - org.apache.maven.plugins - maven-archiver - 2.5 - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9 - - - org.apache.maven.plugins - maven-deploy-plugin - 2.7 - - - org.apache.maven.plugins - maven-source-plugin - 2.2 - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - - org.eclipse.jetty - jetty-maven-plugin - 9.1.1.v20140108 - - + + 1.7 + 4.1.1.RELEASE + 3.2.5.RELEASE + 1.7.7 + + A reference implementation of OpenID Connect (http://openid.net/connect/) and OAuth 2.0 built on top of Java, Spring, and Spring Security. The project contains a fully functioning server, client, and utility library. + https://github.com/mitreid-connect + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + org.apache.maven.plugins + maven-war-plugin + 2.2 + + + org.apache.maven.plugins + maven-archiver + 2.5 + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9 + + + org.apache.maven.plugins + maven-deploy-plugin + 2.7 + + + org.apache.maven.plugins + maven-source-plugin + 2.2 + + + org.apache.maven.plugins + maven-compiler-plugin + 2.5.1 + + + org.eclipse.jetty + jetty-maven-plugin + 9.1.1.v20140108 + + @@ -164,339 +166,339 @@ org.apache.maven.plugins maven-compiler-plugin - - true - org.apache.maven.plugins - maven-enforcer-plugin - 1.3 - - - enforce-maven-3 - - enforce - - - - - 3.0.2 - - - true - - - - + + true + org.apache.maven.plugins + maven-enforcer-plugin + 1.3 + + + enforce-maven-3 + + enforce + + + + + 3.0.2 + + + true + + + + - - https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server/issues - GitHub Issues - - - Travis CI - https://travis-ci.org/mitreid-connect/OpenID-Connect-Java-Spring-Server - + + https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server/issues + GitHub Issues + + + Travis CI + https://travis-ci.org/mitreid-connect/OpenID-Connect-Java-Spring-Server + - + - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9 - - true - true - true - true - MITREid Connect v. ${project.version} - MITREid Connect v. ${project.version} - ${basedir}/src/main/javadoc/overview.html - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.10 - - checkstyle.xml - - - - org.apache.maven.plugins - maven-surefire-plugin - - junit:junit - - **/*_Roo_* - - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.5.2 - - - html - xml - - - + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9 + + true + true + true + true + MITREid Connect v. ${project.version} + MITREid Connect v. ${project.version} + ${basedir}/src/main/javadoc/overview.html + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.10 + + checkstyle.xml + + + + org.apache.maven.plugins + maven-surefire-plugin + + junit:junit + + **/*_Roo_* + + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.5.2 + + + html + xml + + + - - - - - - - org.springframework - spring-core - ${org.springframework-version} - - - org.springframework - spring-webmvc - ${org.springframework-version} - - - org.springframework.security - spring-security-core - ${spring.security.version} - - - org.springframework - * - - - - - com.google.guava - guava - 16.0 - - - org.apache.httpcomponents - httpclient - 4.3.6 - - - org.springframework.security.oauth - 2.0.3.RELEASE - spring-security-oauth2 - - - com.nimbusds - nimbus-jose-jwt - 2.26.1 - - - org.eclipse.persistence - javax.persistence - 2.1.0 - - - com.google.code.gson - gson - 2.0 - - - - - org.slf4j - slf4j-api - ${org.slf4j-version} - - + + + + + + + org.springframework + spring-core + ${org.springframework-version} + + + org.springframework + spring-webmvc + ${org.springframework-version} + + + org.springframework.security + spring-security-core + ${spring.security.version} + + + org.springframework + * + + + + + com.google.guava + guava + 16.0 + + + org.apache.httpcomponents + httpclient + 4.3.6 + + + org.springframework.security.oauth + 2.0.3.RELEASE + spring-security-oauth2 + + + com.nimbusds + nimbus-jose-jwt + 2.26.1 + + + org.eclipse.persistence + javax.persistence + 2.1.0 + + + com.google.code.gson + gson + 2.0 + + + + + org.slf4j + slf4j-api + ${org.slf4j-version} + + - - com.fasterxml.jackson.core - jackson-databind - 2.3.4 - - - com.fasterxml.jackson.core - jackson-annotations - 2.3.4 - - - junit - junit - 4.7 - test - - - org.easymock - easymock - 2.0 - test - - - org.springframework - spring-test - ${org.springframework-version} - test - + + com.fasterxml.jackson.core + jackson-databind + 2.3.4 + + + com.fasterxml.jackson.core + jackson-annotations + 2.3.4 + + + junit + junit + 4.7 + test + + + org.easymock + easymock + 2.0 + test + + + org.springframework + spring-test + ${org.springframework-version} + test + + + org.mockito + mockito-all + 1.9.5 + test + + + org.slf4j + slf4j-jdk14 + test + ${org.slf4j-version} + + + + javax.servlet + servlet-api + 2.5 + provided + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + + org.springframework + spring-tx + ${org.springframework-version} + + + + org.springframework + spring-orm + ${org.springframework-version} + + + + commons-logging + commons-logging + + + + + org.slf4j + jcl-over-slf4j + ${org.slf4j-version} + runtime + + + org.slf4j + slf4j-log4j12 + ${org.slf4j-version} + runtime + + + log4j + log4j + 1.2.15 + + + javax.mail + mail + + + javax.jms + jms + + + com.sun.jdmk + jmxtools + + + com.sun.jmx + jmxri + + + runtime + + + commons-dbcp + commons-dbcp + 1.4 + + + org.hsqldb + hsqldb + 2.2.9 + + + org.eclipse.persistence + org.eclipse.persistence.jpa + 2.5.1 + + + org.springframework.security + spring-security-taglibs + ${spring.security.version} + + + org.springframework + * + + + + + javax.servlet + jstl + 1.2 + + + + mysql + mysql-connector-java + 5.1.34 + + + + + + + - org.mockito - mockito-all - 1.9.5 - test + junit + junit - - org.slf4j - slf4j-jdk14 - test - ${org.slf4j-version} - - - - javax.servlet - servlet-api - 2.5 - provided - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - - org.springframework - spring-tx - ${org.springframework-version} - - - - org.springframework - spring-orm - ${org.springframework-version} - - - - commons-logging - commons-logging - - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j-version} - runtime - - - org.slf4j - slf4j-log4j12 - ${org.slf4j-version} - runtime - - - log4j - log4j - 1.2.15 - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - runtime - - - commons-dbcp - commons-dbcp - 1.4 - - org.hsqldb - hsqldb - 2.2.9 + org.easymock + easymock - - org.eclipse.persistence - org.eclipse.persistence.jpa - 2.5.1 - - - org.springframework.security - spring-security-taglibs - ${spring.security.version} - - - org.springframework - * - - - - - javax.servlet - jstl - 1.2 - - - mysql - mysql-connector-java - 5.1.34 + org.springframework + spring-test - - - - - - - - junit - junit - - - org.easymock - easymock - - - org.springframework - spring-test - org.mockito mockito-all - - org.slf4j - slf4j-jdk14 - - - javax.servlet - servlet-api - - - javax.servlet.jsp - jsp-api - + + org.slf4j + slf4j-jdk14 + + + javax.servlet + servlet-api + + + javax.servlet.jsp + jsp-api + - + - spring-milestone - Spring Maven MILESTONE Repository - http://maven.springframework.org/milestone + spring-milestone + Spring Maven MILESTONE Repository + http://maven.springframework.org/milestone - - + + @@ -518,5 +520,5 @@ - +