You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/03/13 11:26:37 UTC
[isis-app-helloworld] branch jpa updated (8659792 -> fb43814)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch jpa
in repository https://gitbox.apache.org/repos/asf/isis-app-helloworld.git.
from 8659792 Merge branch 'jdo' into jpa
new 252c9a5 converts to spaces
add aaeb09c makes docker build same as simpleapp; delete tests
new aac3921 Merge branch 'jdo' into jpa
add dfa2117 updates to jdk11
new fb43814 Merge branch 'jdo' into jpa
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 319 ++++++++++-----------
.../hello/dom/hwo/HelloWorldObject_Test.java | 71 -----
.../hello/dom/hwo/HelloWorldObjects_Test.java | 78 -----
3 files changed, 153 insertions(+), 315 deletions(-)
delete mode 100644 src/test/java/domainapp/modules/hello/dom/hwo/HelloWorldObject_Test.java
delete mode 100644 src/test/java/domainapp/modules/hello/dom/hwo/HelloWorldObjects_Test.java
[isis-app-helloworld] 03/03: Merge branch 'jdo' into jpa
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa
in repository https://gitbox.apache.org/repos/asf/isis-app-helloworld.git
commit fb43814ee5f24b215fcb0e1d331aa74945dd4ae4
Merge: aac3921 dfa2117
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Mar 13 11:26:11 2021 +0000
Merge branch 'jdo' into jpa
pom.xml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
[isis-app-helloworld] 02/03: Merge branch 'jdo' into jpa
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa
in repository https://gitbox.apache.org/repos/asf/isis-app-helloworld.git
commit aac39215ebde131d2664b03da7cae60e39030cfd
Merge: 252c9a5 aaeb09c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Mar 13 11:18:21 2021 +0000
Merge branch 'jdo' into jpa
pom.xml | 33 +++------
.../hello/dom/hwo/HelloWorldObject_Test.java | 71 --------------------
.../hello/dom/hwo/HelloWorldObjects_Test.java | 78 ----------------------
3 files changed, 8 insertions(+), 174 deletions(-)
[isis-app-helloworld] 01/03: converts to spaces
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa
in repository https://gitbox.apache.org/repos/asf/isis-app-helloworld.git
commit 252c9a5189e10b735bec17dfa257bc474b907757
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Mar 13 11:13:31 2021 +0000
converts to spaces
---
pom.xml | 322 ++++++++++++++++++++++++++++++++--------------------------------
1 file changed, 161 insertions(+), 161 deletions(-)
diff --git a/pom.xml b/pom.xml
index f8bc74d..56ccad9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,171 +1,171 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.app</groupId>
- <artifactId>isis-app-starter-parent</artifactId>
- <version>2.0.0-M5</version>
- <relativePath/>
- </parent>
-
- <groupId>org.apache.isis.starters</groupId>
- <artifactId>helloworld-jpa</artifactId>
- <version>1.0.0-SNAPSHOT</version>
-
- <name>HelloWorld (JPA)</name>
-
- <packaging>jar</packaging>
-
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <!-- running: mvn spring-boot:run -->
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-webapp</artifactId>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-jpa</artifactId>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-jdk11</artifactId>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-actuator-autoconfigure</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-h2console-ui</artifactId>
- </dependency>
-
-
- <!-- TEST DEPENDENCIES -->
- <dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-unittests</artifactId>
- <scope>test</scope>
- <type>pom</type>
- </dependency>
-
- </dependencies>
-
- <profiles>
- <profile>
- <id>docker</id>
- <activation>
- <property>
- <name>docker</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>com.google.cloud.tools</groupId>
- <artifactId>jib-maven-plugin</artifactId>
- <configuration>
- <from>
- <image>openjdk:8-alpine</image>
- </from>
- <container>
- <jvmFlags>
- <jvmFlag>-Xmx512m</jvmFlag>
- </jvmFlags>
- <mainClass>domainapp.webapp.HelloWorldApp</mainClass>
- <ports>
- <port>8080</port>
- </ports>
- <workingDirectory>/run/secrets</workingDirectory>
- </container>
- <to>
- <image>docker.io/apacheisis/helloworld:latest</image>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.app</groupId>
+ <artifactId>isis-app-starter-parent</artifactId>
+ <version>2.0.0-M5</version>
+ <relativePath/>
+ </parent>
+
+ <groupId>org.apache.isis.starters</groupId>
+ <artifactId>helloworld-jpa</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+
+ <name>HelloWorld (JPA)</name>
+
+ <packaging>jar</packaging>
+
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <plugins>
+ <!-- running: mvn spring-boot:run -->
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-webapp</artifactId>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-jpa</artifactId>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-jdk11</artifactId>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-actuator-autoconfigure</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-h2console-ui</artifactId>
+ </dependency>
+
+
+ <!-- TEST DEPENDENCIES -->
+ <dependency>
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-unittests</artifactId>
+ <scope>test</scope>
+ <type>pom</type>
+ </dependency>
+
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>docker</id>
+ <activation>
+ <property>
+ <name>docker</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.google.cloud.tools</groupId>
+ <artifactId>jib-maven-plugin</artifactId>
+ <configuration>
+ <from>
+ <image>openjdk:8-alpine</image>
+ </from>
+ <container>
+ <jvmFlags>
+ <jvmFlag>-Xmx512m</jvmFlag>
+ </jvmFlags>
+ <mainClass>domainapp.webapp.HelloWorldApp</mainClass>
+ <ports>
+ <port>8080</port>
+ </ports>
+ <workingDirectory>/run/secrets</workingDirectory>
+ </container>
+ <to>
+ <image>docker.io/apacheisis/helloworld:latest</image>
<!--
will use default credentials, eg in ~/.docker/config.json.
Uncomment to override.
- <auth>
- <username>${env.DOCKER_REGISTRY_USERNAME}</username>
- <password>${env.DOCKER_REGISTRY_PASSWORD}</password>
- </auth>
+ <auth>
+ <username>${env.DOCKER_REGISTRY_USERNAME}</username>
+ <password>${env.DOCKER_REGISTRY_PASSWORD}</password>
+ </auth>
-->
- </to>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>staging</id>
- <activation>
- <property>
- <name>!skip.staging</name>
- </property>
- </activation>
- <repositories>
- <repository>
- <id>staging</id>
- <url>https://repository.apache.org/content/groups/staging/</url>
- </repository>
- </repositories>
- </profile>
- <profile>
- <id>nightly</id>
- <activation>
- <property>
- <name>!skip.nightly</name>
- </property>
- </activation>
- <repositories>
- <repository>
- <id>nightly-builds</id>
- <url>https://nexus.incode.work/repository/nightly-builds/</url>
- </repository>
- </repositories>
- </profile>
- </profiles>
+ </to>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>staging</id>
+ <activation>
+ <property>
+ <name>!skip.staging</name>
+ </property>
+ </activation>
+ <repositories>
+ <repository>
+ <id>staging</id>
+ <url>https://repository.apache.org/content/groups/staging/</url>
+ </repository>
+ </repositories>
+ </profile>
+ <profile>
+ <id>nightly</id>
+ <activation>
+ <property>
+ <name>!skip.nightly</name>
+ </property>
+ </activation>
+ <repositories>
+ <repository>
+ <id>nightly-builds</id>
+ <url>https://nexus.incode.work/repository/nightly-builds/</url>
+ </repository>
+ </repositories>
+ </profile>
+ </profiles>
</project>