Skip to content

Commit e7d8a01

Browse files
jpgough-msjpgough-ms
authored
Merge branch 'main' into renovate/major-react-monorepo
2 parents 19a9b68 + d6feb73 commit e7d8a01

File tree

184 files changed

+27799
-260
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+27799
-260
lines changed

‎.flox/env/manifest.lock‎

Lines changed: 202 additions & 238 deletions
Large diffs are not rendered by default.

‎.flox/env/manifest.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ version = 1
1818
libuuid.pkg-path = "libuuid"
1919
libuuid.systems = ["aarch64-linux", "x86_64-linux"]
2020
gum.pkg-path = "gum"
21-
nodejs_21.pkg-path = "nodejs_21"
2221
jdk21.pkg-path = "jdk21"
2322
maven3.pkg-path = "maven3"
23+
nodejs_22.pkg-path = "nodejs_22"
2424

2525

2626
## Environment Variables ---------------------------------------------

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
/calm/ @finos/architecture-as-code-maintainers
44

5+
/calm-hub/ @jpgough-ms @rocketstack-matt @grahampacker-ms @Thels
6+
57
/cli/ @aidanm3341 @lbulanti-ms @willosborne @grahampacker-ms @jpgough-ms @rocketstack-matt @Thels
68

79
/shared/ @aidanm3341 @lbulanti-ms @willosborne @grahampacker-ms @jpgough-ms @rocketstack-matt @Thels

‎.github/maven-cve-ignore-list.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
3-
</suppressions>
3+
<!-- Suppress quarkus-run.jar -->
4+
<suppress>
5+
<filePath regex="true">.*quarkus-run\.jar</filePath>
6+
<cvssBelow>10.0</cvssBelow>
7+
</suppress>
8+
</suppressions>

‎.github/workflows/build-calm-hub.yml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: Build Calm Hub
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- "main"
7+
paths:
8+
- "calm-hub/**"
9+
push:
10+
branches:
11+
- "main"
12+
paths:
13+
- "calm-hub/**"
14+
15+
jobs:
16+
build:
17+
name: Build Calm Hub
18+
runs-on: ubuntu-latest
19+
20+
steps:
21+
# Step 1: Checkout PR Branch
22+
- name: Checkout PR Branch
23+
uses: actions/checkout@v4
24+
25+
# Step 2: Set up JDK
26+
- name: Set up JDK
27+
uses: actions/setup-java@v3
28+
with:
29+
distribution: 'temurin'
30+
java-version: '21'
31+
32+
# Step 3: Cache Maven Dependencies
33+
- name: Cache Maven Dependencies
34+
uses: actions/cache@v3
35+
with:
36+
path: ~/.m2
37+
key: ${{ runner.os }}-m2-${{ hashFiles('calm-hub/pom.xml') }}
38+
restore-keys: |
39+
${{ runner.os }}-m2-
40+
41+
# Step 4: Set up Docker (Required for Testcontainers)
42+
- name: Set up Docker
43+
uses: docker/setup-buildx-action@v2
44+
45+
# Step 5: Build and Test
46+
- name: Build and Test
47+
working-directory: calm-hub
48+
run: mvn -P integration clean verify

‎.github/workflows/cve-scanning-maven.yml‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CVE Scanning for Maven
1+
name: CVE Scanning for Maven Projects
22

33
on:
44
workflow_dispatch:
@@ -22,20 +22,24 @@ jobs:
2222
matrix:
2323
java-version: [ '21' ]
2424
module-folder: [
25-
'translator'
25+
'translator',
26+
'calm-hub'
2627
]
2728
steps:
2829
- name: Checkout
2930
uses: actions/checkout@v4
31+
3032
- name: Setup JDK
3133
uses: actions/setup-java@v4
3234
with:
3335
java-version: ${{ matrix.java-version }}
3436
cache: maven
3537
distribution: 'adopt'
38+
3639
- name: Build with Maven
37-
run: mvn clean install -Dmaven.test.skip=true
40+
run: mvn -DskipTests verify
3841
working-directory: ${{ matrix.module-folder }}
42+
3943
- name: Depcheck
4044
uses: dependency-check/Dependency-Check_Action@main
4145
id: Depcheck
@@ -45,15 +49,20 @@ jobs:
4549
project: '${{ matrix.module-folder }}'
4650
path: '${{ matrix.module-folder }}'
4751
format: 'HTML'
48-
out: '${{ matrix.module-folder }}-reports' # this is the default, no need to specify unless you wish to override it
52+
out: '${{ matrix.module-folder }}-reports'
4953
args: >
50-
--suppression .github/maven-cve-ignore-list.xml
51-
--failOnCVSS 5
52-
--enableRetired
54+
--suppression .github/maven-cve-ignore-list.xml
55+
--failOnCVSS 5
56+
--enableRetired
57+
--exclude "**/package.json"
58+
--exclude "**/package-lock.json"
59+
--disableNodeAudit
60+
--disableYarnAudit
61+
--disableRetireJS
5362
5463
- name: Upload Test results
5564
if: ${{ always() }}
5665
uses: actions/upload-artifact@v4
5766
with:
5867
name: Depcheck report ${{ github.job }} ${{ matrix.module-folder }}
59-
path: ${{ github.workspace }}/${{ matrix.module-folder }}-reports
68+
path: ${{ github.workspace }}/${{ matrix.module-folder }}-reports

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,6 @@ node_modules/
2323
**/out/
2424
**/dependency-check-report/
2525

26-
**/tsconfig.tsbuildinfo
26+
**/tsconfig.tsbuildinfo
27+
28+
!/.mvn/wrapper/maven-wrapper.jar

‎.mvn/wrapper/MavenWrapperDownloader.java‎

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
import java.net.*;
21+
import java.io.*;
22+
import java.nio.channels.*;
23+
import java.util.Properties;
24+
25+
public class MavenWrapperDownloader
26+
{
27+
private static final String WRAPPER_VERSION = "3.1.1";
28+
29+
/**
30+
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
31+
*/
32+
private static final String DEFAULT_DOWNLOAD_URL =
33+
"https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/" + WRAPPER_VERSION
34+
+ "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
35+
36+
/**
37+
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to use instead of the
38+
* default one.
39+
*/
40+
private static final String MAVEN_WRAPPER_PROPERTIES_PATH = ".mvn/wrapper/maven-wrapper.properties";
41+
42+
/**
43+
* Path where the maven-wrapper.jar will be saved to.
44+
*/
45+
private static final String MAVEN_WRAPPER_JAR_PATH = ".mvn/wrapper/maven-wrapper.jar";
46+
47+
/**
48+
* Name of the property which should be used to override the default download url for the wrapper.
49+
*/
50+
private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
51+
52+
public static void main( String args[] )
53+
{
54+
System.out.println( "- Downloader started" );
55+
File baseDirectory = new File( args[0] );
56+
System.out.println( "- Using base directory: " + baseDirectory.getAbsolutePath() );
57+
58+
// If the maven-wrapper.properties exists, read it and check if it contains a custom
59+
// wrapperUrl parameter.
60+
File mavenWrapperPropertyFile = new File( baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH );
61+
String url = DEFAULT_DOWNLOAD_URL;
62+
if ( mavenWrapperPropertyFile.exists() )
63+
{
64+
FileInputStream mavenWrapperPropertyFileInputStream = null;
65+
try
66+
{
67+
mavenWrapperPropertyFileInputStream = new FileInputStream( mavenWrapperPropertyFile );
68+
Properties mavenWrapperProperties = new Properties();
69+
mavenWrapperProperties.load( mavenWrapperPropertyFileInputStream );
70+
url = mavenWrapperProperties.getProperty( PROPERTY_NAME_WRAPPER_URL, url );
71+
}
72+
catch ( IOException e )
73+
{
74+
System.out.println( "- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'" );
75+
}
76+
finally
77+
{
78+
try
79+
{
80+
if ( mavenWrapperPropertyFileInputStream != null )
81+
{
82+
mavenWrapperPropertyFileInputStream.close();
83+
}
84+
}
85+
catch ( IOException e )
86+
{
87+
// Ignore ...
88+
}
89+
}
90+
}
91+
System.out.println( "- Downloading from: " + url );
92+
93+
File outputFile = new File( baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH );
94+
if ( !outputFile.getParentFile().exists() )
95+
{
96+
if ( !outputFile.getParentFile().mkdirs() )
97+
{
98+
System.out.println( "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath()
99+
+ "'" );
100+
}
101+
}
102+
System.out.println( "- Downloading to: " + outputFile.getAbsolutePath() );
103+
try
104+
{
105+
downloadFileFromURL( url, outputFile );
106+
System.out.println( "Done" );
107+
System.exit( 0 );
108+
}
109+
catch ( Throwable e )
110+
{
111+
System.out.println( "- Error downloading" );
112+
e.printStackTrace();
113+
System.exit( 1 );
114+
}
115+
}
116+
117+
private static void downloadFileFromURL( String urlString, File destination )
118+
throws Exception
119+
{
120+
if ( System.getenv( "MVNW_USERNAME" ) != null && System.getenv( "MVNW_PASSWORD" ) != null )
121+
{
122+
String username = System.getenv( "MVNW_USERNAME" );
123+
char[] password = System.getenv( "MVNW_PASSWORD" ).toCharArray();
124+
Authenticator.setDefault( new Authenticator()
125+
{
126+
@Override
127+
protected PasswordAuthentication getPasswordAuthentication()
128+
{
129+
return new PasswordAuthentication( username, password );
130+
}
131+
} );
132+
}
133+
URL website = new URL( urlString );
134+
ReadableByteChannel rbc;
135+
rbc = Channels.newChannel( website.openStream() );
136+
FileOutputStream fos = new FileOutputStream( destination );
137+
fos.getChannel().transferFrom( rbc, 0, Long.MAX_VALUE );
138+
fos.close();
139+
rbc.close();
140+
}
141+
142+
}

‎.mvn/wrapper/maven-wrapper.jar‎

58.5 KB
Binary file not shown.

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
wrapperVersion=3.3.2
18+
distributionType=only-script
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

0 commit comments

Comments
 (0)