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/12 17:41:39 UTC
[isis] 01/12: ISIS-2999: removes subdomain/ognl
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit fefa0f1766606dfbdf278a124defbb02ffaaedf3
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Apr 11 18:44:29 2022 +0100
ISIS-2999: removes subdomain/ognl
---
.../workflows/ci-build-artifacts-push-maven.yml | 6 +---
antora/playbooks/site-subdomains.yml | 3 --
antora/playbooks/site.yml | 3 --
bom/pom.xml | 4 +++
subdomains/ognl/adoc/antora.yml | 19 -----------
subdomains/ognl/adoc/modules/ognl/nav.adoc | 4 ---
subdomains/ognl/adoc/modules/ognl/pages/about.adoc | 7 ----
.../adoc/modules/ognl/partials/module-nav.adoc | 6 ----
subdomains/ognl/applib/pom.xml | 39 ----------------------
.../applib/IsisModuleSubdomainsOgnlApplib.java | 26 ---------------
subdomains/ognl/pom.xml | 33 ------------------
subdomains/pom.xml | 6 ----
12 files changed, 5 insertions(+), 151 deletions(-)
diff --git a/.github/workflows/ci-build-artifacts-push-maven.yml b/.github/workflows/ci-build-artifacts-push-maven.yml
index 367e47e140..96e7b344dc 100644
--- a/.github/workflows/ci-build-artifacts-push-maven.yml
+++ b/.github/workflows/ci-build-artifacts-push-maven.yml
@@ -77,14 +77,10 @@ jobs:
- name: Build Artifacts (Github March 2022)
run: 'bash scripts/ci/build-artifacts.sh'
env:
- # -Dgithub ... build only the released modules and deploy to github pakages
- # -Denforcer.failFast=true ... fail fast on convergence issues (enforcer plugin)
- # -T 1C ... 1 build thread per core
+ # -Dgithub ... build only the released modules and deploy to github packages
MVN_ADDITIONAL_OPTS: >-
-f bom/pom.xml
-Dgithub
- -Denforcer.failFast=true
- -DinstallAtEnd=true -DdeployAtEnd=true
GITHUB_TOKEN: ${{ github.token }}
MVN_STAGES: deploy
SOURCE_MODE: attach
diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
index ff5097de6b..8d3374ef6e 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -58,9 +58,6 @@ content:
- url: .
start_path: subdomains/freemarker/adoc # subdomains
branches: HEAD
- - url: .
- start_path: subdomains/ognl/adoc # subdomains
- branches: HEAD
- url: .
start_path: subdomains/pdfbox/adoc # subdomains
branches: HEAD
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index c3835f9d96..8492e8609c 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -235,9 +235,6 @@ content:
- url: .
start_path: subdomains/freemarker/adoc # subdomains
branches: HEAD
- - url: .
- start_path: subdomains/ognl/adoc # subdomains
- branches: HEAD
- url: .
start_path: subdomains/pdfbox/adoc # subdomains
branches: HEAD
diff --git a/bom/pom.xml b/bom/pom.xml
index d3bc533a00..98cf432397 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -1093,6 +1093,10 @@ under the License.
<name>github</name>
</property>
</activation>
+ <properties>
+ <enforcer.failFast>true</enforcer.failFast>
+ <jacoco.skip>true</jacoco.skip>
+ </properties>
<modules>
<module>../core</module>
<module>../extensions</module>
diff --git a/subdomains/ognl/adoc/antora.yml b/subdomains/ognl/adoc/antora.yml
deleted file mode 100644
index 1044dbbd29..0000000000
--- a/subdomains/ognl/adoc/antora.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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.
-
-name: subdomains
-version: latest
diff --git a/subdomains/ognl/adoc/modules/ognl/nav.adoc b/subdomains/ognl/adoc/modules/ognl/nav.adoc
deleted file mode 100644
index dbad73b19b..0000000000
--- a/subdomains/ognl/adoc/modules/ognl/nav.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-
-:Notice: 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 ag [...]
-
-include::subdomains:ROOT:partial$component-nav.adoc[]
diff --git a/subdomains/ognl/adoc/modules/ognl/pages/about.adoc b/subdomains/ognl/adoc/modules/ognl/pages/about.adoc
deleted file mode 100644
index 4ea4fdd4d2..0000000000
--- a/subdomains/ognl/adoc/modules/ognl/pages/about.adoc
+++ /dev/null
@@ -1,7 +0,0 @@
-= OGNL Library
-
-:Notice: 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 ag [...]
-
-WARNING: TODO
-
-// was stringinterpolator
diff --git a/subdomains/ognl/adoc/modules/ognl/partials/module-nav.adoc b/subdomains/ognl/adoc/modules/ognl/partials/module-nav.adoc
deleted file mode 100644
index 72c49a9052..0000000000
--- a/subdomains/ognl/adoc/modules/ognl/partials/module-nav.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-* xref:subdomains:ognl:about.adoc[OGNL Library]
-
-
diff --git a/subdomains/ognl/applib/pom.xml b/subdomains/ognl/applib/pom.xml
deleted file mode 100644
index b6c5ebf85e..0000000000
--- a/subdomains/ognl/applib/pom.xml
+++ /dev/null
@@ -1,39 +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.subdomains</groupId>
- <artifactId>isis-subdomains</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <artifactId>isis-subdomains-ognl-applib</artifactId>
- <name>Apache Isis Sub - Ognl (applib)</name>
-
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.ognl.applib</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/ognl/applib</git-plugin.propertiesDir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/subdomains/ognl/applib/src/main/java/org/apache/isis/subdomains/ognl/applib/IsisModuleSubdomainsOgnlApplib.java b/subdomains/ognl/applib/src/main/java/org/apache/isis/subdomains/ognl/applib/IsisModuleSubdomainsOgnlApplib.java
deleted file mode 100644
index 90e3136316..0000000000
--- a/subdomains/ognl/applib/src/main/java/org/apache/isis/subdomains/ognl/applib/IsisModuleSubdomainsOgnlApplib.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-package org.apache.isis.subdomains.ognl.applib;
-
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class IsisModuleSubdomainsOgnlApplib {
-
-}
diff --git a/subdomains/ognl/pom.xml b/subdomains/ognl/pom.xml
deleted file mode 100644
index 3595942aad..0000000000
--- a/subdomains/ognl/pom.xml
+++ /dev/null
@@ -1,33 +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.subdomains</groupId>
- <artifactId>isis-subdomains</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>isis-subdomains-ognl</artifactId>
- <name>Apache Isis Sub - Ognl (parent)</name>
- <description>Integrates Ognl Library</description>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>applib</module>
- </modules>
-
-</project>
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index bfb43bf40a..0389448225 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -108,12 +108,6 @@
<version>2.0.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-ognl-applib</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
-
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
<artifactId>isis-subdomains-pdfbox-applib</artifactId>