|
From: Rob M. <man...@us...> - 2009-09-26 17:53:02
|
Update of /cvsroot/squirrel-sql/mavenize In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25781 Modified Files: plugin-pom.xml plugin-module-pom.xml installer-pom.xml template-pom.xml doc-pom.xml root-pom.xml website-pom.xml app-pom.xml mavenize.pl fw-pom.xml Log Message: maven plugins need versions (best practice for portable builds). Added scm connection information which is claimed to be needed by the maven release plugin for tagging. Also, added javadoc plugin activation by profile. Updated the template pom. Index: template-pom.xml =================================================================== RCS file: /cvsroot/squirrel-sql/mavenize/template-pom.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** template-pom.xml 20 Sep 2009 00:11:42 -0000 1.1 --- template-pom.xml 26 Sep 2009 17:52:49 -0000 1.2 *************** *** 1,24 **** ! <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"> ! <modelVersion>4.0.0</modelVersion> ! ! <groupId>template</groupId> ! <artifactId>template</artifactId> ! <version>template</version> ! <packaging>jar</packaging> ! ! <name>template</name> ! <description>template</description> ! <url></url> ! <licenses> ! <license> ! <name></name> ! <url></url> ! <distribution>repo</distribution> ! </license> ! </licenses> ! <scm> ! <url>template</url> ! </scm> ! ! </project> \ No newline at end of file --- 1,98 ---- ! <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"> ! <modelVersion>4.0.0</modelVersion> ! ! <parent> ! <groupId>net.sf.squirrel-sql</groupId> ! <artifactId>squirrel-root-pom</artifactId> ! <version>3.1.0-SNAPSHOT</version> ! </parent> ! ! <groupId>net.sf.squirrel-sql</groupId> ! <artifactId>template</artifactId> ! <version>3.1.0-SNAPSHOT</version> ! <packaging>jar</packaging> ! ! <name>Project Name</name> ! <description> ! Project description is normally documented here. ! ! This template should be used for creating new POMs for SQuirreL-SQL. It contains static ! content that should be included in every POM that is intended to be deployed to maven central. Not ! including this information can potentially cause delays in getting artifacts deployed to maven ! central. When/If additional information becomes available and/or required in the future, please ! update this template so that other yet-to-be-created projects may benefit. ! </description> ! <inceptionYear>2001</inceptionYear> ! <developers> ! <developer> ! <name>Gerd Wagner</name> ! <roles> ! <role>Administrator</role> ! <role>Developer</role> ! </roles> ! </developer> ! <developer> ! <name>Rob Manning</name> ! <roles> ! <role>Release Manager</role> ! <role>Developer</role> ! </roles> ! </developer> ! </developers> ! <licenses> ! <license> ! <name>GNU Lesser General Public License</name> ! <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url> ! <distribution>repo</distribution> ! </license> ! </licenses> ! <url>http://www.squirrelsql.org/</url> ! <scm> ! <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> ! <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> ! <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> ! </scm> ! <issueManagement> ! <system>SourceForge Tracker</system> ! <url>http://sourceforge.net/tracker/?group_id=28383%26atid=393414</url> ! </issueManagement> ! <ciManagement> ! <system>Hudson</system> ! <url>https://www.squirrel-sql.org/hudson/</url> ! </ciManagement> ! ! <build> ! <!-- Configure maven build plugins here --> ! </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 Index: plugin-module-pom.xml =================================================================== RCS file: /cvsroot/squirrel-sql/mavenize/plugin-module-pom.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** plugin-module-pom.xml 19 Sep 2009 13:02:53 -0000 1.4 --- plugin-module-pom.xml 26 Sep 2009 17:52:49 -0000 1.5 *************** *** 9,13 **** <name>Plugin Modules POM file</name> ! <description>This POM lists all of the plugin modules</description> <inceptionYear>2001</inceptionYear> <developers> --- 9,20 ---- <name>Plugin Modules POM file</name> ! <description> ! This POM lists all of the plugin modules. It is important to take the following ! steps when adding a new plugin: ! 1. This pom's modules section gets a new module whose name matches the directory in which the new ! plugin is installed. ! 2. The new module has a pom which lists the squirrelsql-plugins-parent-pom as it's ! parent (not this pom!). ! </description> <inceptionYear>2001</inceptionYear> <developers> *************** *** 37,42 **** <url>http://www.squirrelsql.org/</url> <scm> ! <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins</url> ! </scm> <issueManagement> <system>SourceForge Tracker</system> --- 44,51 ---- <url>http://www.squirrelsql.org/</url> <scm> ! <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> ! <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> ! <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> ! </scm> <issueManagement> <system>SourceForge Tracker</system> *************** *** 48,52 **** </ciManagement> - <modules> {$modules} --- 57,60 ---- Index: installer-pom.xml =================================================================== RCS file: /cvsroot/squirrel-sql/mavenize/installer-pom.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** installer-pom.xml 20 Sep 2009 00:10:10 -0000 1.6 --- installer-pom.xml 26 Sep 2009 17:52:49 -0000 1.7 *************** *** 5,10 **** <groupId>net.sf.squirrel-sql</groupId> <artifactId>installer</artifactId> - <packaging>pom</packaging> <version>3.1.0-SNAPSHOT</version> <name>Installer Module Pom</name> --- 5,10 ---- <groupId>net.sf.squirrel-sql</groupId> <artifactId>installer</artifactId> <version>3.1.0-SNAPSHOT</version> + <packaging>pom</packaging> <name>Installer Module Pom</name> *************** *** 39,43 **** <url>http://www.squirrelsql.org/</url> <scm> ! <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer</url> </scm> <issueManagement> --- 39,45 ---- <url>http://www.squirrelsql.org/</url> <scm> ! <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> ! <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> ! <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> </scm> <issueManagement> Index: root-pom.xml =================================================================== RCS file: /cvsroot/squirrel-sql/mavenize/root-pom.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** root-pom.xml 25 Sep 2009 21:04:17 -0000 1.7 --- root-pom.xml 26 Sep 2009 17:52:49 -0000 1.8 *************** *** 10,15 **** <name>SQuirreL Root POM</name> <description> ! The top-most POM file for building SQuirreL. If a profile is defined that is called "installer", ! the build will also include building projects that produce the installer and the installer itself. </description> <inceptionYear>2001</inceptionYear> --- 10,16 ---- <name>SQuirreL Root POM</name> <description> ! The top-most POM file for building the SQuirreL SQL Client. If a profile is defined that is called ! "installer", the build will also include building projects that produce the installer and the ! installer itself. </description> <inceptionYear>2001</inceptionYear> *************** *** 39,42 **** --- 40,45 ---- <url>http://www.squirrelsql.org/</url> <scm> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> </scm> *************** *** 57,65 **** <dependency-plugin-version>2.0</dependency-plugin-version> <findbugs-plugin-version>2.1</findbugs-plugin-version> <javac-source-version>1.6</javac-source-version> <javac-target-version>1.6</javac-target-version> <jar-plugin-version>2.2</jar-plugin-version> <pmd-plugin-version>2.4</pmd-plugin-version> ! <source-plugin-version>2.0.4</source-plugin-version> <surefire-plugin-version>2.4</surefire-plugin-version> <!-- Thirdparty Library Versions --> --- 60,70 ---- <dependency-plugin-version>2.0</dependency-plugin-version> <findbugs-plugin-version>2.1</findbugs-plugin-version> + <gpg-plugin-version>1.0-alpha-4</gpg-plugin-version> <javac-source-version>1.6</javac-source-version> <javac-target-version>1.6</javac-target-version> <jar-plugin-version>2.2</jar-plugin-version> + <javadoc-plugin-version>2.6</javadoc-plugin-version> <pmd-plugin-version>2.4</pmd-plugin-version> ! <source-plugin-version>2.1</source-plugin-version> <surefire-plugin-version>2.4</surefire-plugin-version> <!-- Thirdparty Library Versions --> *************** *** 76,79 **** --- 81,89 ---- <profiles> + <!-- + There are a few additional projects that are needed to build the installer. These are + probably not needed for developing plugins, so the default is to build them only when the + installer profile is activated. + --> <profile> <id>installer</id> *************** *** 90,94 **** </profile> </profiles> - </project> --- 100,146 ---- </profile> </profiles> + <distributionManagement> + <repository> + <id>sonatype-squirrel-sql-releases</id> + <name>SQuirreL-SQL Release Repository</name> + <url>http://oss.sonatype.org/content/groups/sourceforge-with-staging/</url> + </repository> + <snapshotRepository> + <id>sonatype-squirrel-sql-snapshots</id> + <name>SQuirreL-SQL Snapshot Repository</name> + <url>http://oss.sonatype.org/content/repositories/sourceforge-snapshots/</url> + </snapshotRepository> + </distributionManagement> + + <!-- Releases can always be pulled directly from Maven central after they have been vetted + and promoted to the release repo from the staging repo at sonatype. This means that + the "releases" attribute of each repo below should have enabled == false. However, + snapshots will never be deployed to maven central - so, this section helps in case + someone wants to develop against our snapshots. This tells maven that it can find + snapshot versions at sonatype and where exactly to look for them. --> + <repositories> + <repository> + <id>sonatype-squirrel-sql-snapshots</id> + <url>http://oss.sonatype.org/content/repositories/sourceforge-snapshots/</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>sonatype-squirrel-sql-maven-plugin-snapshots</id> + <url>http://oss.sonatype.org/content/repositories/sourceforge-snapshots/</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> </project> Index: mavenize.pl =================================================================== RCS file: /cvsroot/squirrel-sql/mavenize/mavenize.pl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** mavenize.pl 19 Sep 2009 20:44:29 -0000 1.10 --- mavenize.pl 26 Sep 2009 17:52:49 -0000 1.11 *************** *** 34,37 **** --- 34,39 ---- $websiteDir = $topDir . "/web-site"; + $onlyCopyPoms = 1; + $cache_deps = <<"EOF"; <dependencies> *************** *** 139,149 **** # copy in the root pom - this pom builds all of SQuirreL ! `cp root-pom.xml $topDir/pom.xml`; ! `svn add $topDir/pom.xml`; ! # copy in the test utilities project - I nix'd this since there were dependency issues ! # with BaseSQuirreLJUnit4TestCase depending on fw's LoggerController. It proved to be ! # too difficult to move BaseSQuirreLJUnit4TestCase out of the fw module. ! #`cp -r squirrelsql-test-utils $topDir`; # copy in plugins support projects --- 141,148 ---- # copy in the root pom - this pom builds all of SQuirreL ! copyRootPom(); ! # copy in test dependencies pom ! copyTestUtilsProject(); # copy in plugins support projects *************** *** 204,211 **** $pluginDescription = $pluginName; - print "Creating new pom: $newPomFile \n" - . "\t artifactId=$artifactId \n" - . "\t name=$pluginName \n" - . "\t description=$pluginDescription\n"; if ( $artifactId =~ 'cache' ) { --- 203,206 ---- *************** *** 216,220 **** } elsif ( $artifactId =~ 'isqlj' ) { ! $dependencies = $isqlj_deps; } elsif ( $artifactId =~ 'laf' ) { --- 211,223 ---- } elsif ( $artifactId =~ 'isqlj' ) { ! #$dependencies = $isqlj_deps; ! # ! # Since this plugin isn't complete and has dependencies on software of ! # unknown origin, we decided to skip including this in maven. Also, ! # we plan to remove it from the repo after our move to SVN. ! ! pop @artifacts; ! ! return; } elsif ( $artifactId =~ 'laf' ) { *************** *** 237,240 **** --- 240,248 ---- } + print "Creating new pom: $newPomFile \n" + . "\t artifactId=$artifactId \n" + . "\t name=$pluginName \n" + . "\t description=$pluginDescription\n"; + open( POMFILE, "> $newPomFile" ); my %vars = ( *************** *** 249,253 **** close(POMFILE); ! `svn add $newPomFile`; } --- 257,261 ---- close(POMFILE); ! !$onlyCopyPoms && `svn add $newPomFile`; } *************** *** 256,262 **** chdir('./src') or die "Couldn't change to src directory in $File::Find::dir : $!\n"; ! print "Removing main directory in $File::Find::dir\n"; ! `rm -rf main`; ! `rm -rf test`; # Java source files into src/main/java --- 264,273 ---- chdir('./src') or die "Couldn't change to src directory in $File::Find::dir : $!\n"; ! ! if (!$onlyCopyPoms) { ! print "Removing main directory in $File::Find::dir\n"; ! `rm -rf main`; ! `rm -rf test`; ! } # Java source files into src/main/java *************** *** 348,352 **** sub wanted_for_testsources { ! if ( $_ !~ /\.java$/ ) { return; } --- 359,363 ---- sub wanted_for_testsources { ! if ( $onlyCopyPoms || $_ !~ /\.java$/ ) { return; } *************** *** 458,474 **** } sub copyPluginsSupportProjects { print "Copying in plugins support projects\n"; ! #`rm -rf squirrelsql-swingsetthemes/squirrelsql-swingsetthemes`; ! #`cp -r squirrelsql-swingsetthemes $pluginsDir`; ! #`rm -rf $pluginsDir/squirrelsql-swingsetthemes`; ! ! `rm -rf $pluginsDir/squirrelsql-plugins-assembly-descriptor`; `cp -r $mavenizeDir/squirrelsql-plugins-assembly-descriptor $pluginsDir`; ! `rm -rf $pluginsDir/squirrelsql-plugins-parent-pom`; `cp -r $mavenizeDir/squirrelsql-plugins-parent-pom $pluginsDir`; chdir($pluginsDir) or die "Couldn't change directory to $pluginsDir: $!\n"; `svn add squirrelsql-plugins-assembly-descriptor`; --- 469,504 ---- } + sub copyRootPom { + print "Copying in root pom\n"; + `cp root-pom.xml $topDir/pom.xml`; + return if $onlyCopyPoms; + `svn add $topDir/pom.xml`; + } + + sub copyTestUtilsProject { + print "Copying in test dependencies pom\n"; + + if ($onlyCopyPoms) { + `cp $mavenizeDir/squirrelsql-test-utils/pom.xml $topDir/squirrelsql-test-utils/pom.xml`; + return; + } + + `rm -rf $topDir/squirrelsql-test-utils`; + svnmkdir("$topDir/squirrelsql-test-utils"); + `cp $mavenizeDir/squirrelsql-test-utils/pom.xml $topDir/squirrelsql-test-utils/pom.xml`; + `svn add $topDir/squirrelsql-test-utils/pom.xml`; + } + sub copyPluginsSupportProjects { print "Copying in plugins support projects\n"; ! !$onlyCopyPoms && `rm -rf $pluginsDir/squirrelsql-plugins-assembly-descriptor`; `cp -r $mavenizeDir/squirrelsql-plugins-assembly-descriptor $pluginsDir`; ! !$onlyCopyPoms && `rm -rf $pluginsDir/squirrelsql-plugins-parent-pom`; `cp -r $mavenizeDir/squirrelsql-plugins-parent-pom $pluginsDir`; + return if $onlyCopyPoms; + chdir($pluginsDir) or die "Couldn't change directory to $pluginsDir: $!\n"; `svn add squirrelsql-plugins-assembly-descriptor`; *************** *** 481,497 **** print "Restructuring fw module\n"; ! # remove effects of previous run ! `rm -rf $fwDir/src/main`; ! `rm -rf $fwDir/src/test`; ! # create maven directories ! svnmkdir("$fwDir/src/main"); ! svnmkdir("$fwDir/src/test/resources"); ! svnmkdir("$fwDir/src/test/java"); `cp $mavenizeDir/fw-pom.xml $fwDir/pom.xml`; ! `svn add $fwDir/pom.xml`; `cp $mavenizeDir/test-log4j.properties $fwDir/src/test/resources/log4j.properties`; ! `svn add $fwDir/src/test/resources/log4j.properties`; chdir("$fwDir/src") or die "Couldn't change directory to $fwDir/src: $!\n"; --- 511,531 ---- print "Restructuring fw module\n"; ! if ( !$onlyCopyPoms ) { ! # remove effects of previous run ! `rm -rf $fwDir/src/main`; ! `rm -rf $fwDir/src/test`; + # create maven directories + svnmkdir("$fwDir/src/main"); + svnmkdir("$fwDir/src/test/resources"); + svnmkdir("$fwDir/src/test/java"); + } `cp $mavenizeDir/fw-pom.xml $fwDir/pom.xml`; ! !$onlyCopyPoms && `svn add $fwDir/pom.xml`; `cp $mavenizeDir/test-log4j.properties $fwDir/src/test/resources/log4j.properties`; ! !$onlyCopyPoms && `svn add $fwDir/src/test/resources/log4j.properties`; ! ! return if $onlyCopyPoms; chdir("$fwDir/src") or die "Couldn't change directory to $fwDir/src: $!\n"; *************** *** 515,523 **** print "Restructuring app module\n"; ! # remove effects of previous run ! `rm -rf $appDir/src/main`; ! `rm -rf $appDir/src/test`; ! `cp app-pom.xml $appDir/pom.xml`; `svn add $appDir/pom.xml`; svnmkdir("$appDir/src/main/java"); --- 549,562 ---- print "Restructuring app module\n"; ! if ( !$onlyCopyPoms ) { ! # remove effects of previous run ! `rm -rf $appDir/src/main`; ! `rm -rf $appDir/src/test`; ! } ! `cp app-pom.xml $appDir/pom.xml`; + + return if $onlyCopyPoms; + `svn add $appDir/pom.xml`; svnmkdir("$appDir/src/main/java"); *************** *** 546,570 **** sub findAndCopyJava { print "Copying source files from src/... to /src/main/java...\n"; ! `find . -name *.java -printf "%h\n" | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | uniq | sort | xargs -ti svn mkdir --parents ./main/java/{}`; `svn add --quiet main`; `find main -type d | grep -v .svn | sort | xargs -ti svn add --quiet {}`; ! `find . -type f -name *.java -print | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | uniq | sort | xargs -ti svn move {} ./main/java/{}`; } sub findAndCopyResources { my $fileType = shift; ! `find . -name $fileType -printf "%h\n" | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | uniq | xargs -ti svn mkdir --parents main/resources/{}`; `svn add --quiet main`; `find main -type d | grep -v .svn | sort | xargs -ti svn add --quiet {}`; ! `find . -type f -name $fileType -print | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | uniq | xargs -ti svn move {} main/resources/{}`; } sub findAndCopyDoc { my $baseDir = shift; ! print "findAndCopyDoc: moving documentation files from $baseDir/doc/... to $baseDir/src/main/resources/doc...\n"; chdir("$baseDir/doc") or die "findAndCopyDoc: Couldn't chdir to $baseDir: $!\n"; ! `find . -type f -printf "%h\n" | grep -v "^./main/" | grep -v ".svn" | uniq | sort | xargs -ti svn mkdir --parents $baseDir/src/main/resources/doc/{}`; ! `find . -type f -print | grep -v "^./main/" | grep -v ".svn" | uniq | sort | xargs -ti svn move {} $baseDir/src/main/resources/doc/{}`; } --- 585,614 ---- sub findAndCopyJava { + return if $onlyCopyPoms; print "Copying source files from src/... to /src/main/java...\n"; ! `find . -name *.java -printf "%h\n" | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | uniq | sort | xargs -ti svn mkdir --parents ./main/java/{}`; `svn add --quiet main`; `find main -type d | grep -v .svn | sort | xargs -ti svn add --quiet {}`; ! `find . -type f -name *.java -print | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | uniq | sort | xargs -ti svn move {} ./main/java/{}`; } sub findAndCopyResources { + return if $onlyCopyPoms; my $fileType = shift; ! `find . -name $fileType -printf "%h\n" | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | uniq | xargs -ti svn mkdir --parents main/resources/{}`; `svn add --quiet main`; `find main -type d | grep -v .svn | sort | xargs -ti svn add --quiet {}`; ! `find . -type f -name $fileType -print | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | uniq | xargs -ti svn move {} main/resources/{}`; } sub findAndCopyDoc { + return if $onlyCopyPoms; + my $baseDir = shift; ! print ! "findAndCopyDoc: moving documentation files from $baseDir/doc/... to $baseDir/src/main/resources/doc...\n"; chdir("$baseDir/doc") or die "findAndCopyDoc: Couldn't chdir to $baseDir: $!\n"; ! `find . -type f -printf "%h\n" | grep -v "^./main/" | grep -v ".svn" | uniq | sort | xargs -ti svn mkdir --parents $baseDir/src/main/resources/doc/{}`; ! `find . -type f -print | grep -v "^./main/" | grep -v ".svn" | uniq | sort | xargs -ti svn move {} $baseDir/src/main/resources/doc/{}`; } *************** *** 574,579 **** print "Copying in installer projects\n"; ! `rm -rf $installerDir`; ! `mkdir -p $installerDir`; `cp -r $mavenizeDir/squirrelsql-java-version-checker $installerDir`; `cp -r $mavenizeDir/squirrelsql-launcher $installerDir`; --- 618,627 ---- print "Copying in installer projects\n"; ! ! if (!$onlyCopyPoms) { ! `rm -rf $installerDir`; ! `mkdir -p $installerDir`; ! } ! `cp -r $mavenizeDir/squirrelsql-java-version-checker $installerDir`; `cp -r $mavenizeDir/squirrelsql-launcher $installerDir`; *************** *** 581,584 **** --- 629,634 ---- `cp $mavenizeDir/installer-pom.xml $installerDir/pom.xml`; + return if $onlyCopyPoms; + chdir($topDir); `svn add installer`; *************** *** 592,598 **** print "Copying in translations project\n"; ! `rm -rf $topDir/squirrelsql-translations`; ! `svn mkdir --parents $topDir/squirrelsql-translations/src/main/resources`; `cp $mavenizeDir/squirrelsql-translations/pom.xml $topDir/squirrelsql-translations`; `svn add $topDir/squirrelsql-translations/pom.xml`; --- 642,653 ---- print "Copying in translations project\n"; ! ! !$onlyCopyPoms && `rm -rf $topDir/squirrelsql-translations`; ! !$onlyCopyPoms && `svn mkdir --parents $topDir/squirrelsql-translations/src/main/resources`; ! `cp $mavenizeDir/squirrelsql-translations/pom.xml $topDir/squirrelsql-translations`; + + return if $onlyCopyPoms; + `svn add $topDir/squirrelsql-translations/pom.xml`; *************** *** 612,616 **** --- 667,675 ---- print "Restructuring doc module\n"; + `cp $mavenizeDir/doc-pom.xml $docDir/pom.xml`; + + return if $onlyCopyPoms; + `rm -rf $docDir/src`; `mkdir -p $docDir/src/main/resources`; *************** *** 634,638 **** --- 693,701 ---- print "Restructuring web-site module\n"; + `cp $mavenizeDir/website-pom.xml $websiteDir/pom.xml`; + + return if $onlyCopyPoms; + `svn add $websiteDir/pom.xml`; `rm -rf $websiteDir/src/main`; *************** *** 673,677 **** close(MODULEPOMFILE); ! `svn add $modulespomfile`; } --- 736,740 ---- close(MODULEPOMFILE); ! !$onlyCopyPoms && `svn add $modulespomfile`; } *************** *** 680,686 **** my $lafPluginAssemblyFile = "$mavenizeDir/laf-plugin/laf-plugin-assembly.xml"; my $targetFolder = "$lafPluginDir/src/main/resources/assemblies"; print "Installing L&F Plugin Assembly ($lafPluginAssemblyFile) in $targetFolder\n"; ! `svn mkdir --parents $targetFolder`; `cp $lafPluginAssemblyFile $targetFolder`; `svn add $lafPluginDir/src`; `svn add $lafPluginDir/pom.xml`; --- 743,754 ---- my $lafPluginAssemblyFile = "$mavenizeDir/laf-plugin/laf-plugin-assembly.xml"; my $targetFolder = "$lafPluginDir/src/main/resources/assemblies"; + print "Installing L&F Plugin Assembly ($lafPluginAssemblyFile) in $targetFolder\n"; ! ! !$onlyCopyPoms && `svn mkdir --parents $targetFolder`; `cp $lafPluginAssemblyFile $targetFolder`; + + return if $onlyCopyPoms; + `svn add $lafPluginDir/src`; `svn add $lafPluginDir/pom.xml`; Index: doc-pom.xml =================================================================== RCS file: /cvsroot/squirrel-sql/mavenize/doc-pom.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** doc-pom.xml 25 Sep 2009 21:06:54 -0000 1.7 --- doc-pom.xml 26 Sep 2009 17:52:49 -0000 1.8 *************** *** 44,49 **** <url>http://www.squirrelsql.org/</url> <scm> ! <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> ! </scm> <issueManagement> <system>SourceForge Tracker</system> --- 44,51 ---- <url>http://www.squirrelsql.org/</url> <scm> ! <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> ! <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> ! <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> ! </scm> <issueManagement> <system>SourceForge Tracker</system> *************** *** 74,77 **** --- 76,106 ---- </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 Index: plugin-pom.xml =================================================================== RCS file: /cvsroot/squirrel-sql/mavenize/plugin-pom.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** plugin-pom.xml 25 Sep 2009 21:04:52 -0000 1.6 --- plugin-pom.xml 26 Sep 2009 17:52:49 -0000 1.7 *************** *** 42,50 **** <url>http://www.squirrelsql.org/</url> <scm> ! <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/@@--$pluginName--@@</url> ! </scm> <issueManagement> ! <system>SourceForge Tracker</system> ! <url>http://sourceforge.net/tracker/?group_id=28383%26atid=393414</url> </issueManagement> <ciManagement> --- 42,52 ---- <url>http://www.squirrelsql.org/</url> <scm> ! <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> ! <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> ! <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> ! </scm> <issueManagement> ! <system>SourceForge Tracker</system> ! <url>http://sourceforge.net/tracker/?group_id=28383%26atid=393414</url> </issueManagement> <ciManagement> *************** *** 89,92 **** --- 91,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> *************** *** 96,99 **** --- 102,106 ---- <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> + <version>${gpg-plugin-version}</version> <executions> <execution> *************** *** 109,112 **** --- 116,134 ---- </build> </profile> + <!-- + Since generating javadoc can be time-consuming, this is not done unless a "javadoc" profile + is activated. + --> + <profile> + <id>javadoc</id> + <build> + <plugins> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadoc-plugin-version}</version> + </plugin> + </plugins> + </build> + </profile> </profiles> Index: fw-pom.xml =================================================================== RCS file: /cvsroot/squirrel-sql/mavenize/fw-pom.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** fw-pom.xml 19 Sep 2009 13:02:53 -0000 1.6 --- fw-pom.xml 26 Sep 2009 17:52:49 -0000 1.7 *************** *** 48,51 **** --- 48,53 ---- <url>http://www.squirrelsql.org/</url> <scm> + <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> + <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> </scm> *************** *** 113,122 **** <groupId>org.hibernate</groupId> <artifactId>hibernate-annotations</artifactId> ! <version>3.3.0.ga</version> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-commons-annotations</artifactId> ! <version>3.3.0.ga</version> </dependency> <dependency> --- 115,124 ---- <groupId>org.hibernate</groupId> <artifactId>hibernate-annotations</artifactId> ! <version>${hibernate-annotations-version}</version> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-commons-annotations</artifactId> ! <version>${hibernate-annotations-version}</version> </dependency> <dependency> *************** *** 173,192 **** <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> ! <version>2.5.2</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> ! <version>2.5.2</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context-support</artifactId> ! <version>2.5.2</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> ! <version>2.5.2</version> </dependency> <dependency> --- 175,194 ---- <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> ! <version>${spring-framework-version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> ! <version>${spring-framework-version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context-support</artifactId> ! <version>${spring-framework-version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> ! <version>${spring-framework-version}</version> </dependency> <dependency> *************** *** 196,220 **** </dependency> <dependency> ! <groupId>junit</groupId> ! <artifactId>junit</artifactId> ! <version>4.6</version> ! <scope>test</scope> ! </dependency> ! <dependency> ! <groupId>org.easymock</groupId> ! <artifactId>easymock</artifactId> ! <version>2.4</version> ! <scope>test</scope> ! </dependency> ! <dependency> ! <groupId>org.easymock</groupId> ! <artifactId>easymockclassextension</artifactId> ! <version>2.4</version> ! <scope>test</scope> ! </dependency> ! <dependency> ! <groupId>gsbase</groupId> ! <artifactId>gsbase</artifactId> ! <version>2.0.1</version> <scope>test</scope> </dependency> --- 198,205 ---- </dependency> <dependency> ! <groupId>${project.groupId}</groupId> ! <artifactId>squirrelsql-test-utils</artifactId> ! <version>${project.version}</version> ! <type>pom</type> <scope>test</scope> </dependency> *************** *** 227,232 **** <configuration> <!-- http://maven.apache.org/plugins/maven-compiler-plugin/ --> ! <source>1.6</source> ! <target>1.6</target> </configuration> </plugin> --- 212,217 ---- <configuration> <!-- http://maven.apache.org/plugins/maven-compiler-plugin/ --> ! <source>${javac-source-version}</source> ! <target>${javac-target-version}</target> </configuration> </plugin> *************** *** 234,237 **** --- 219,223 ---- <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <version>${surefire-plugin-version}</version> <configuration> <redirectTestOutputToFile>true</redirectTestOutputToFile> *************** *** 241,245 **** <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> ! <version>2.2</version> <executions> <execution> --- 227,231 ---- <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> ! <version>${jar-plugin-version}</version> <executions> <execution> *************** *** 250,256 **** --- 236,260 ---- </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>${source-plugin-version}</version> + <executions> + <execution> + <id>attach-sources</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> </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> *************** *** 260,263 **** --- 264,268 ---- <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> + <version>${gpg-plugin-version}</version> <executions> <execution> *************** *** 273,277 **** </build> </profile> ! </profiles> --- 278,306 ---- </build> </profile> ! <!-- ! Since generating javadoc can be time-consuming, this is not done unless a "javadoc" profile is ! activated. ! --> ! <profile> ! <id>javadoc</id> ! <build> ! <plugins> ! <plugin> ! <groupId>org.apache.maven.plugins</groupId> ! <artifactId>maven-javadoc-plugin</artifactId> ! <version>${javadoc-plugin-version}</version> ! <executions> ! <execution> ! <id>attach-javadocs</id> ! <phase>package</phase> ! <goals> ! <goal>jar</goal> ! </goals> ! </execution> ! </executions> ! </plugin> ! </plugins> ! </build> ! </profile> </profiles> Index: website-pom.xml =================================================================== RCS file: /cvsroot/squirrel-sql/mavenize/website-pom.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** website-pom.xml 25 Sep 2009 21:03:00 -0000 1.6 --- website-pom.xml 26 Sep 2009 17:52:49 -0000 1.7 *************** *** 42,47 **** <url>http://www.squirrelsql.org/</url> <scm> ! <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/web-site/</url> ! </scm> <issueManagement> <system>SourceForge Tracker</system> --- 42,49 ---- <url>http://www.squirrelsql.org/</url> <scm> ! <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> ! <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> ! <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> ! </scm> <issueManagement> <system>SourceForge Tracker</system> *************** *** 75,78 **** --- 77,107 ---- </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> Index: app-pom.xml =================================================================== RCS file: /cvsroot/squirrel-sql/mavenize/app-pom.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** app-pom.xml 25 Sep 2009 21:06:31 -0000 1.10 --- app-pom.xml 26 Sep 2009 17:52:49 -0000 1.11 *************** *** 13,17 **** <version>3.1.0-SNAPSHOT</version> <packaging>jar</packaging> ! <name>SQuirreL Main Application Jar</name> <description> --- 13,17 ---- <version>3.1.0-SNAPSHOT</version> <packaging>jar</packaging> ! <name>SQuirreL Main Application Jar</name> <description> *************** *** 44,52 **** <url>http://www.squirrelsql.org/</url> <scm> ! <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> ! </scm> <issueManagement> ! <system>SourceForge Tracker</system> ! <url>http://sourceforge.net/tracker/?group_id=28383%26atid=393414</url> </issueManagement> <ciManagement> --- 44,54 ---- <url>http://www.squirrelsql.org/</url> <scm> ! <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection> ! <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection> ! <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url> ! </scm> <issueManagement> ! <system>SourceForge Tracker</system> ! <url>http://sourceforge.net/tracker/?group_id=28383%26atid=393414</url> </issueManagement> <ciManagement> *************** *** 118,124 **** --- 120,144 ---- </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>${source-plugin-version}</version> + <executions> + <execution> + <id>attach-sources</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> </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> *************** *** 128,131 **** --- 148,152 ---- <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> + <version>${gpg-plugin-version}</version> <executions> <execution> *************** *** 141,145 **** --- 162,192 ---- </build> </profile> + <!-- + Since generating javadoc can be time-consuming, this is not done unless a "javadoc" profile is + activated. + --> + <profile> + <id>javadoc</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadoc-plugin-version}</version> + <executions> + <execution> + <id>attach-javadocs</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> + </project> |
