Author: kstam
Date: Thu Mar 7 18:46:29 2013
New Revision: 1453993
URL: http://svn.apache.org/r1453993
Log:
JUDDI-540, Fixing the jUDDI distro.
fixing handling of the hibernate/openjpa profile
Modified:
juddi/trunk/juddi-tomcat/pom.xml
juddi/trunk/juddiv3-war/pom.xml
Modified: juddi/trunk/juddi-tomcat/pom.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-tomcat/pom.xml?rev=1453993&r1=1453992&r2=1453993&view=diff
==============================================================================
--- juddi/trunk/juddi-tomcat/pom.xml (original)
+++ juddi/trunk/juddi-tomcat/pom.xml Thu Mar 7 18:46:29 2013
@@ -44,12 +44,6 @@
<type>war</type>
</dependency>
<dependency>
- <artifactId>juddi-core-openjpa</artifactId>
- <groupId>org.apache.juddi</groupId>
- <version>${project.parent.version}</version>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.4.2.0</version>
@@ -94,8 +88,6 @@
<property
name="dependency.derby.jar"
value="${maven.dependency.org.apache.derby.derby.jar.path}" />
<property
name="dependency.tomcat.zip"
value="${maven.dependency.org.apache.juddi.bootstrap.apache-tomcat.zip.path}" />
<property
name="dependency.juddiv3.war"
value="${basedir}/../juddi-cxf/target/juddi-cxf-${project.parent.version}.war"
/>
-
<echo>JUDDIV3.WAR=${dependency.juddiv3.war}</echo>
- <property
name="dependency.juddi.jar"
value="${maven.dependency.org.apache.juddi.juddi.jar.path}" />
<ant
antfile="${basedir}/build.xml">
<property name="dependency.tomcat.zip" value="${dependency.tomcat.zip}" />
<target
name="package-tomcat" />
Modified: juddi/trunk/juddiv3-war/pom.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/pom.xml?rev=1453993&r1=1453992&r2=1453993&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/pom.xml (original)
+++ juddi/trunk/juddiv3-war/pom.xml Thu Mar 7 18:46:29 2013
@@ -49,79 +49,8 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <artifactId>juddi-core</artifactId>
- <groupId>org.apache.juddi</groupId>
- <version>3.1.5-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <artifactId>juddi-core-openjpa</artifactId>
- <groupId>org.apache.juddi</groupId>
- <version>3.1.5-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.juddi</groupId>
- <artifactId>uddi-ws</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.juddi</groupId>
- <artifactId>uddi-tck</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-configuration</groupId>
-
<artifactId>commons-configuration</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-collections</groupId>
-
<artifactId>commons-collections</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- </exclusion>
- <exclusion>
- <groupId>mysql</groupId>
-
<artifactId>mysql-connector-java</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hibernate</groupId>
-
<artifactId>hibernate-entitymanager</artifactId>
- </exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -171,10 +100,7 @@
<profile>
<id>hibernate</id>
<activation>
- <property>
- <name>persistence</name>
- <value>hibernate</value>
- </property>
+ <activeByDefault>false</activeByDefault>
</activation>
<properties>
<persistence>hibernate</persistence>
@@ -204,15 +130,18 @@
</plugin>
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <artifactId>juddi-core</artifactId>
+ <groupId>org.apache.juddi</groupId>
+ <version>3.1.5-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</profile>
<profile>
<id>openjpa</id>
<activation>
<activeByDefault>true</activeByDefault>
- <property>
- <name>persistence</name>
- <value>openjpa</value>
- </property>
</activation>
<properties>
<persistence>openjpa</persistence>
@@ -242,6 +171,19 @@
</plugin>
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <artifactId>juddi-core-openjpa</artifactId>
+ <groupId>org.apache.juddi</groupId>
+ <version>3.1.5-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
</profile>
</profiles>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
