|
View:
New views
1 Messages
—
Rating Filter:
Alert me
|
|
|
Request for pom.xml reviewPlease review the proposed changes to
1. pom.xml of jdbc, 2. pom.xml of jdbc-ra-distribution and 3. a new pom.xml under jdbc/dbvendormapping (attached pom.xml). Below are the diffs and attached are the original files. Index: jdbc/jdbc-ra/jdbc-ra-distribution/pom.xml =================================================================== --- jdbc/jdbc-ra/jdbc-ra-distribution/pom.xml (revision 33699) +++ jdbc/jdbc-ra/jdbc-ra-distribution/pom.xml (working copy) @@ -26,11 +26,13 @@ <resolveArtifact artifactId="jdbc30" groupId="org.glassfish.jdbc.jdbc-ra.jdbc30" property="30.jar"/> <resolveArtifact artifactId="jdbc40" groupId="org.glassfish.jdbc.jdbc-ra.jdbc40" property="40.jar"/> <resolveArtifact artifactId="templates" groupId="org.glassfish.jdbc" property="templates.jar"/> + <resolveArtifact artifactId="dbvendormapping" groupId="org.glassfish.jdbc" property="dbvendormapping.jar"/> <unjar src="${core.jar}" dest="target/classes"/> <unjar src="${30.jar}" dest="target/classes"/> <unjar src="${40.jar}" dest="target/classes"/> <unjar src="${templates.jar}" dest="target/classes/templates"/> + <unjar src="${dbvendormapping.jar}" dest="target/classes/dbvendormapping"/> <!-- Creating jars/rars done using ant build.xml --> <property name="compile_classpath" refid="maven.compile.classpath"/> @@ -80,5 +82,11 @@ <type>distribution-fragment</type> </dependency> + <dependency> + <groupId>org.glassfish.jdbc</groupId> + <artifactId>dbvendormapping</artifactId> + <version>${project.parent.version}</version> + <type>distribution-fragment</type> + </dependency> </dependencies> </project> Index: jdbc/pom.xml =================================================================== --- jdbc/pom.xml (revision 33699) +++ jdbc/pom.xml (working copy) @@ -71,5 +71,6 @@ <module>jdbc-ra</module> <module>admin</module> <module>templates</module> + <module>dbvendormapping</module> </modules> </project> Thanks, Shalini. <?xml version="1.0"?> <project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <parent> <groupId>org.glassfish</groupId> <artifactId>glassfish-parent</artifactId> <version>3.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.glassfish.jdbc</groupId> <artifactId>jdbc</artifactId> <name>JDBC Module</name> <packaging>pom</packaging> <version>3.0-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.glassfish.build</groupId> <artifactId>maven-glassfishbuild-plugin</artifactId> <configuration> <!-- configuration for the run mojo --> <distribution> <groupId>org.glassfish.distributions</groupId> <artifactId>web</artifactId> <version>${project.version}</version> </distribution> </configuration> </plugin> </plugins> <extensions> <extension> <groupId>org.glassfish.build</groupId> <artifactId>maven-glassfishbuild-extension</artifactId> <version>${project.version}</version> </extension> <extension> <groupId>org.jvnet.wagon-svn</groupId> <artifactId>wagon-svn</artifactId> <version>1.8</version> </extension> </extensions> </build> <developers> <developer> <id>jr158900</id> <name>Jagadish Ramu</name> <url>http://blogs.sun.com/JagadishPrasath</url> <organization>Sun Microsystems, Inc.</organization> <roles> <role>lead</role> <role>developer</role> </roles> </developer> <developer> <id>sm157516</id> <name>Shalini Muthukrishnan</name> <url>http://blogs.sun.com/technical</url> <organization>Sun Microsystems, Inc.</organization> <roles> <role>developer</role> </roles> </developer> </developers> <modules> <module>jdbc-ra</module> <module>admin</module> <module>templates</module> <module>dbvendormapping</module> </modules> </project> <?xml version="1.0"?> <project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <parent> <artifactId>jdbc-ra</artifactId> <groupId>org.glassfish.jdbc.jdbc-ra</groupId> <version>3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.glassfish.jdbc.jdbc-ra.jdbc-ra-distribution</groupId> <artifactId>jdbc-ra</artifactId> <name>Distribution Module for JDBC Resource Adapter</name> <packaging>distribution-fragment</packaging> <build> <plugins> <plugin> <groupId>org.jvnet.maven-antrun-extended-plugin</groupId> <artifactId>maven-antrun-extended-plugin</artifactId> <executions> <execution> <phase>generate-sources</phase> <configuration> <tasks> <!-- Resolving jdbc-core, jdbc30 and jdbc40 artifacts --> <resolveArtifact artifactId="jdbc-core" groupId="org.glassfish.jdbc.jdbc-ra.jdbc-core" property="core.jar"/> <resolveArtifact artifactId="jdbc30" groupId="org.glassfish.jdbc.jdbc-ra.jdbc30" property="30.jar"/> <resolveArtifact artifactId="jdbc40" groupId="org.glassfish.jdbc.jdbc-ra.jdbc40" property="40.jar"/> <resolveArtifact artifactId="templates" groupId="org.glassfish.jdbc" property="templates.jar"/> <resolveArtifact artifactId="dbvendormapping" groupId="org.glassfish.jdbc" property="dbvendormapping.jar"/> <unjar src="${core.jar}" dest="target/classes"/> <unjar src="${30.jar}" dest="target/classes"/> <unjar src="${40.jar}" dest="target/classes"/> <unjar src="${templates.jar}" dest="target/classes/templates"/> <unjar src="${dbvendormapping.jar}" dest="target/classes/dbvendormapping"/> <!-- Creating jars/rars done using ant build.xml --> <property name="compile_classpath" refid="maven.compile.classpath"/> <property name="build.compiler" value="extJavac"/> <ant dir="." antfile="build.xml" target="all"/> <!-- TODO: Kohsuke to come back here and make sure mvn install puts a zip file, not .distribution-fragment --> <attachArtifact file="target/jdbc-ra.zip" /> </tasks> </configuration> <goals> <goal>run</goal> </goals> </execution> </executions> </plugin> </plugins> </build> <dependencies> <dependency> <groupId>org.glassfish.jdbc.jdbc-ra.jdbc-core</groupId> <artifactId>jdbc-core</artifactId> <version>${project.parent.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.glassfish.jdbc.jdbc-ra.jdbc40</groupId> <artifactId>jdbc40</artifactId> <version>${project.parent.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.glassfish.jdbc.jdbc-ra.jdbc30</groupId> <artifactId>jdbc30</artifactId> <version>${project.parent.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.glassfish.jdbc</groupId> <artifactId>templates</artifactId> <version>${project.parent.version}</version> <type>distribution-fragment</type> </dependency> <dependency> <groupId>org.glassfish.jdbc</groupId> <artifactId>dbvendormapping</artifactId> <version>${project.parent.version}</version> <type>distribution-fragment</type> </dependency> </dependencies> </project> <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <parent> <groupId>org.glassfish</groupId> <artifactId>glassfish-parent</artifactId> <version>3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.glassfish.jdbc</groupId> <artifactId>dbvendormapping</artifactId> <packaging>distribution-fragment</packaging> <name>JDBC DBVendor Mapping</name> <build> <plugins> <plugin> <groupId>org.jvnet.maven-antrun-extended-plugin</groupId> <artifactId>maven-antrun-extended-plugin</artifactId> <executions> <execution> <phase>compile</phase> <configuration> <tasks> <jar file="target/dbvendormapping.jar"> <fileset dir="src/main/resources" /> </jar> <attachArtifact file="target/dbvendormapping.jar" type="jar" classifier="resources" /> </tasks> </configuration> <goals> <goal>run</goal> </goals> </execution> </executions> </plugin> </plugins> <extensions> <extension> <groupId>org.glassfish.build</groupId> <artifactId>maven-glassfishbuild-extension</artifactId> <version>${project.version}</version> </extension> </extensions> </build> </project> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@... For additional commands, e-mail: dev-help@... |
| Free embeddable forum powered by Nabble | Forum Help |