Author: tfischer
Date: Sat Sep 8 02:22:05 2012
New Revision: 1382221
URL: http://svn.apache.org/viewvc?rev=1382221&view=rev
Log:
- use apache-release as release profile
- remove src descriptors from subprojects (going for one single source
distribution)
Modified:
db/torque/torque4/trunk/torque-ant-tasks/pom.xml
db/torque/torque4/trunk/torque-generator/pom.xml
db/torque/torque4/trunk/torque-maven-parent/pom.xml
db/torque/torque4/trunk/torque-maven-plugin/pom.xml
db/torque/torque4/trunk/torque-runtime/pom.xml
db/torque/torque4/trunk/torque-templates/pom.xml
db/torque/torque4/trunk/torque-test/src/test/profile/postgresql/Torque.properties
Modified: db/torque/torque4/trunk/torque-ant-tasks/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-ant-tasks/pom.xml?rev=1382221&r1=1382220&r2=1382221&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-ant-tasks/pom.xml (original)
+++ db/torque/torque4/trunk/torque-ant-tasks/pom.xml Sat Sep 8 02:22:05 2012
@@ -70,29 +70,31 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
-
<descriptor>../torque-maven-parent/src/main/assembly/bin-with-dependencies.xml</descriptor>
- </descriptors>
- <descriptorRefs>
- <descriptorRef>src</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+
<descriptor>../torque-maven-parent/src/main/assembly/bin-with-dependencies.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
Modified: db/torque/torque4/trunk/torque-generator/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/pom.xml?rev=1382221&r1=1382220&r2=1382221&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/pom.xml (original)
+++ db/torque/torque4/trunk/torque-generator/pom.xml Sat Sep 8 02:22:05 2012
@@ -173,7 +173,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>apache-release</id>
<build>
<plugins>
<plugin>
@@ -182,9 +182,6 @@
<descriptors>
<descriptor>../torque-maven-parent/src/main/assembly/bin-with-dependencies.xml</descriptor>
</descriptors>
- <descriptorRefs>
- <descriptorRef>src</descriptorRef>
- </descriptorRefs>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
<executions>
Modified: db/torque/torque4/trunk/torque-maven-parent/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-maven-parent/pom.xml?rev=1382221&r1=1382220&r2=1382221&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-maven-parent/pom.xml (original)
+++ db/torque/torque4/trunk/torque-maven-parent/pom.xml Sat Sep 8 02:22:05 2012
@@ -494,25 +494,26 @@
<profiles>
<profile>
- <id>release</id>
+ <id>apache-release</id>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>src</descriptorRef>
+ </descriptorRefs>
+ </configuration>
<executions>
<execution>
- <id>sign-artifacts</id>
+ <id>make-assembly</id>
+ <phase>package</phase>
<goals>
- <goal>sign</goal>
+ <goal>single</goal>
</goals>
</execution>
</executions>
- <configuration>
- <passphrase>${gpg.passphrase}</passphrase>
- <useAgent>${gpg.useagent}</useAgent>
- </configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
</profile>
Modified: db/torque/torque4/trunk/torque-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-maven-plugin/pom.xml?rev=1382221&r1=1382220&r2=1382221&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-maven-plugin/pom.xml (original)
+++ db/torque/torque4/trunk/torque-maven-plugin/pom.xml Sat Sep 8 02:22:05 2012
@@ -99,30 +99,4 @@
</plugins>
</reporting>
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptorRefs>
- <descriptorRef>src</descriptorRef>
- </descriptorRefs>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
\ No newline at end of file
Modified: db/torque/torque4/trunk/torque-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/pom.xml?rev=1382221&r1=1382220&r2=1382221&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/pom.xml (original)
+++ db/torque/torque4/trunk/torque-runtime/pom.xml Sat Sep 8 02:22:05 2012
@@ -141,7 +141,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>apache-release</id>
<build>
<plugins>
<plugin>
@@ -150,9 +150,6 @@
<descriptors>
<descriptor>../torque-maven-parent/src/main/assembly/bin-with-dependencies.xml</descriptor>
</descriptors>
- <descriptorRefs>
- <descriptorRef>src</descriptorRef>
- </descriptorRefs>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
<executions>
Modified: db/torque/torque4/trunk/torque-templates/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/pom.xml?rev=1382221&r1=1382220&r2=1382221&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/pom.xml (original)
+++ db/torque/torque4/trunk/torque-templates/pom.xml Sat Sep 8 02:22:05 2012
@@ -102,7 +102,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>apache-release</id>
<build>
<plugins>
<plugin>
@@ -111,9 +111,6 @@
<descriptors>
<descriptor>../torque-maven-parent/src/main/assembly/bin-with-dependencies.xml</descriptor>
</descriptors>
- <descriptorRefs>
- <descriptorRef>src</descriptorRef>
- </descriptorRefs>
<appendAssemblyId>false</appendAssemblyId>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
Modified:
db/torque/torque4/trunk/torque-test/src/test/profile/postgresql/Torque.properties
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/profile/postgresql/Torque.properties?rev=1382221&r1=1382220&r2=1382221&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-test/src/test/profile/postgresql/Torque.properties
(original)
+++
db/torque/torque4/trunk/torque-test/src/test/profile/postgresql/Torque.properties
Sat Sep 8 02:22:05 2012
@@ -32,3 +32,6 @@ torque.dsfactory.bookstore.connection.us
torque.dsfactory.bookstore.connection.password = torque
torque.dsfactory.bookstore.pool.validationQuery = SELECT 1
+
+# use Caching. This property is only used if managers are used by generators.
+torque.manager.useCache = true
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
