Author: aadamchik
Date: Sun Jul 30 12:59:41 2006
New Revision: 426926
URL: http://svn.apache.org/viewvc?rev=426926&view=rev
Log:
fixing third-level transitive XML dependencies that messed up Eclipse
setting up Maven eclipse projects
removed JRE_LIB_15 variable - so now default workspace JRE must be 1.5
Modified:
incubator/cayenne/main/trunk/core/cayenne-jpa/pom.xml
Modified: incubator/cayenne/main/trunk/core/cayenne-jpa/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jpa/pom.xml?rev=426926&r1=426925&r2=426926&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jpa/pom.xml (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jpa/pom.xml Sun Jul 30 12:59:41
2006
@@ -2,154 +2,153 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-core-parent</artifactId>
+ <version>3.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <description>Cayenne JPA Implementation</description>
+ <artifactId>cayenne-jpa</artifactId>
+ <name>Cayenne JPA Implementation</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.4-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.5-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ </dependency>
+ </dependencies>
+
+ <!--TODO: This should be moved to the root pom soon -->
+ <distributionManagement>
+ <site>
+ <id>cayenne-website</id>
+ <name>Cayenne</name>
+ <url>file://${java.io.tmpdir}/foo</url>
+ </site>
+ <repository>
+ <id>local-maven2-repo</id>
+ <name>Local Maven 2 Cayenne Repository</name>
+ <url>file://${java.io.tmpdir}/cayenne-mvn-repo</url>
+ </repository>
+ <snapshotRepository>
+ <id>local-maven2-snapshot-repo</id>
+ <name>Local Maven 2 Snapshot Cayenne Repository</name>
+
<url>file://${java.io.tmpdir}/cayenne-mvn-snapshot-repo</url>
+ </snapshotRepository>
+ </distributionManagement>
- <parent>
- <groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-core-parent</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
- </parent>
-
- <description>Cayenne JPA Implementation</description>
- <artifactId>cayenne-jpa</artifactId>
- <name>Cayenne JPA Implementation</name>
- <packaging>jar</packaging>
-
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.4-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.5-core</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
- </dependency>
- </dependencies>
-
- <!--TODO: This should be moved to the root pom soon -->
- <distributionManagement>
- <site>
- <id>cayenne-website</id>
- <name>Cayenne</name>
- <url>file://${java.io.tmpdir}/foo</url>
- </site>
- <repository>
- <id>local-maven2-repo</id>
- <name>Local Maven 2 Cayenne Repository</name>
- <url>file://${java.io.tmpdir}/cayenne-mvn-repo</url>
- </repository>
- <snapshotRepository>
- <id>local-maven2-snapshot-repo</id>
- <name>Local Maven 2 Snapshot Cayenne Repository</name>
- <url>
- file://${java.io.tmpdir}/cayenne-mvn-snapshot-repo
- </url>
- </snapshotRepository>
- </distributionManagement>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test.java</include>
- <exclude>**/Test*.java</exclude>
- </includes>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>
- <!-- TODO: there is a way to make maven do the premain class -->
- src/main/resources/META-INF/MANIFEST.MF
- </manifestFile>
- </archive>
- </configuration>
- </plugin>
-
- <plugin>
- <!-- TODO: should this be done here or at assembly? -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-source-jar</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- </build>
-
- <profiles>
- <profile>
- <id>generate-assembly</id>
<build>
- <plugins>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test.java</include>
+ <exclude>**/Test*.java</exclude>
+ </includes>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>
+ <!-- TODO: there is a
way to make maven do the premain class -->
+
src/main/resources/META-INF/MANIFEST.MF
+ </manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <!-- TODO: should this be done here or at
assembly? -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-source-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadoc</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <!-- TODO: should this be done here or every time? -->
- <executions>
- <execution>
- <id>attach-source</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
- </profile>
- </profiles>
+
+ <profiles>
+ <profile>
+ <id>generate-assembly</id>
+ <build>
+ <plugins>
+
+ <plugin>
+
<artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+
<id>attach-javadoc</id>
+ <goals>
+
<goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+
<artifactId>maven-source-plugin</artifactId>
+ <!-- TODO: should this be done
here or every time? -->
+ <executions>
+ <execution>
+
<id>attach-source</id>
+ <goals>
+
<goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
