Skip to content

Commit

Permalink
Upgrade to Hawtio 4.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tadayosi committed Apr 18, 2024
1 parent c7fabe9 commit 97403bf
Show file tree
Hide file tree
Showing 12 changed files with 7,190 additions and 14,428 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: ['11', '17', '21']
java: ['17', '21']
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand Down
16 changes: 8 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@

<groupId>io.hawt.examples</groupId>
<artifactId>hawtio-sample-plugin</artifactId>
<version>2.0.0</version>
<version>4.0.0</version>
<name>Hawtio Sample Plugin</name>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>

<!-- Versions -->
<spring-boot-version>2.7.17</spring-boot-version>
<hawtio-version>3.0.0</hawtio-version>
<node-version>v18.18.2</node-version>
<yarn-version>v1.22.19</yarn-version>
<frontend-maven-plugin-version>1.14.2</frontend-maven-plugin-version>
<spring-boot-version>3.2.4</spring-boot-version>
<hawtio-version>4.0.0</hawtio-version>
<node-version>v20.12.2</node-version>
<yarn-version>v1.22.22</yarn-version>
<frontend-maven-plugin-version>1.15.0</frontend-maven-plugin-version>

<!-- Path to the Hawtio TypeScript plugin -->
<plugin.path>sample-plugin</plugin.path>
Expand Down
3 changes: 0 additions & 3 deletions sample-plugin/.env

This file was deleted.

873 changes: 0 additions & 873 deletions sample-plugin/.yarn/releases/yarn-3.5.0.cjs

This file was deleted.

893 changes: 893 additions & 0 deletions sample-plugin/.yarn/releases/yarn-4.1.1.cjs

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion sample-plugin/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
compressionLevel: mixed

enableGlobalCache: false

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.5.0.cjs
yarnPath: .yarn/releases/yarn-4.1.1.cjs
109 changes: 0 additions & 109 deletions sample-plugin/craco.config.js

This file was deleted.

58 changes: 34 additions & 24 deletions sample-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,48 @@
"license": "Apache-2.0",
"private": true,
"scripts": {
"start": "craco start",
"build": "craco build && yarn replace-version",
"test": "craco test",
"start": "webpack serve --mode development",
"build": "webpack --mode production",
"test": "jest --passWithNoTests",
"replace-version": "replace __PACKAGE_VERSION_PLACEHOLDER__ $npm_package_version ./build/static/js -r --include=\"*.js\""
},
"dependencies": {
"@hawtio/react": "^1.0.0",
"@patternfly/react-charts": "^7.1.1",
"@patternfly/react-core": "^4.278.0",
"@patternfly/react-table": "^4.113.6",
"@hawtio/react": "^1.2.2",
"@patternfly/react-charts": "~6.94.21",
"@patternfly/react-core": "~4.278.1",
"@patternfly/react-table": "~4.113.7",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-scripts": "^5.0.1"
"react-dom": "^18.2.0"
},
"devDependencies": {
"@craco/craco": "^7.1.0",
"@hawtio/backend-middleware": "^1.0.4",
"craco-esbuild": "^0.5.2",
"os-browserify": "^0.3.0",
"path-browserify": "^1.0.1",
"replace": "^1.2.2"
"@swc/core": "^1.4.11",
"copy-webpack-plugin": "^12.0.2",
"css-loader": "^6.10.0",
"html-webpack-plugin": "^5.6.0",
"jest": "^29.7.0",
"replace": "^1.2.2",
"style-loader": "^3.3.4",
"swc-loader": "^0.2.6",
"webpack": "^5.91.0",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^5.0.4"
},
"resolutions": {
"@typescript-eslint/eslint-plugin": "6.9.0",
"@typescript-eslint/parser": "6.9.0",
"fork-ts-checker-webpack-plugin": "6.5.3"
},
"eslintConfig": {
"extends": [
"react-app",
"react-app/jest"
]
"victory-area": "36.8.6",
"victory-bar": "36.8.6",
"victory-brush-container": "36.8.6",
"victory-core": "36.8.6",
"victory-cursor-container": "36.8.6",
"victory-create-container": "36.8.6",
"victory-legend": "36.8.6",
"victory-line": "36.8.6",
"victory-pie": "36.8.6",
"victory-scatter": "36.8.6",
"victory-selection-container": "36.8.6",
"victory-shared-events": "36.8.6",
"victory-voronoi-container": "36.8.6",
"victory-zoom-container": "36.8.6"
},
"browserslist": {
"production": [
Expand All @@ -51,5 +61,5 @@
"last 1 safari version"
]
},
"packageManager": "yarn@3.5.0"
"packageManager": "yarn@4.1.1"
}
3 changes: 2 additions & 1 deletion sample-plugin/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<base href="%PUBLIC_URL%/" />
<meta name="description" content="Hawtio Example - Sample plugin" />
<!-- Hawtio branding styles placeholder -->
<link id="branding" rel="stylesheet" type="text/css" href="" />
<title>Hawtio Sample Plugin</title>
</head>
<body>
Expand Down
1 change: 0 additions & 1 deletion sample-plugin/src/react-app-env.d.ts

This file was deleted.

Loading

0 comments on commit 97403bf

Please sign in to comment.