|
From: Rob M. <man...@us...> - 2009-09-27 07:51:47
|
Update of /cvsroot/squirrel-sql/mavenize In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25099 Modified Files: plugin-pom.xml website-pom.xml app-pom.xml template-pom.xml root-pom.xml fw-pom.xml Log Message: Relocated profile for signing jars to the root pom so that it doesn't need to be specified in every descendant pom. Thanks to Mike Sell for pointing out that profiles can indeed be inherited by descendant poms. Index: template-pom.xml =================================================================== RCS file: /cvsroot/squirrel-sql/mavenize/template-pom.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** template-pom.xml 26 Sep 2009 17:52:49 -0000 1.2 --- template-pom.xml 27 Sep 2009 07:51:38 -0000 1.3 *************** *** 67,98 **** </build> - <profiles> - <!-- - Since signing jars is probably only useful for releasing, this is not done unless the "sign-jar" profile - is activated - --> - <profile> - <id>sign-jar</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <version>${gpg-plugin-version}</version> - <executions> - <execution> - <id>sign-artifacts</id> - <phase>verify</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - </project> \ No newline at end of file --- 67,69 ---- Index: root-pom.xml =================================================================== RCS file: /cvsroot/squirrel-sql/mavenize/root-pom.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** root-pom.xml 27 Sep 2009 07:03:00 -0000 1.9 --- root-pom.xml 27 Sep 2009 07:51:38 -0000 1.10 *************** *** 99,102 **** --- 99,127 ---- </modules> </profile> + <!-- + Since signing jars is probably only useful for releasing, this is not done unless the "sign-jar" profile + is activated + --> + <profile> + <id>sign-jar</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <version>${gpg-plugin-version}</version> + <executions> + <execution> + <id>sign-artifacts</id> + <phase>verify</phase> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> Index: plugin-pom.xml =================================================================== RCS file: /cvsroot/squirrel-sql/mavenize/plugin-pom.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** plugin-pom.xml 26 Sep 2009 17:52:49 -0000 1.7 --- plugin-pom.xml 27 Sep 2009 07:51:38 -0000 1.8 *************** *** 91,119 **** </build> <profiles> - <!-- - Since signing jars is probably only useful for releasing, this is not done unless the "sign-jar" profile - is activated - --> - <profile> - <id>sign-jar</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <version>${gpg-plugin-version}</version> - <executions> - <execution> - <id>sign-artifacts</id> - <phase>verify</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> <!-- Since generating javadoc can be time-consuming, this is not done unless a "javadoc" profile --- 91,94 ---- Index: fw-pom.xml =================================================================== RCS file: /cvsroot/squirrel-sql/mavenize/fw-pom.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** fw-pom.xml 26 Sep 2009 17:52:49 -0000 1.7 --- fw-pom.xml 27 Sep 2009 07:51:38 -0000 1.8 *************** *** 254,282 **** <profiles> <!-- - Since signing jars is probably only useful for releasing, this is not done unless the "sign-jar" profile - is activated - --> - <profile> - <id>sign-jar</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <version>${gpg-plugin-version}</version> - <executions> - <execution> - <id>sign-artifacts</id> - <phase>verify</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <!-- Since generating javadoc can be time-consuming, this is not done unless a "javadoc" profile is activated. --- 254,257 ---- Index: website-pom.xml =================================================================== RCS file: /cvsroot/squirrel-sql/mavenize/website-pom.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** website-pom.xml 26 Sep 2009 17:52:49 -0000 1.7 --- website-pom.xml 27 Sep 2009 07:51:38 -0000 1.8 *************** *** 77,108 **** </plugins> </build> - <profiles> - <!-- - Since signing jars is probably only useful for releasing, this is not done unless the "sign-jar" profile - is activated - --> - <profile> - <id>sign-jar</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <version>${gpg-plugin-version}</version> - <executions> - <execution> - <id>sign-artifacts</id> - <phase>verify</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - </project> \ No newline at end of file --- 77,80 ---- Index: app-pom.xml =================================================================== RCS file: /cvsroot/squirrel-sql/mavenize/app-pom.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** app-pom.xml 26 Sep 2009 17:52:49 -0000 1.11 --- app-pom.xml 27 Sep 2009 07:51:38 -0000 1.12 *************** *** 138,166 **** <profiles> <!-- - Since signing jars is probably only useful for releasing, this is not done unless the "sign-jar" profile - is activated - --> - <profile> - <id>sign-jar</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <version>${gpg-plugin-version}</version> - <executions> - <execution> - <id>sign-artifacts</id> - <phase>verify</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <!-- Since generating javadoc can be time-consuming, this is not done unless a "javadoc" profile is activated. --- 138,141 ---- |
