Repository: juddi Updated Branches: refs/heads/master 3f8dc0303 -> a6cb20900
JUDDI-968 progress with pom cleanup and dependency updates Project: http://git-wip-us.apache.org/repos/asf/juddi/repo Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/1e5ff4c7 Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/1e5ff4c7 Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/1e5ff4c7 Branch: refs/heads/master Commit: 1e5ff4c7634530f8df8619849eeb6696bcdf5c47 Parents: 3f8dc03 Author: Alex O'Ree <[email protected]> Authored: Fri Feb 3 06:59:33 2017 -0500 Committer: Alex O'Ree <[email protected]> Committed: Fri Feb 3 06:59:33 2017 -0500 ---------------------------------------------------------------------- juddi-client/pom.xml | 2 - juddi-core-openjpa/pom.xml | 6 +- juddi-core/pom.xml | 7 +- juddi-ddl-generator/pom.xml | 8 +-- juddi-examples/hello-world-embedded/pom.xml | 1 - juddi-gui/pom.xml | 1 - juddi-rest-cxf/pom.xml | 13 +--- juddi-tomcat/pom.xml | 7 +- juddiv3-war-repl/pom.xml | 5 +- juddiv3-war/pom.xml | 5 +- pom.xml | 82 +++++++++++++++++++++--- 11 files changed, 82 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/juddi/blob/1e5ff4c7/juddi-client/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-client/pom.xml b/juddi-client/pom.xml index bb4111f..db1e833 100644 --- a/juddi-client/pom.xml +++ b/juddi-client/pom.xml @@ -45,7 +45,6 @@ <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -61,7 +60,6 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.2.5</version> </dependency> <dependency> <groupId>org.easymock</groupId> http://git-wip-us.apache.org/repos/asf/juddi/blob/1e5ff4c7/juddi-core-openjpa/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-core-openjpa/pom.xml b/juddi-core-openjpa/pom.xml index 3d78a29..5b017cd 100644 --- a/juddi-core-openjpa/pom.xml +++ b/juddi-core-openjpa/pom.xml @@ -131,7 +131,6 @@ <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2</version> </dependency> <dependency> <groupId>org.apache.juddi</groupId> @@ -188,13 +187,11 @@ <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> - <version>10.5.3.0_1</version> <scope>test</scope> </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> - <version>8.2-504.jdbc3</version> <scope>test</scope> </dependency> <dependency> @@ -206,7 +203,6 @@ <dependency> <groupId>org.apache.geronimo.javamail</groupId> <artifactId>geronimo-javamail_1.4_mail</artifactId> - <version>1.8.3</version> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/juddi/blob/1e5ff4c7/juddi-core/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-core/pom.xml b/juddi-core/pom.xml index e881681..48cd70a 100644 --- a/juddi-core/pom.xml +++ b/juddi-core/pom.xml @@ -148,25 +148,21 @@ language governing permissions and * limitations under the License. * */ --> <dependency> <groupId>org.apache.geronimo.javamail</groupId> <artifactId>geronimo-javamail_1.4_mail</artifactId> - <version>1.8.3</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> - <version>10.5.3.0_1</version> <scope>test</scope> </dependency> <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.6</version> <scope>test</scope> </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> - <version>8.2-504.jdbc3</version> <scope>test</scope> </dependency> <dependency> @@ -184,7 +180,6 @@ language governing permissions and * limitations under the License. * */ --> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2</version> </dependency> <dependency> <groupId>javax.servlet</groupId> http://git-wip-us.apache.org/repos/asf/juddi/blob/1e5ff4c7/juddi-ddl-generator/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-ddl-generator/pom.xml b/juddi-ddl-generator/pom.xml index 26422b9..07d09b2 100644 --- a/juddi-ddl-generator/pom.xml +++ b/juddi-ddl-generator/pom.xml @@ -45,22 +45,16 @@ <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> - <version>10.10.1.1</version> </dependency> <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.29</version> </dependency> - - - <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> - <version>9.1-901.jdbc4</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/juddi/blob/1e5ff4c7/juddi-examples/hello-world-embedded/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-examples/hello-world-embedded/pom.xml b/juddi-examples/hello-world-embedded/pom.xml index e93cb0f..020e7df 100644 --- a/juddi-examples/hello-world-embedded/pom.xml +++ b/juddi-examples/hello-world-embedded/pom.xml @@ -46,7 +46,6 @@ <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> - <version>10.5.3.0_1</version> </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/juddi/blob/1e5ff4c7/juddi-gui/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-gui/pom.xml b/juddi-gui/pom.xml index 6b6123b..defc904 100644 --- a/juddi-gui/pom.xml +++ b/juddi-gui/pom.xml @@ -60,7 +60,6 @@ language governing permissions and * limitations under the License. * */ --> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> http://git-wip-us.apache.org/repos/asf/juddi/blob/1e5ff4c7/juddi-rest-cxf/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-rest-cxf/pom.xml b/juddi-rest-cxf/pom.xml index 2381974..b93afc8 100644 --- a/juddi-rest-cxf/pom.xml +++ b/juddi-rest-cxf/pom.xml @@ -62,13 +62,11 @@ <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2</version> </dependency> - <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-bundle-jaxrs</artifactId> - <version>2.7.5</version> + <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -151,7 +149,6 @@ <dependency> <groupId>org.apache.geronimo.javamail</groupId> <artifactId>geronimo-javamail_1.4_mail</artifactId> - <version>1.8.3</version> <scope>provided</scope> </dependency> <dependency> @@ -163,20 +160,16 @@ <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> - <version>10.5.3.0_1</version> <scope>test</scope> - </dependency> <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.6</version> <scope>test</scope> </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> - <version>8.2-504.jdbc3</version> <scope>test</scope> </dependency> <dependency> @@ -199,7 +192,7 @@ <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-extension-providers</artifactId> - <version>2.7.5</version> + <version>${cxf.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/juddi/blob/1e5ff4c7/juddi-tomcat/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-tomcat/pom.xml b/juddi-tomcat/pom.xml index 1c699dc..d2c4ce4 100644 --- a/juddi-tomcat/pom.xml +++ b/juddi-tomcat/pom.xml @@ -68,12 +68,10 @@ <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> - <version>10.4.2.0</version> </dependency> <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.6</version> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> @@ -82,9 +80,8 @@ <type>jar</type> </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> - <version>8.2-504.jdbc3</version> </dependency> <dependency> <groupId>log4j</groupId> @@ -145,7 +142,7 @@ <property name="dependency.log4j.jar" value="${maven.dependency.log4j.log4j.jar.path}" /> <property name="dependency.mysql.jar" value="${maven.dependency.mysql.mysql-connector-java.jar.path}" /> - <property name="dependency.postgres.jar" value="${maven.dependency.postgresql.postgresql.jar.path}" /> + <property name="dependency.postgres.jar" value="${maven.dependency.org.postgresql.postgresql.jar.path}" /> <property name="dependency.commons-discovery.jar" value="${maven.dependency.commons-discovery.commons-discovery.jar.path}" /> <property name="dependency.derby.jar" value="${maven.dependency.org.apache.derby.derby.jar.path}" /> <property name="dependency.tomcat.zip" value="${maven.dependency.org.apache.tomcat.tomcat.zip.path}" /> http://git-wip-us.apache.org/repos/asf/juddi/blob/1e5ff4c7/juddiv3-war-repl/pom.xml ---------------------------------------------------------------------- diff --git a/juddiv3-war-repl/pom.xml b/juddiv3-war-repl/pom.xml index 5d59292..2fbc0ef 100644 --- a/juddiv3-war-repl/pom.xml +++ b/juddiv3-war-repl/pom.xml @@ -244,7 +244,6 @@ <dependency> <groupId>org.apache.geronimo.javamail</groupId> <artifactId>geronimo-javamail_1.4_mail</artifactId> - <version>1.8.3</version> </dependency> </dependencies> </profile> @@ -299,7 +298,7 @@ <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-extension-providers</artifactId> - <version>2.7.5</version> + <version>${cxf.version}</version> </dependency> <dependency> @@ -337,7 +336,6 @@ <dependency> <groupId>org.apache.geronimo.javamail</groupId> <artifactId>geronimo-javamail_1.4_mail</artifactId> - <version>1.8.3</version> </dependency> </dependencies> </profile> @@ -431,7 +429,6 @@ <dependency> <groupId>org.apache.geronimo.javamail</groupId> <artifactId>geronimo-javamail_1.4_mail</artifactId> - <version>1.8.3</version> </dependency> </dependencies> </profile> http://git-wip-us.apache.org/repos/asf/juddi/blob/1e5ff4c7/juddiv3-war/pom.xml ---------------------------------------------------------------------- diff --git a/juddiv3-war/pom.xml b/juddiv3-war/pom.xml index 7ccce9a..aae2264 100644 --- a/juddiv3-war/pom.xml +++ b/juddiv3-war/pom.xml @@ -244,7 +244,6 @@ <dependency> <groupId>org.apache.geronimo.javamail</groupId> <artifactId>geronimo-javamail_1.4_mail</artifactId> - <version>1.8.3</version> </dependency> </dependencies> </profile> @@ -299,7 +298,7 @@ <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-extension-providers</artifactId> - <version>2.7.5</version> + <version>${cxf.version}</version> </dependency> <dependency> @@ -337,7 +336,6 @@ <dependency> <groupId>org.apache.geronimo.javamail</groupId> <artifactId>geronimo-javamail_1.4_mail</artifactId> - <version>1.8.3</version> </dependency> </dependencies> </profile> @@ -431,7 +429,6 @@ <dependency> <groupId>org.apache.geronimo.javamail</groupId> <artifactId>geronimo-javamail_1.4_mail</artifactId> - <version>1.8.3</version> </dependency> </dependencies> </profile> http://git-wip-us.apache.org/repos/asf/juddi/blob/1e5ff4c7/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9f8ae27..4cf3636 100644 --- a/pom.xml +++ b/pom.xml @@ -43,8 +43,8 @@ under the License. <sourceReleaseAssemblyDescriptor>source-release</sourceReleaseAssemblyDescriptor> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <cxf.version>2.7.14</cxf.version> - <springframework.version>3.2.2.RELEASE</springframework.version> + <cxf.version>2.7.18</cxf.version> + <springframework.version>3.2.18.RELEASE</springframework.version> </properties> <issueManagement> @@ -272,6 +272,18 @@ under the License. </filesets> </configuration> </plugin> + <!--<plugin> + <groupId>org.owasp</groupId> + <artifactId>dependency-check-maven</artifactId> + <version>1.4.5</version> + <executions> + <execution> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin>--> </plugins> </build> <reporting> @@ -300,6 +312,18 @@ under the License. <artifactId>apache-rat-plugin</artifactId> <version>0.11</version> </plugin> + <plugin> + <groupId>org.owasp</groupId> + <artifactId>dependency-check-maven</artifactId> + <version>1.4.5</version> + <reportSets> + <reportSet> + <reports> + <report>aggregate</report> + </reports> + </reportSet> + </reportSets> + </plugin> </plugins> </reporting> <modules> @@ -326,26 +350,64 @@ under the License. </site> </distributionManagement> <dependencies> + <!-- these dependencies apply to all subject projects --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> <scope>test</scope> </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging-api</artifactId> - <version>1.1</version> </dependency> </dependencies> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.2</version> + </dependency> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>6.0.5</version> + </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <version>10.5.3.0_1</version> + </dependency> + <dependency> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>9.4.1212</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.javamail</groupId> + <artifactId>geronimo-javamail_1.4_mail</artifactId> + <version>1.8.4</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.5.2</version> + </dependency> + </dependencies> + </dependencyManagement> + <repositories> <repository> - <id>maven2-repository.dev.java.net</id> - <name>Java.net Maven 2 Repository</name> - <url>http://download.java.net/maven/2</url> - <layout>default</layout> - </repository> - <repository> <id>apache.nexus</id> <name>Apache NEXUS Maven 2 Repository</name> <url>https://repository.apache.org/content/repositories/releases/</url> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
