You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by an...@apache.org on 2015/04/27 10:16:36 UTC
svn commit: r1676214 - in /db/jdo/trunk: api/pom.xml copyjdorijars/pom.xml
exectck/pom.xml parent-pom/pom.xml pom.xml tck/pom.xml
Author: andyj
Date: Mon Apr 27 08:16:35 2015
New Revision: 1676214
URL: http://svn.apache.org/r1676214
Log:
JDO-738 Increaded JDK to 1.7 minimum. Removed compiler-plugin from downstream plugins so we can just change in parent-pom.
Modified:
db/jdo/trunk/api/pom.xml
db/jdo/trunk/copyjdorijars/pom.xml
db/jdo/trunk/exectck/pom.xml
db/jdo/trunk/parent-pom/pom.xml
db/jdo/trunk/pom.xml
db/jdo/trunk/tck/pom.xml
Modified: db/jdo/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/pom.xml?rev=1676214&r1=1676213&r2=1676214&view=diff
==============================================================================
--- db/jdo/trunk/api/pom.xml (original)
+++ db/jdo/trunk/api/pom.xml Mon Apr 27 08:16:35 2015
@@ -89,13 +89,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
<configuration>
<showWarnings>true</showWarnings>
<fork>true</fork>
<compilerArgument>-Xlint:unchecked</compilerArgument>
- <source>1.5</source>
- <target>1.5</target>
</configuration>
</plugin>
<!-- The next two plugins are required until such time as https://issues.apache.org/jira/browse/FELIX-3352 is fixed. -->
@@ -112,7 +109,7 @@
</goals>
<configuration>
<instructions>
- <Specification-Version>JDO 3.1</Specification-Version>
+ <Specification-Version>JDO 3.2</Specification-Version>
<!-- Keep the API project's symbolic name the same as that in 3.0.1 for backward compatibility reasons -->
<Bundle-SymbolicName>javax.jdo</Bundle-SymbolicName>
<Bundle-Localization>plugin</Bundle-Localization>
Modified: db/jdo/trunk/copyjdorijars/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/copyjdorijars/pom.xml?rev=1676214&r1=1676213&r2=1676214&view=diff
==============================================================================
--- db/jdo/trunk/copyjdorijars/pom.xml (original)
+++ db/jdo/trunk/copyjdorijars/pom.xml Mon Apr 27 08:16:35 2015
@@ -93,22 +93,22 @@
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-core</artifactId>
- <version>4.0.5</version>
+ <version>4.1.0-m4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-rdbms</artifactId>
- <version>4.0.8</version>
+ <version>4.1.0-m4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-api-jdo</artifactId>
- <version>4.0.5</version>
+ <version>4.1.0-m4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-api-jpa</artifactId>
- <version>4.0.6</version>
+ <version>4.1.0-m4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>c3p0</groupId>
Modified: db/jdo/trunk/exectck/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/exectck/pom.xml?rev=1676214&r1=1676213&r2=1676214&view=diff
==============================================================================
--- db/jdo/trunk/exectck/pom.xml (original)
+++ db/jdo/trunk/exectck/pom.xml Mon Apr 27 08:16:35 2015
@@ -40,23 +40,14 @@
<build>
<plugins>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.6</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <skip>true</skip>
</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>
@@ -109,22 +100,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
-<!-- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- </dependency>-->
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
Modified: db/jdo/trunk/parent-pom/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/parent-pom/pom.xml?rev=1676214&r1=1676213&r2=1676214&view=diff
==============================================================================
--- db/jdo/trunk/parent-pom/pom.xml (original)
+++ db/jdo/trunk/parent-pom/pom.xml Mon Apr 27 08:16:35 2015
@@ -222,8 +222,8 @@ Requests (JSR 12 and 243) under the ausp
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
<plugin>
Modified: db/jdo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/pom.xml?rev=1676214&r1=1676213&r2=1676214&view=diff
==============================================================================
--- db/jdo/trunk/pom.xml (original)
+++ db/jdo/trunk/pom.xml Mon Apr 27 08:16:35 2015
@@ -104,17 +104,17 @@
</execution>
</executions>
</plugin>
- <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>
+ <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>
Modified: db/jdo/trunk/tck/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/pom.xml?rev=1676214&r1=1676213&r2=1676214&view=diff
==============================================================================
--- db/jdo/trunk/tck/pom.xml (original)
+++ db/jdo/trunk/tck/pom.xml Mon Apr 27 08:16:35 2015
@@ -72,7 +72,7 @@
<plugin>
<groupId>org.apache.jdo</groupId>
<artifactId>jdo-exectck</artifactId>
- <version>3.1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
<executions>
<execution>
<phase>integration-test</phase>
@@ -86,13 +86,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
@@ -102,13 +95,13 @@
<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>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
</plugin>
</plugins>
</build>