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 2022/04/14 14:45:06 UTC
[isis] branch ISIS-3001 updated: ISIS-3001: more tidy up
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-3001
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-3001 by this push:
new b45888c25c ISIS-3001: more tidy up
b45888c25c is described below
commit b45888c25c05b4f15f2097f50357ff85888e5061
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Apr 14 15:44:54 2022 +0100
ISIS-3001: more tidy up
---
extensions/applib/excel/integtests/pom.xml | 12 ++
subdomains/pom.xml | 198 -----------------------------
2 files changed, 12 insertions(+), 198 deletions(-)
diff --git a/extensions/applib/excel/integtests/pom.xml b/extensions/applib/excel/integtests/pom.xml
index 1499963bdb..27ad752ee1 100644
--- a/extensions/applib/excel/integtests/pom.xml
+++ b/extensions/applib/excel/integtests/pom.xml
@@ -69,6 +69,18 @@ under the License.
</testResources>
</build>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing</artifactId>
+ <scope>import</scope>
+ <type>pom</type>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
deleted file mode 100644
index 5553f21a24..0000000000
--- a/subdomains/pom.xml
+++ /dev/null
@@ -1,198 +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. -->
-<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.core</groupId>
- <artifactId>isis-core</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../core/pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains</artifactId>
-
- <name>Apache Isis Subdomains</name>
- <description>
- A library of domain services and of supporting subdomains (often technical in nature), to be called from the
- core domain of an Apache Isis applications.
- </description>
-
- <packaging>pom</packaging>
-
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains</git-plugin.propertiesDir>
- </properties>
-
- <build>
- <resources>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>**</include>
- </includes>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
-
- <dependencyManagement>
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-extensions-excel-applib</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-extensions-excel-testing</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-extensions-excel-fixtures</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-extensions-excel-integtests</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
-
-
-
- <!-- 3rd party dependencies -->
-
- <dependency>
- <groupId>org.docx4j</groupId>
- <artifactId>docx4j-JAXB-ReferenceImpl</artifactId>
- <version>${docx4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.docx4j</groupId>
- <artifactId>docx4j-JAXB-Internal</artifactId>
- <version>${docx4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.docx4j</groupId>
- <artifactId>docx4j-JAXB-MOXy</artifactId>
- <version>${docx4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.docx4j</groupId>
- <artifactId>docx4j-export-fo</artifactId>
- <version>${docx4j.version}</version>
- </dependency>
-
- <!-- testing -->
- <dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
- <modules>
- <module>excel</module>
- </modules>
-
- <profiles>
- <profile>
- <id>isis-app-starter-datanucleusenhance</id>
- <activation>
- <file>
- <exists>${basedir}/logging-dn-enhance.properties</exists>
- </file>
- </activation>
- <properties>
- <datanucleus-maven-plugin.log4jConfiguration>${basedir}/logging-dn-enhance.properties</datanucleus-maven-plugin.log4jConfiguration>
- <datanucleus-maven-plugin.verbose>true</datanucleus-maven-plugin.verbose>
- <datanucleus-maven-plugin.fork>false</datanucleus-maven-plugin.fork>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-maven-plugin</artifactId>
- <version>${datanucleus-maven-plugin.version}</version>
- <configuration>
- <fork>${datanucleus-maven-plugin.fork}</fork>
- <log4jConfiguration>${datanucleus-maven-plugin.log4jConfiguration}</log4jConfiguration>
- <verbose>${datanucleus-maven-plugin.verbose}</verbose>
- </configuration>
- <executions>
- <execution>
- <id>process-classes</id>
- <phase>process-classes</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- <execution>
- <id>process-test-classes</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>test-enhance</goal>
- </goals>
- <configuration>
- <metadataDirectory>${project.build.testOutputDirectory}</metadataDirectory>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-core</artifactId>
- <version>${datanucleus-core.version}</version>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-api-jdo</artifactId>
- <version>${datanucleus-api-jdo.version}</version>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-jodatime</artifactId>
- <version>${datanucleus-jodatime.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- </profiles>
-</project>
-
-