Skip to content

RM#60909 Nexus version of the webapp #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: wip
Choose a base branch
from
Open

RM#60909 Nexus version of the webapp #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4969800
RM#60909 Nexus version of the webapp
alo-axelor Mar 16, 2023
b1d4e24
RM#60909 Fix AOS version
alo-axelor Apr 3, 2023
b2b2de7
RM60909 Fix variable name
alo-axelor Apr 3, 2023
acb12c0
Remove support for `modules` folder and add version
ale-axelor Apr 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 3 additions & 23 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ allprojects {
apply plugin: 'eclipse'

group = 'com.axelor.apps'
ext.aosVersion = '7.0.0-SNAPSHOT'
version = '7.0.0'

java {
Expand All @@ -38,15 +39,11 @@ allprojects {
}

dependencies {
gradle.appModules.each { dir ->
implementation project(":modules:$dir.name")
gradle.appModules.each { module ->
implementation "com.axelor.apps:${module}:${aosVersion}"
}
}

war {
archiveFileName = 'axelor-erp-7.0.0.war'
}

apply from: 'gradle/style.gradle'

task("dataImport", type: JavaExec) {
Expand All @@ -57,21 +54,6 @@ task("dataImport", type: JavaExec) {
}
}

task archiveReports(type: Zip) {
file("modules").traverse(type: groovy.io.FileType.DIRECTORIES, maxDepth: 1) { dir ->
if (new File(dir, "build.gradle").exists() && new File(dir, "/src/main/resources/reports").exists()) {
new File(dir, "/src/main/resources/reports/").listFiles().each { report ->
from report.getPath()
}
}
}

classifier 'reports'
includeEmptyDirs = false
destinationDirectory = file("$buildDir/libs")
}


task generateChangelog(type: GenerateAosChangelog) {
group "Axelor application"
description "Generate change logs from unreleased entries."
Expand All @@ -91,5 +73,3 @@ task checkCsvEOL(type: CheckEOLCharsInCsv) {
include '**/*.csv'
}
}

build.finalizedBy archiveReports
1 change: 0 additions & 1 deletion modules/axelor-open-suite
Open in desktop
Submodule axelor-open-suite deleted from 3943cd
41 changes: 30 additions & 11 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,35 @@ dependencyResolutionManagement {
//Include all modules
rootProject.name = "axelor-erp"

def modules = []
file("modules").traverse(type: groovy.io.FileType.DIRECTORIES, maxDepth: 1) { it ->
if (new File(it, "build.gradle").exists()) {
modules.add(it)
}
}
def modules = [
"axelor-account",
"axelor-bank-payment",
"axelor-base",
"axelor-business-production",
"axelor-business-project",
"axelor-business-support",
"axelor-cash-management",
"axelor-client-portal",
"axelor-contract",
"axelor-crm",
"axelor-fleet",
"axelor-gdpr",
"axelor-helpdesk",
"axelor-human-resource",
"axelor-maintenance",
"axelor-marketing",
"axelor-mobile-settings",
"axelor-production",
"axelor-project",
"axelor-project-dms",
"axelor-purchase",
"axelor-quality",
"axelor-sale",
"axelor-stock",
"axelor-supplier-management",
"axelor-supplier-portal",
"axelor-supplychain",
"axelor-talent"
]

gradle.ext.appModules = modules

modules.each { dir ->
include "modules:$dir.name"
project(":modules:$dir.name").projectDir = dir
}