You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/05/12 12:08:22 UTC
[isis] branch v1-lab updated: build fixes
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v1-lab
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v1-lab by this push:
new 4ee55dcdc0 build fixes
4ee55dcdc0 is described below
commit 4ee55dcdc0da7dae390989bc55d3ef63f2abd9ed
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu May 12 14:08:15 2022 +0200
build fixes
---
core/.m2/settings.xml | 35 ----------------------
.../applib/services/jdosupport/IsisJdoSupport.java | 23 +++++++-------
core/maven-plugin/pom.xml | 1 +
core/pom.xml | 26 +++++++++-------
.../java/domainapp/dom/impl/HelloWorldObjects.java | 5 ++--
5 files changed, 31 insertions(+), 59 deletions(-)
diff --git a/core/.m2/settings.xml b/core/.m2/settings.xml
deleted file mode 100644
index fb863cfd5c..0000000000
--- a/core/.m2/settings.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
- <servers>
- <server>
- <id>nexus-deploy.serverId</id>
- <username>${env.NEXUS_USERNAME}</username>
- <password>${env.NEXUS_PASSWORD}</password>
- </server>
- <server>
- <id>gcpappenginerepo-deploy.serverId</id>
- <username>${env.GCPAPPENGINEREPO_USERNAME}</username>
- <password>${env.GCPAPPENGINEREPO_PASSWORD}</password>
- </server>
- </servers>
-</settings>
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java b/core/applib/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java
index 8aaefe41bf..75a4e0f40b 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
+import javax.jdo.JDOQLTypedQuery;
import javax.jdo.PersistenceManager;
import javax.jdo.query.BooleanExpression;
@@ -120,15 +121,15 @@ public interface IsisJdoSupport {
@Programmatic
<T> T executeQueryUnique(final Class<T> cls, final BooleanExpression booleanExpression);
-// /**
-// * To support the execution of type-safe queries using DataNucleus' lower-level APIs
-// * (eg for group by and so on).
-// *
-// * <p>
-// * Responsibility for cloning any result sets and closing the query is the responsibility
-// * of the caller.
-// * </p>
-// */
-// @Programmatic
-// <T> TypesafeQuery<T> newTypesafeQuery(Class<T> cls);
+ /**
+ * To support the execution of type-safe queries using DataNucleus' lower-level APIs
+ * (eg for group by and so on).
+ *
+ * <p>
+ * Responsibility for cloning any result sets and closing the query is the responsibility
+ * of the caller.
+ * </p>
+ */
+ @Programmatic
+ <T> JDOQLTypedQuery<T> newTypesafeQuery(Class<T> cls);
}
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index f8214186ae..5fed548cd9 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -56,6 +56,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
+ <version>3.6.4</version>
<configuration>
<goalPrefix>configurator</goalPrefix>
</configuration>
diff --git a/core/pom.xml b/core/pom.xml
index 97add8990e..d8ab5be6c9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -32,10 +32,6 @@
LAB EDITION - NOT FOR RELEASE
Core framework, providing metamodel, runtime and core APIs.
-
- Also defines standard build process, as well as
- standard set of 3rd party dependencies (eg for testing and
- logging frameworks).
</description>
<properties>
@@ -214,6 +210,20 @@
</configuration>
<!-- goal:test binds to phase:test -->
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.2.0</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1215,11 +1225,6 @@
<!-- DataNucleus -->
-<!-- <dependency> -->
-<!-- <groupId>javax.jdo</groupId> -->
-<!-- <artifactId>jdo-api</artifactId> -->
-<!-- <version>${jdo-api.version}</version> -->
-<!-- </dependency> -->
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>javax.jdo</artifactId>
@@ -1340,8 +1345,7 @@
<module>viewer-wicket-impl</module>
<module>maven-plugin</module>
-
- <module>mavendeps/webapp</module>
+
<module>mavendeps/testing</module>
</modules>
diff --git a/examples/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java b/examples/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java
index 4e5824ab00..e73a86a67c 100644
--- a/examples/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java
+++ b/examples/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java
@@ -20,7 +20,8 @@ package domainapp.dom.impl;
import java.util.List;
-import org.datanucleus.query.typesafe.TypesafeQuery;
+import javax.jdo.JDOQLTypedQuery;
+import javax.persistence.TypedQuery;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
@@ -55,7 +56,7 @@ public class HelloWorldObjects {
@Parameter(maxLength = 40)
@ParameterLayout(named = "Name")
final String name) {
- TypesafeQuery<HelloWorldObject> q = isisJdoSupport.newTypesafeQuery(HelloWorldObject.class);
+ JDOQLTypedQuery<HelloWorldObject> q = isisJdoSupport.newTypesafeQuery(HelloWorldObject.class);
final QHelloWorldObject cand = QHelloWorldObject.candidate();
q = q.filter(
cand.name.indexOf(q.stringParameter("name")).ne(-1)