db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r1499833 - in /db/jdo/branches/3.1-rc1: assembly.xml copyjdorijars/pom.xml exectck/pom.xml parent-pom/pom.xml pom.xml tck/pom.xml
Date Thu, 04 Jul 2013 18:15:48 GMT
Author: mcaisse
Date: Thu Jul  4 18:15:47 2013
New Revision: 1499833

URL: http://svn.apache.org/r1499833
Log:
JDO-723 Update release process for 3.1. This is an interim commit of Michael's patch and some
additional changes to poms. So far so good.

Added:
    db/jdo/branches/3.1-rc1/assembly.xml
Modified:
    db/jdo/branches/3.1-rc1/copyjdorijars/pom.xml
    db/jdo/branches/3.1-rc1/exectck/pom.xml
    db/jdo/branches/3.1-rc1/parent-pom/pom.xml
    db/jdo/branches/3.1-rc1/pom.xml
    db/jdo/branches/3.1-rc1/tck/pom.xml

Added: db/jdo/branches/3.1-rc1/assembly.xml
URL: http://svn.apache.org/viewvc/db/jdo/branches/3.1-rc1/assembly.xml?rev=1499833&view=auto
==============================================================================
--- db/jdo/branches/3.1-rc1/assembly.xml (added)
+++ db/jdo/branches/3.1-rc1/assembly.xml Thu Jul  4 18:15:47 2013
@@ -0,0 +1,342 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+    <id>src</id>
+    <formats>
+      <format>zip</format>
+      <format>tar.gz</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <moduleSets>
+      <moduleSet>
+	<includes>
+	  <include>javax.jdo:parent-pom</include>
+	</includes>
+	<sources>
+	  <includeModuleDirectory>false</includeModuleDirectory>
+	  <fileSets>
+	    <fileSet>
+	      <outputDirectory>parent-pom</outputDirectory>
+	      <includes>
+		<include>pom.xml</include>
+	      </includes>
+	    </fileSet>
+	  </fileSets>
+	</sources>
+      </moduleSet>
+      <moduleSet>
+	<includes>
+	  <include>javax.jdo:jdo-api</include>
+	</includes>
+	<sources>
+	  <includeModuleDirectory>false</includeModuleDirectory>
+	  <fileSets>
+	    <fileSet>
+	      <outputDirectory>api</outputDirectory>
+	      <includes>
+		<include>src/**</include>
+		<include>test/**</include>
+		<include>pom.xml</include>
+	      </includes>
+	    </fileSet>
+	  </fileSets>
+	</sources>
+      </moduleSet>
+      <moduleSet>
+	<includes>
+	  <include>org.apache.jdo:jdo-exectck</include>
+	</includes>
+	<sources>
+	  <includeModuleDirectory>false</includeModuleDirectory>
+	  <fileSets>
+	    <fileSet>
+	      <outputDirectory>exectck</outputDirectory>
+	      <includes>
+		<include>src/**</include>
+		<include>pom.xml</include>
+	      </includes>
+	    </fileSet>
+	  </fileSets>
+	</sources>
+      </moduleSet>
+      <moduleSet>
+	<includes>
+	  <include>org.apache.jdo:copy-jdori-jars</include>
+	</includes>
+	<sources>
+	  <includeModuleDirectory>false</includeModuleDirectory>
+	  <fileSets>
+	    <fileSet>
+	      <outputDirectory>copyjdorijars</outputDirectory>
+	      <includes>
+		<include>src/**</include>
+		<include>pom.xml</include>
+	      </includes>
+	    </fileSet>
+	  </fileSets>
+	</sources>
+      </moduleSet>
+      <moduleSet>
+	<includes>
+	  <include>org.apache.jdo:jdo-tck</include>
+	</includes>
+	<sources>
+	  <includeModuleDirectory>false</includeModuleDirectory>
+	  <fileSets>
+	    <fileSet>
+	      <outputDirectory>tck</outputDirectory>
+	      <includes>
+		<include>src/**</include>
+		<include>pom.xml</include>
+		<include>RunRules.html</include>
+	      </includes>
+	    </fileSet>
+	  </fileSets>
+	</sources>
+      </moduleSet>
+    </moduleSets>
+    <fileSets>
+      <fileSet>
+	<outputDirectory>.</outputDirectory>
+	<includes>
+	  <include>LICENSE.txt</include>
+	  <include>NOTICE.txt</include>
+	  <include>README.html</include>
+	  <include>assembly.xml</include>
+	  <include>pom.xml</include>
+	  <include>lib/**</include>
+	</includes>
+      </fileSet>
+    </fileSets>
+
+</assembly>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+    <id>src</id>
+    <formats>
+      <format>zip</format>
+      <format>tar.gz</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <moduleSets>
+      <moduleSet>
+	<includes>
+	  <include>javax.jdo:parent-pom</include>
+	</includes>
+	<sources>
+	  <includeModuleDirectory>false</includeModuleDirectory>
+	  <fileSets>
+	    <fileSet>
+	      <outputDirectory>parent-pom</outputDirectory>
+	      <includes>
+		<include>pom.xml</include>
+	      </includes>
+	    </fileSet>
+	  </fileSets>
+	</sources>
+      </moduleSet>
+      <moduleSet>
+	<includes>
+	  <include>javax.jdo:jdo-api</include>
+	</includes>
+	<sources>
+	  <includeModuleDirectory>false</includeModuleDirectory>
+	  <fileSets>
+	    <fileSet>
+	      <outputDirectory>api</outputDirectory>
+	      <includes>
+		<include>src/**</include>
+		<include>test/**</include>
+		<include>pom.xml</include>
+	      </includes>
+	    </fileSet>
+	  </fileSets>
+	</sources>
+      </moduleSet>
+      <moduleSet>
+	<includes>
+	  <include>org.apache.jdo:jdo-exectck</include>
+	</includes>
+	<sources>
+	  <includeModuleDirectory>false</includeModuleDirectory>
+	  <fileSets>
+	    <fileSet>
+	      <outputDirectory>exectck</outputDirectory>
+	      <includes>
+		<include>src/**</include>
+		<include>pom.xml</include>
+	      </includes>
+	    </fileSet>
+	  </fileSets>
+	</sources>
+      </moduleSet>
+      <moduleSet>
+	<includes>
+	  <include>org.apache.jdo:copy-jdori-jars</include>
+	</includes>
+	<sources>
+	  <includeModuleDirectory>false</includeModuleDirectory>
+	  <fileSets>
+	    <fileSet>
+	      <outputDirectory>copyjdorijars</outputDirectory>
+	      <includes>
+		<include>src/**</include>
+		<include>pom.xml</include>
+	      </includes>
+	    </fileSet>
+	  </fileSets>
+	</sources>
+      </moduleSet>
+      <moduleSet>
+	<includes>
+	  <include>org.apache.jdo:jdo-tck</include>
+	</includes>
+	<sources>
+	  <includeModuleDirectory>false</includeModuleDirectory>
+	  <fileSets>
+	    <fileSet>
+	      <outputDirectory>tck</outputDirectory>
+	      <includes>
+		<include>src/**</include>
+		<include>pom.xml</include>
+		<include>RunRules.html</include>
+	      </includes>
+	    </fileSet>
+	  </fileSets>
+	</sources>
+      </moduleSet>
+    </moduleSets>
+    <fileSets>
+      <fileSet>
+	<outputDirectory>.</outputDirectory>
+	<includes>
+	  <include>LICENSE.txt</include>
+	  <include>NOTICE.txt</include>
+	  <include>README.html</include>
+	  <include>assembly.xml</include>
+	  <include>pom.xml</include>
+	  <include>lib/**</include>
+	</includes>
+      </fileSet>
+    </fileSets>
+
+</assembly>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+    <id>src</id>
+    <formats>
+      <format>zip</format>
+      <format>tar.gz</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <moduleSets>
+      <moduleSet>
+	<includes>
+	  <include>javax.jdo:parent-pom</include>
+	</includes>
+	<sources>
+	  <includeModuleDirectory>false</includeModuleDirectory>
+	  <fileSets>
+	    <fileSet>
+	      <outputDirectory>parent-pom</outputDirectory>
+	      <includes>
+		<include>pom.xml</include>
+	      </includes>
+	    </fileSet>
+	  </fileSets>
+	</sources>
+      </moduleSet>
+      <moduleSet>
+	<includes>
+	  <include>javax.jdo:jdo-api</include>
+	</includes>
+	<sources>
+	  <includeModuleDirectory>false</includeModuleDirectory>
+	  <fileSets>
+	    <fileSet>
+	      <outputDirectory>api</outputDirectory>
+	      <includes>
+		<include>src/**</include>
+		<include>test/**</include>
+		<include>pom.xml</include>
+	      </includes>
+	    </fileSet>
+	  </fileSets>
+	</sources>
+      </moduleSet>
+      <moduleSet>
+	<includes>
+	  <include>org.apache.jdo:jdo-exectck</include>
+	</includes>
+	<sources>
+	  <includeModuleDirectory>false</includeModuleDirectory>
+	  <fileSets>
+	    <fileSet>
+	      <outputDirectory>exectck</outputDirectory>
+	      <includes>
+		<include>src/**</include>
+		<include>pom.xml</include>
+	      </includes>
+	    </fileSet>
+	  </fileSets>
+	</sources>
+      </moduleSet>
+      <moduleSet>
+	<includes>
+	  <include>org.apache.jdo:copy-jdori-jars</include>
+	</includes>
+	<sources>
+	  <includeModuleDirectory>false</includeModuleDirectory>
+	  <fileSets>
+	    <fileSet>
+	      <outputDirectory>copyjdorijars</outputDirectory>
+	      <includes>
+		<include>src/**</include>
+		<include>pom.xml</include>
+	      </includes>
+	    </fileSet>
+	  </fileSets>
+	</sources>
+      </moduleSet>
+      <moduleSet>
+	<includes>
+	  <include>org.apache.jdo:jdo-tck</include>
+	</includes>
+	<sources>
+	  <includeModuleDirectory>false</includeModuleDirectory>
+	  <fileSets>
+	    <fileSet>
+	      <outputDirectory>tck</outputDirectory>
+	      <includes>
+		<include>src/**</include>
+		<include>pom.xml</include>
+		<include>RunRules.html</include>
+	      </includes>
+	    </fileSet>
+	  </fileSets>
+	</sources>
+      </moduleSet>
+    </moduleSets>
+    <fileSets>
+      <fileSet>
+	<outputDirectory>.</outputDirectory>
+	<includes>
+	  <include>LICENSE.txt</include>
+	  <include>NOTICE.txt</include>
+	  <include>README.html</include>
+	  <include>assembly.xml</include>
+	  <include>pom.xml</include>
+	  <include>lib/**</include>
+	</includes>
+      </fileSet>
+    </fileSets>
+
+</assembly>

Modified: db/jdo/branches/3.1-rc1/copyjdorijars/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/branches/3.1-rc1/copyjdorijars/pom.xml?rev=1499833&r1=1499832&r2=1499833&view=diff
==============================================================================
--- db/jdo/branches/3.1-rc1/copyjdorijars/pom.xml (original)
+++ db/jdo/branches/3.1-rc1/copyjdorijars/pom.xml Thu Jul  4 18:15:47 2013
@@ -26,12 +26,14 @@
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.jdo</groupId>
   <artifactId>copy-jdori-jars</artifactId>
   <name>JDO RI Jar Copy</name>
   <version>3.1</version>
   <description>The Java Data Objects (JDO) API is a standard interface-based Java model
abstraction of persistence, developed as Java Specification Request 243 under the auspices
of the Java Community Process.</description>
   
   <build>
+    <sourceDirectory>src/main</sourceDirectory>
     <resources>
       <resource>
 	<directory>${basedir}/src/main/resources</directory>
@@ -53,15 +55,6 @@
             </fileset>
           </filesets>
         </configuration>
-        <executions>
-          <execution>
-            <id>clean-target-directory</id>
-            <phase>initialize</phase>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -79,6 +72,14 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.6</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   
@@ -86,22 +87,22 @@
     <dependency>
       <groupId>org.datanucleus</groupId>
       <artifactId>datanucleus-core</artifactId>
-      <version>3.2.4</version>
+      <version>3.2.5</version>
     </dependency>
     <dependency>
       <groupId>org.datanucleus</groupId>
       <artifactId>datanucleus-rdbms</artifactId>
-      <version>3.2.3</version>
+      <version>3.2.4</version>
     </dependency>
     <dependency>
       <groupId>org.datanucleus</groupId>
       <artifactId>datanucleus-api-jdo</artifactId>
-      <version>3.2.3</version>
+      <version>3.2.4</version>
     </dependency>
     <dependency>
       <groupId>org.datanucleus</groupId>
       <artifactId>datanucleus-api-jpa</artifactId>
-      <version>3.2.3</version>
+      <version>3.2.4</version>
     </dependency>
     <dependency>
       <groupId>c3p0</groupId>

Modified: db/jdo/branches/3.1-rc1/exectck/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/branches/3.1-rc1/exectck/pom.xml?rev=1499833&r1=1499832&r2=1499833&view=diff
==============================================================================
--- db/jdo/branches/3.1-rc1/exectck/pom.xml (original)
+++ db/jdo/branches/3.1-rc1/exectck/pom.xml Thu Jul  4 18:15:47 2013
@@ -26,6 +26,14 @@
                     <target>1.6</target>
                 </configuration>
             </plugin>
+	    <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-deploy-plugin</artifactId>
+              <version>2.6</version>
+              <configuration>
+                <skip>true</skip>
+              </configuration>
+            </plugin>
         </plugins>
     </build>
     <profiles>

Modified: db/jdo/branches/3.1-rc1/parent-pom/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/branches/3.1-rc1/parent-pom/pom.xml?rev=1499833&r1=1499832&r2=1499833&view=diff
==============================================================================
--- db/jdo/branches/3.1-rc1/parent-pom/pom.xml (original)
+++ db/jdo/branches/3.1-rc1/parent-pom/pom.xml Thu Jul  4 18:15:47 2013
@@ -238,6 +238,14 @@ Requests (JSR 12 and 243) under the ausp
           <headerLocation>${basedir}/../LICENSE.txt</headerLocation>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.6</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+       </plugin>
     </plugins>
   </reporting>
 </project>

Modified: db/jdo/branches/3.1-rc1/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/branches/3.1-rc1/pom.xml?rev=1499833&r1=1499832&r2=1499833&view=diff
==============================================================================
--- db/jdo/branches/3.1-rc1/pom.xml (original)
+++ db/jdo/branches/3.1-rc1/pom.xml Thu Jul  4 18:15:47 2013
@@ -4,7 +4,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>javax.jdo</groupId>
-  <artifactId>root</artifactId>
+  <artifactId>jdo</artifactId>
   <packaging>pom</packaging>
   <version>3.1</version>
   <name>JDO Root POM</name>
@@ -17,4 +17,49 @@
     <module>tck</module>
   </modules>
 
+  <profiles>
+    <profile>
+      <id>apache-release</id>
+          <modules>
+            <module>api</module>
+            <module>parent-pom</module>
+          </modules>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <version>2.4</version>
+            <configuration>
+              <appendAssemblyId>true</appendAssemblyId>
+              <descriptors>
+                <descriptor>assembly.xml</descriptor>
+              </descriptors>
+            </configuration>
+            <executions>
+              <execution>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+	  <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+	    <artifactId>maven-gpg-plugin</artifactId>
+	    <version>1.1</version>
+	    <executions>
+	       <execution>
+		  <configuration>
+		    <file>${file}.jar</file>
+		    <keyname>${gpg.keyname}</keyname>
+		  </configuration>
+	      </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>

Modified: db/jdo/branches/3.1-rc1/tck/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/branches/3.1-rc1/tck/pom.xml?rev=1499833&r1=1499832&r2=1499833&view=diff
==============================================================================
--- db/jdo/branches/3.1-rc1/tck/pom.xml (original)
+++ db/jdo/branches/3.1-rc1/tck/pom.xml Thu Jul  4 18:15:47 2013
@@ -80,6 +80,14 @@
                     <windowtitle>${project.name} ${pom.currentVersion}</windowtitle>
                 </configuration>
             </plugin>
+	    <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-deploy-plugin</artifactId>
+              <version>2.6</version>
+              <configuration>
+                <skip>true</skip>
+              </configuration>
+            </plugin>
         </plugins>
     </build>
     <profiles>



Mime
View raw message