From 0d2487523ce07711a52e34be7b34824e4c06e2fa Mon Sep 17 00:00:00 2001 From: erik Date: Sun, 11 Apr 2010 18:59:40 +0000 Subject: [PATCH] The next steps towards making it deployable on the central maven repo. Moved repository settings to the specific projects (toplink essentials, eclipse-link, hibernate) where they belong. Temporarily downgraded hibernate support to version 3.4.0 GA and removed the repo setting so at least hibernate support can be put on maven central. --- trunk/gps/pom.xml | 2 +- trunk/hibernate-jpa/pom.xml | 6 +-- trunk/mythtv/monitor/pom.xml | 2 +- trunk/mythtv/timer/pom.xml | 2 +- trunk/mythtv/war/pom.xml | 2 +- trunk/pom.xml | 39 ++++++++++--------- trunk/support/pom.xml | 3 +- trunk/support/test/eclipselink/pom.xml | 9 +++++ trunk/support/test/pom.xml | 18 ++++++++- trunk/support/test/toplink-essentials/pom.xml | 10 +++++ trunk/system/pom.xml | 1 + .../system/spring/SubSpringComponent.java | 1 - 12 files changed, 65 insertions(+), 30 deletions(-) diff --git a/trunk/gps/pom.xml b/trunk/gps/pom.xml index edeb0a8d..4ea80e67 100644 --- a/trunk/gps/pom.xml +++ b/trunk/gps/pom.xml @@ -4,7 +4,7 @@ org.wamblee - wamblee-crawler + wamblee-utils 0.2-SNAPSHOT diff --git a/trunk/hibernate-jpa/pom.xml b/trunk/hibernate-jpa/pom.xml index 8d10e100..5852114b 100644 --- a/trunk/hibernate-jpa/pom.xml +++ b/trunk/hibernate-jpa/pom.xml @@ -26,7 +26,7 @@ org.hibernate hibernate-entitymanager - 3.5.0-Final + 3.4.0.GA javax.transaction @@ -37,12 +37,12 @@ - + diff --git a/trunk/mythtv/monitor/pom.xml b/trunk/mythtv/monitor/pom.xml index b7f9d395..56013fe9 100644 --- a/trunk/mythtv/monitor/pom.xml +++ b/trunk/mythtv/monitor/pom.xml @@ -40,7 +40,7 @@ 0.2-SNAPSHOT - javaee + javax javaee-api diff --git a/trunk/mythtv/timer/pom.xml b/trunk/mythtv/timer/pom.xml index 8ebfa99a..0dc104a7 100644 --- a/trunk/mythtv/timer/pom.xml +++ b/trunk/mythtv/timer/pom.xml @@ -22,7 +22,7 @@ ${project.version} - javaee + javax javaee-api diff --git a/trunk/mythtv/war/pom.xml b/trunk/mythtv/war/pom.xml index b239c3bc..a602a78c 100644 --- a/trunk/mythtv/war/pom.xml +++ b/trunk/mythtv/war/pom.xml @@ -22,7 +22,7 @@ ${project.version} - javaee + javax javaee-api diff --git a/trunk/pom.xml b/trunk/pom.xml index 24fcd42a..04c79d8d 100644 --- a/trunk/pom.xml +++ b/trunk/pom.xml @@ -25,10 +25,7 @@ system hibernate-jpa security - socketproxy - crawler gps - mythtv @@ -302,9 +299,9 @@ - javaee + javax javaee-api - 5 + 6.0 provided @@ -486,23 +483,14 @@ - - - javaee - Java EE repo at SUN - http://download.java.net/maven/1 - legacy - - - EclipseLink Repo - http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/rt/eclipselink/maven.repo - - - - release + + + wamblee.release + + @@ -521,6 +509,19 @@ + + all + + + !wamblee.release + + + + socketproxy + crawler + mythtv + + diff --git a/trunk/support/pom.xml b/trunk/support/pom.xml index 634b1942..b5e0b78a 100644 --- a/trunk/support/pom.xml +++ b/trunk/support/pom.xml @@ -17,7 +17,8 @@ general - spring test + spring + diff --git a/trunk/support/test/eclipselink/pom.xml b/trunk/support/test/eclipselink/pom.xml index 271d05a2..07eef75e 100644 --- a/trunk/support/test/eclipselink/pom.xml +++ b/trunk/support/test/eclipselink/pom.xml @@ -46,4 +46,13 @@ + + + EclipseLink Repo + http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/rt/eclipselink/maven.repo + + + + + diff --git a/trunk/support/test/pom.xml b/trunk/support/test/pom.xml index 1a2617fc..2bd63026 100644 --- a/trunk/support/test/pom.xml +++ b/trunk/support/test/pom.xml @@ -18,7 +18,21 @@ enterprise hibernate - eclipselink - toplink-essentials + + + + all + + + !wamblee.release + + + + eclipselink + toplink-essentials + + + + diff --git a/trunk/support/test/toplink-essentials/pom.xml b/trunk/support/test/toplink-essentials/pom.xml index 07af9267..799ca44c 100644 --- a/trunk/support/test/toplink-essentials/pom.xml +++ b/trunk/support/test/toplink-essentials/pom.xml @@ -47,4 +47,14 @@ + + + javaee + Java EE repo at SUN + http://download.java.net/maven/1 + legacy + + + + diff --git a/trunk/system/pom.xml b/trunk/system/pom.xml index b9c5a5c9..800e0075 100644 --- a/trunk/system/pom.xml +++ b/trunk/system/pom.xml @@ -18,4 +18,5 @@ general spring + diff --git a/trunk/system/spring/src/test/java/org/wamblee/system/spring/SubSpringComponent.java b/trunk/system/spring/src/test/java/org/wamblee/system/spring/SubSpringComponent.java index 16279e0c..5e79a7ad 100644 --- a/trunk/system/spring/src/test/java/org/wamblee/system/spring/SubSpringComponent.java +++ b/trunk/system/spring/src/test/java/org/wamblee/system/spring/SubSpringComponent.java @@ -17,7 +17,6 @@ package org.wamblee.system.spring; import java.util.Map; -import net.sf.cglib.transform.impl.AddStaticInitTransformer; import org.wamblee.system.core.DefaultProvidedInterface; import org.wamblee.system.core.ProvidedInterface; -- 2.31.1