db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tilma...@apache.org
Subject svn commit: r1826846 - in /db/jdo/trunk: api/pom.xml api/src/java/javax/jdo/Query.java copyjdorijars/pom.xml tck/pom.xml tck/src/testdata/org/apache/jdo/tck/pc/company/companyForSampleQueriesTest.xml
Date Thu, 15 Mar 2018 18:09:44 GMT
Author: tilmannz
Date: Thu Mar 15 18:09:44 2018
New Revision: 1826846

URL: http://svn.apache.org/viewvc?rev=1826846&view=rev
Log:
Reverting parts of previous commit

Modified:
    db/jdo/trunk/api/pom.xml
    db/jdo/trunk/api/src/java/javax/jdo/Query.java
    db/jdo/trunk/copyjdorijars/pom.xml
    db/jdo/trunk/tck/pom.xml
    db/jdo/trunk/tck/src/testdata/org/apache/jdo/tck/pc/company/companyForSampleQueriesTest.xml

Modified: db/jdo/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/pom.xml?rev=1826846&r1=1826845&r2=1826846&view=diff
==============================================================================
--- db/jdo/trunk/api/pom.xml (original)
+++ db/jdo/trunk/api/pom.xml Thu Mar 15 18:09:44 2018
@@ -143,7 +143,6 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-<skipTests>true</skipTests>
           <excludes>
             <exclude>javax/jdo/util/AbstractTest.java</exclude>
             <exclude>javax/jdo/pc/*.java</exclude>

Modified: db/jdo/trunk/api/src/java/javax/jdo/Query.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/src/java/javax/jdo/Query.java?rev=1826846&r1=1826845&r2=1826846&view=diff
==============================================================================
--- db/jdo/trunk/api/src/java/javax/jdo/Query.java (original)
+++ db/jdo/trunk/api/src/java/javax/jdo/Query.java Thu Mar 15 18:09:44 2018
@@ -1035,7 +1035,7 @@ public interface Query<T> extends AutoCl
      * <P>Calling this method with no result being specified will result in JDOUserException
being thrown.
      * @return The list of query results
      */
-    <R> List<R> executeResultList();
+    List<Object> executeResultList();
 
     /**
      * Method to execute the query where there is a single row and we have a result defined
but no result class.

Modified: db/jdo/trunk/copyjdorijars/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/copyjdorijars/pom.xml?rev=1826846&r1=1826845&r2=1826846&view=diff
==============================================================================
--- db/jdo/trunk/copyjdorijars/pom.xml (original)
+++ db/jdo/trunk/copyjdorijars/pom.xml Thu Mar 15 18:09:44 2018
@@ -93,22 +93,22 @@
     <dependency>
       <groupId>org.datanucleus</groupId>
       <artifactId>datanucleus-core</artifactId>
-      <version>5.1.2</version>
+      <version>5.1.0-release</version>
     </dependency>
     <dependency>
       <groupId>org.datanucleus</groupId>
       <artifactId>datanucleus-rdbms</artifactId>
-      <version>5.1.2</version>
+      <version>5.1.0-release</version>
     </dependency>
     <dependency>
       <groupId>org.datanucleus</groupId>
       <artifactId>datanucleus-api-jdo</artifactId>
-      <version>5.1.2</version>
+      <version>5.1.0-release</version>
     </dependency>
     <dependency>
       <groupId>org.datanucleus</groupId>
       <artifactId>datanucleus-api-jpa</artifactId>
-      <version>5.1.2</version>
+      <version>5.1.0-release</version>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>

Modified: db/jdo/trunk/tck/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/pom.xml?rev=1826846&r1=1826845&r2=1826846&view=diff
==============================================================================
--- db/jdo/trunk/tck/pom.xml (original)
+++ db/jdo/trunk/tck/pom.xml Thu Mar 15 18:09:44 2018
@@ -80,7 +80,7 @@
                             <goal>help</goal>
                             <goal>installSchema</goal>
                             <goal>enhance</goal>
-<!--                              <goal>runtck</goal> -->
+                            <goal>runtck</goal>
                         </goals>
                     </execution>
                 </executions>

Modified: db/jdo/trunk/tck/src/testdata/org/apache/jdo/tck/pc/company/companyForSampleQueriesTest.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/testdata/org/apache/jdo/tck/pc/company/companyForSampleQueriesTest.xml?rev=1826846&r1=1826845&r2=1826846&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/testdata/org/apache/jdo/tck/pc/company/companyForSampleQueriesTest.xml
(original)
+++ db/jdo/trunk/tck/src/testdata/org/apache/jdo/tck/pc/company/companyForSampleQueriesTest.xml
Thu Mar 15 18:09:44 2018
@@ -264,7 +264,7 @@
     <bean id="emp5" factory-bean="companyFactory" factory-method="newFullTimeEmployee">
         <constructor-arg index="0" type="long"><value>5</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>Tillmann</value></constructor-arg>
-        <constructor-arg index="2" type="java.lang.String"><value>Zäschke</value></constructor-arg>
+        <constructor-arg index="2" type="java.lang.String"><value>Zäschke</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value></value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>5/Jul/1979</value></constructor-arg>
         <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref
local="addr3"/></constructor-arg>



Mime
View raw message