Skip to content
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.

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

WFCORE-5279 #3

Open
wants to merge 25 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
6465a7e
Subsystem Template
nekdozjam May 13, 2022
67bc79e
Template refactor
nekdozjam Jun 3, 2022
8bfe3a4
WIP
nekdozjam Jun 29, 2022
aac4b67
[WFCORE-5729] add imports for SSLContextDefintions, new ServiceBuilder
jessicarod7 Jul 6, 2022
32cc897
[WFCORE-5279] add LocalDescriptions, XML parser
jessicarod7 Jul 9, 2022
f5077fd
[WFCORE-5279] update filepaths for licenses
jessicarod7 Jul 11, 2022
60fd8c0
[WFCORE-5279] Readd elytron-tls-dependency to build
jessicarod7 Jul 13, 2022
88018b0
[WFCORE-5279] add definitions, working on new Service API
jessicarod7 Jul 18, 2022
7b4a2b1
[WFCORE-5279] add test cases, upgrade to elytron 1.20
jessicarod7 Jul 27, 2022
5e0ec36
[WFCORE-5279] Fixed attribute & XML names
jessicarod7 Aug 10, 2022
540a1ca
[WFCORE-5279] add self-signed certs and CAs
jessicarod7 Aug 18, 2022
e06afe6
[WFCORE-5279] Update feature packs and modules
jessicarod7 Aug 22, 2022
988b171
[WFCORE-5279] Update capabilities, dependencies/dep processor
jessicarod7 Aug 26, 2022
9cd89d4
[WFCORE-5279] Restored Service API, add test resources
jessicarod7 Oct 3, 2022
81ff3e8
[WFCORE-5279] Update dependencies, all tests passing
jessicarod7 Oct 11, 2022
ae998c0
[WFCORE-5279] Remove Weld, template dependency and example folders
jessicarod7 Oct 27, 2022
1be4730
[WFCORE-5279] Remove unused capabilities and constants
jessicarod7 Oct 27, 2022
14ee9c6
[WFCORE-5279] Update ElytronTLSMessages name/format
jessicarod7 Oct 31, 2022
fd04add
[WFCORE-5279] Remove maximum-cert-path-crl, checks for Java 11+
jessicarod7 Oct 31, 2022
3f5ac42
[WFCORE-5279] Update subsystem, galleon pack, testsuite names
jessicarod7 Oct 31, 2022
3348124
[WFCORE-5279] Update capability & module.xml, testing with undertow g…
jessicarod7 Nov 1, 2022
38da5b0
[WFCORE-5279] Update POMs, rm old testing files
jessicarod7 Nov 4, 2022
70570ab
[WFCORE-5279] Update logger codes
jessicarod7 Nov 8, 2022
ca5a339
[WFCORE-5279] Fix DependencyProcessor config
jessicarod7 Nov 16, 2022
bd78e2f
[WFCORE-5279] Update SCM links in POM
jessicarod7 Nov 18, 2022
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
150 changes: 150 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
name: Galleon Pack Template Java CI

on: [push, pull_request]

jobs:
# This just runs mvn install like a user would on cloning the repository
raw:
name: Normal checkout

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/cache@v1
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-

- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8

- name: Build and Test
run: |
mvn --version
mvn -B install

- name: Zip Artifacts
run: zip -R artifacts.zip 'server.log' 'surefire-reports/*.txt' 'surefire-reports/*.xml'

- uses: actions/upload-artifact@v1
with:
# Expressions in the name don't seem to get resolved
#name: ci-artifacts-galleon-template-raw-{{job.container.id}}
name: ci-artifacts-galleon-template-raw
path: artifacts.zip


wildfly-master:
# This adjusts the build to use the versions from wildfly master
name: Against WildFly master

runs-on: ubuntu-latest

steps:
- name: Checkout feature pack
uses: actions/checkout@v2
with:
path: main

- name: Checkout wildfly master
uses: actions/checkout@v2
with:
repository: wildfly/wildfly
path: wildfly-master

- uses: actions/cache@v1
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-

- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8

- name: Initialise Feature Pack version
# Needed to download everything from Maven to not pollute the output in the next steps
run:
mvn help:evaluate -Dexpression=project.version -pl .
working-directory: main

- name: Set FEATURE_PACK_VERSION
run: |
TMP="$(mvn help:evaluate -Dexpression=project.version -pl . | grep -v '^\[')"
echo "FEATURE_PACK_VERSION=${TMP}" >> $GITHUB_ENV
echo "TMP ${TMP}"
working-directory: main

- name: Initialise WildFly versions
# Needed to download everything from Maven to not pollute the output in the next steps
run: |
mvn -B help:evaluate -Dexpression=project.version -pl .
mvn -B help:evaluate -Dexpression=version.org.wildfly.core -pl .
working-directory: wildfly-master

- name: Set WILDFLY_VERSION
run: |
TMP="$(mvn help:evaluate -Dexpression=project.version -pl . | grep -v '^\[')"
echo "WILDFLY_VERSION=${TMP}" >> $GITHUB_ENV
working-directory: wildfly-master

- name: Set WILDFLY_CORE_VERSION
run: |
TMP="$(mvn help:evaluate -Dexpression=version.org.wildfly.core -pl . | grep -v '^\[')"
echo "WILDFLY_CORE_VERSION=${TMP}" >> $GITHUB_ENV
working-directory: wildfly-master

- name: Show read versions
run: |
echo "Feature pack version ${FEATURE_PACK_VERSION}"
echo "WildFly version ${WILDFLY_VERSION}"
echo "WildFly Core version ${WILDFLY_CORE_VERSION}"

- name: Build WildFly master
run: mvn -B install -DskipTests
working-directory: wildfly-master

- name: Build and Test
run: |
mvn --version
mvn -B install -Dversion.org.wildfly=${WILDFLY_VERSION} -Dversion.org.wildfly.core=${WILDFLY_CORE_VERSION}
working-directory: main

- name: Calculate directories to check
run: |
SRV_DIR="build/target/wildfly-${WILDFLY_VERSION}-template-${FEATURE_PACK_VERSION}"
echo "BUILD_SERVER_DIR=${SRV_DIR}" >> $GITHUB_ENV
MODULES_BASE="${SRV_DIR}/modules/system/layers/base"
echo "UNDERTOW_MODULE_XML=${MODULES_BASE}/org/wildfly/extension/undertow/main/module.xml" >> $GITHUB_ENV
echo "CONTROLLER_MODULE_XML=${MODULES_BASE}/org/jboss/as/controller/main/module.xml" >> $GITHUB_ENV

- name: Check versions
run: |
if grep -q org.wildfly:wildfly-undertow:${WILDFLY_VERSION} "${UNDERTOW_MODULE_XML}" && grep -q org.wildfly.core:wildfly-controller:${WILDFLY_CORE_VERSION} "${CONTROLLER_MODULE_XML}"; then
echo "Versions in module.xml files as expected!"
else
echo "Versions in module.xml files not as expected!"
"Expected WildFly version '${WILDFLY_VERSION}' and Core version '${WILDFLY_CORE_VERSION}'"
echo "Showing contents of ${UNDERTOW_MODULE_XML} and ${CONTROLLER_MODULE_XML}"
echo "Exiting..."
exit 1
fi
working-directory: main

- name: Zip Artifacts
run: zip -R artifacts.zip 'server.log' 'surefire-reports/*.txt' 'surefire-reports/*.xml'
working-directory: main

- uses: actions/upload-artifact@v1
with:
# Expressions in the name don't seem to get resolved
#name: ci-artifacts-galleon-template-wf-master-{{job.container.id}}
name: ci-artifacts-galleon-template-wf-master
path: main/artifacts.zip
65 changes: 65 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# ignore .svn metadata files
.svn
# ignore Maven generated target folders
~
target
# ignore downloaded maven
/tools/maven
/tools/maven.zip
/tools/wrapper
# ignore eclipse files
.project
.classpath
.settings
.metadata
.checkstyle
# ignore m2e annotation processing files
.factorypath
# ignore IDEA files
*.iml
*.ipr
*.iws
.idea
# ignore NetBeans files
nbactions.xml
nb-configuration.xml
catalog.xml
#
maven-ant-tasks.jar
test-output
transaction.log
# ignore VS Code files
.vscode/
# vim files
*.swp
/.gitk-tmp.*
atlassian-ide-plugin.xml
# temp files
*~
# maven versions plugin
pom.xml.versionsBackup
# hprof dumps
/*.hprof
# ignore 'randomly' strewn around logs
server.log
# ignore java crashes
hs_err_pid*.log
# H2 databases produced by tests
*.h2.db
# JBoss transaction generated files
PutObjectStoreDirHere
# ignore mvn-rpmbuild repo
/.m2
# ignore eap repo
local-repo-eap
# ignore the build metadata created by the build metadata plugin
build.metadata
#These keep hanging around
arquillian/*/server.log*
client/shade/dependency-reduced-pom.xml

#OS X stuff
.DS_Store

# Zanata files
**/.zanata-cache/
Loading