Author: mprudhom Date: Wed May 9 15:23:54 2007 New Revision: 536693 URL: http://svn.apache.org/viewvc?view=rev&rev=536693 Log: OPENJPA-194 Changed openjpa-all-VERSION.jar to be just openjpa-VERSION.jar, and changes openjpa-project-VERSION.zip to be apache-openjpa-VERSION.zip
Modified: incubator/openjpa/trunk/openjpa-all/pom.xml incubator/openjpa/trunk/openjpa-examples/pom.xml incubator/openjpa/trunk/openjpa-integration/examples/pom.xml incubator/openjpa/trunk/openjpa-integration/pom.xml incubator/openjpa/trunk/openjpa-jdbc-5/pom.xml incubator/openjpa/trunk/openjpa-jdbc/pom.xml incubator/openjpa/trunk/openjpa-kernel-5/pom.xml incubator/openjpa/trunk/openjpa-kernel/pom.xml incubator/openjpa/trunk/openjpa-lib/pom.xml incubator/openjpa/trunk/openjpa-persistence-jdbc/pom.xml incubator/openjpa/trunk/openjpa-persistence/pom.xml incubator/openjpa/trunk/openjpa-project/assembly.xml incubator/openjpa/trunk/openjpa-project/pom.xml incubator/openjpa/trunk/openjpa-xmlstore/pom.xml incubator/openjpa/trunk/pom.xml Modified: incubator/openjpa/trunk/openjpa-all/pom.xml URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-all/pom.xml?view=diff&rev=536693&r1=536692&r2=536693 ============================================================================== --- incubator/openjpa/trunk/openjpa-all/pom.xml (original) +++ incubator/openjpa/trunk/openjpa-all/pom.xml Wed May 9 15:23:54 2007 @@ -22,12 +22,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <artifactId>openjpa-all</artifactId> + <artifactId>openjpa</artifactId> <packaging>jar</packaging> <name>OpenJPA Aggregate Jar</name> <parent> <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> + <artifactId>openjpa-parent</artifactId> <version>0.9.8-incubating-SNAPSHOT</version> </parent> <build> Modified: incubator/openjpa/trunk/openjpa-examples/pom.xml URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-examples/pom.xml?view=diff&rev=536693&r1=536692&r2=536693 ============================================================================== --- incubator/openjpa/trunk/openjpa-examples/pom.xml (original) +++ incubator/openjpa/trunk/openjpa-examples/pom.xml Wed May 9 15:23:54 2007 @@ -29,7 +29,7 @@ <url>http://incubator.apache.org/projects/openjpa</url> <parent> <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> + <artifactId>openjpa-parent</artifactId> <version>0.9.8-incubating-SNAPSHOT</version> </parent> <dependencies> Modified: incubator/openjpa/trunk/openjpa-integration/examples/pom.xml URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-integration/examples/pom.xml?view=diff&rev=536693&r1=536692&r2=536693 ============================================================================== --- incubator/openjpa/trunk/openjpa-integration/examples/pom.xml (original) +++ incubator/openjpa/trunk/openjpa-integration/examples/pom.xml Wed May 9 15:23:54 2007 @@ -85,7 +85,7 @@ <dependencies> <dependency> <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-all</artifactId> + <artifactId>openjpa</artifactId> <version>${pom.version}</version> </dependency> </dependencies> Modified: incubator/openjpa/trunk/openjpa-integration/pom.xml URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-integration/pom.xml?view=diff&rev=536693&r1=536692&r2=536693 ============================================================================== --- incubator/openjpa/trunk/openjpa-integration/pom.xml (original) +++ incubator/openjpa/trunk/openjpa-integration/pom.xml Wed May 9 15:23:54 2007 @@ -27,7 +27,7 @@ <name>OpenJPA Integration Tests</name> <parent> <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> + <artifactId>openjpa-parent</artifactId> <version>0.9.8-incubating-SNAPSHOT</version> </parent> <modules> Modified: incubator/openjpa/trunk/openjpa-jdbc-5/pom.xml URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc-5/pom.xml?view=diff&rev=536693&r1=536692&r2=536693 ============================================================================== --- incubator/openjpa/trunk/openjpa-jdbc-5/pom.xml (original) +++ incubator/openjpa/trunk/openjpa-jdbc-5/pom.xml Wed May 9 15:23:54 2007 @@ -29,7 +29,7 @@ <url>http://incubator.apache.org/projects/openjpa</url> <parent> <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> + <artifactId>openjpa-parent</artifactId> <version>0.9.8-incubating-SNAPSHOT</version> </parent> <dependencies> Modified: incubator/openjpa/trunk/openjpa-jdbc/pom.xml URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/pom.xml?view=diff&rev=536693&r1=536692&r2=536693 ============================================================================== --- incubator/openjpa/trunk/openjpa-jdbc/pom.xml (original) +++ incubator/openjpa/trunk/openjpa-jdbc/pom.xml Wed May 9 15:23:54 2007 @@ -29,7 +29,7 @@ <url>http://incubator.apache.org/projects/openjpa</url> <parent> <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> + <artifactId>openjpa-parent</artifactId> <version>0.9.8-incubating-SNAPSHOT</version> </parent> <dependencies> Modified: incubator/openjpa/trunk/openjpa-kernel-5/pom.xml URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel-5/pom.xml?view=diff&rev=536693&r1=536692&r2=536693 ============================================================================== --- incubator/openjpa/trunk/openjpa-kernel-5/pom.xml (original) +++ incubator/openjpa/trunk/openjpa-kernel-5/pom.xml Wed May 9 15:23:54 2007 @@ -29,7 +29,7 @@ <url>http://incubator.apache.org/projects/openjpa</url> <parent> <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> + <artifactId>openjpa-parent</artifactId> <version>0.9.8-incubating-SNAPSHOT</version> </parent> <dependencies> Modified: incubator/openjpa/trunk/openjpa-kernel/pom.xml URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/pom.xml?view=diff&rev=536693&r1=536692&r2=536693 ============================================================================== --- incubator/openjpa/trunk/openjpa-kernel/pom.xml (original) +++ incubator/openjpa/trunk/openjpa-kernel/pom.xml Wed May 9 15:23:54 2007 @@ -29,7 +29,7 @@ <url>http://incubator.apache.org/projects/openjpa</url> <parent> <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> + <artifactId>openjpa-parent</artifactId> <version>0.9.8-incubating-SNAPSHOT</version> </parent> <dependencies> Modified: incubator/openjpa/trunk/openjpa-lib/pom.xml URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/pom.xml?view=diff&rev=536693&r1=536692&r2=536693 ============================================================================== --- incubator/openjpa/trunk/openjpa-lib/pom.xml (original) +++ incubator/openjpa/trunk/openjpa-lib/pom.xml Wed May 9 15:23:54 2007 @@ -29,7 +29,7 @@ <url>http://incubator.apache.org/projects/openjpa</url> <parent> <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> + <artifactId>openjpa-parent</artifactId> <version>0.9.8-incubating-SNAPSHOT</version> </parent> <dependencies> Modified: incubator/openjpa/trunk/openjpa-persistence-jdbc/pom.xml URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence-jdbc/pom.xml?view=diff&rev=536693&r1=536692&r2=536693 ============================================================================== --- incubator/openjpa/trunk/openjpa-persistence-jdbc/pom.xml (original) +++ incubator/openjpa/trunk/openjpa-persistence-jdbc/pom.xml Wed May 9 15:23:54 2007 @@ -29,7 +29,7 @@ <url>http://incubator.apache.org/projects/openjpa</url> <parent> <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> + <artifactId>openjpa-parent</artifactId> <version>0.9.8-incubating-SNAPSHOT</version> </parent> Modified: incubator/openjpa/trunk/openjpa-persistence/pom.xml URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/pom.xml?view=diff&rev=536693&r1=536692&r2=536693 ============================================================================== --- incubator/openjpa/trunk/openjpa-persistence/pom.xml (original) +++ incubator/openjpa/trunk/openjpa-persistence/pom.xml Wed May 9 15:23:54 2007 @@ -29,7 +29,7 @@ <url>http://incubator.apache.org/projects/openjpa</url> <parent> <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> + <artifactId>openjpa-parent</artifactId> <version>0.9.8-incubating-SNAPSHOT</version> </parent> <dependencies> Modified: incubator/openjpa/trunk/openjpa-project/assembly.xml URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-project/assembly.xml?view=diff&rev=536693&r1=536692&r2=536693 ============================================================================== --- incubator/openjpa/trunk/openjpa-project/assembly.xml (original) +++ incubator/openjpa/trunk/openjpa-project/assembly.xml Wed May 9 15:23:54 2007 @@ -86,9 +86,8 @@ <outputDirectory>/</outputDirectory> <unpack>false</unpack> <scope>runtime</scope> - <outputFileNameMapping>openjpa-${version}.${extension}</outputFileNameMapping> <includes> - <include>org.apache.openjpa:openjpa-all</include> + <include>org.apache.openjpa:openjpa</include> </includes> </dependencySet> <dependencySet> Modified: incubator/openjpa/trunk/openjpa-project/pom.xml URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-project/pom.xml?view=diff&rev=536693&r1=536692&r2=536693 ============================================================================== --- incubator/openjpa/trunk/openjpa-project/pom.xml (original) +++ incubator/openjpa/trunk/openjpa-project/pom.xml Wed May 9 15:23:54 2007 @@ -34,12 +34,12 @@ create a key. See http://apache.org/dev/release-signing.html --> <modelVersion>4.0.0</modelVersion> - <artifactId>openjpa-project</artifactId> + <artifactId>apache-openjpa</artifactId> <packaging>pom</packaging> <name>OpenJPA Distribution</name> <parent> <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> + <artifactId>openjpa-parent</artifactId> <version>0.9.8-incubating-SNAPSHOT</version> </parent> @@ -354,7 +354,7 @@ <dependencies> <dependency> <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-all</artifactId> + <artifactId>openjpa</artifactId> <version>${pom.version}</version> </dependency> Modified: incubator/openjpa/trunk/openjpa-xmlstore/pom.xml URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-xmlstore/pom.xml?view=diff&rev=536693&r1=536692&r2=536693 ============================================================================== --- incubator/openjpa/trunk/openjpa-xmlstore/pom.xml (original) +++ incubator/openjpa/trunk/openjpa-xmlstore/pom.xml Wed May 9 15:23:54 2007 @@ -29,7 +29,7 @@ <url>http://incubator.apache.org/projects/openjpa</url> <parent> <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> + <artifactId>openjpa-parent</artifactId> <version>0.9.8-incubating-SNAPSHOT</version> </parent> <dependencies> Modified: incubator/openjpa/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/pom.xml?view=diff&rev=536693&r1=536692&r2=536693 ============================================================================== --- incubator/openjpa/trunk/pom.xml (original) +++ incubator/openjpa/trunk/pom.xml Wed May 9 15:23:54 2007 @@ -26,10 +26,15 @@ <maven>2.0.4</maven> </prerequisites> <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> + <artifactId>openjpa-parent</artifactId> <packaging>pom</packaging> <name>OpenJPA</name> <description>OpenJPA</description> + + <properties> + <scm.dir>svn.apache.org/repos/asf/incubator/openjpa/trunk</scm.dir> + </properties> + <!-- Changing this version needs to also be done in all children poms See: http://jira.codehaus.org/browse/MNG-624 @@ -95,9 +100,9 @@ <url>http://www.apache.org</url> </organization> <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/openjpa/trunk</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/openjpa/trunk</developerConnection> - <url>https://svn.apache.org/repos/asf/incubator/openjpa/trunk</url> + <connection>scm:svn:http://${scm.dir}</connection> + <developerConnection>scm:svn:https://${scm.dir}</developerConnection> + <url>https://${scm.dir}</url> </scm> <modules> <module>openjpa-lib</module>