Skip to content

Commit 59c930a

Browse files
committed
Merge branch 'update-from-template'
2 parents 9988d61 + 3521746 commit 59c930a

File tree

5 files changed

+35
-34
lines changed

5 files changed

+35
-34
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ jobs:
141141
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
142142

143143
publish-pages:
144-
name: Publish dependencies and licenses to github pages
145144
runs-on: ubuntu-latest
146145
needs: [prepare_release]
147146
steps:
@@ -160,40 +159,15 @@ jobs:
160159
distribution: 'temurin'
161160
cache: 'maven'
162161

163-
- name: Build dependencies/licenses files
164-
run: mvn -B project-info-reports:dependencies
162+
- name: Build site
163+
run: ../mvnw -B site
165164
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
166165

167-
- name: Upload licenses - Upload Artifact
168-
uses: actions/upload-artifact@v4
169-
with:
170-
name: dependencies-licenses
171-
path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/site
172-
173-
- name: Generate docs/dependencies dir
174-
run: mkdir -p docs/dependencies
175-
176-
- name: Move built files into docs/dependencies
177-
run: mv ${{ env.PRIMARY_MAVEN_MODULE }}/target/site/* docs/dependencies
178-
179-
- name: Rename dependencies.html to index.html
180-
working-directory: docs/dependencies
181-
run: mv dependencies.html index.html
182-
183-
- name: Copy Readme into docs (as index.md)
184-
run: cp README.md docs/index.md
185-
186-
- name: Configure Pages
187-
working-directory: docs
188-
run: |-
189-
echo "theme: jekyll-theme-tactile" > _config.yml
190-
191166
- name: Deploy to Github pages
192167
uses: peaceiris/actions-gh-pages@v3
193168
with:
194169
github_token: ${{ secrets.GITHUB_TOKEN }}
195-
publish_dir: ./docs
196-
enable_jekyll: true
170+
publish_dir: ./${{ env.PRIMARY_MAVEN_MODULE }}/target/site
197171

198172
after_release:
199173
runs-on: ubuntu-latest

.idea/checkstyle-idea.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ If you need support as soon as possible and you can't wait for any pull request,
3333
See the [contributing guide](./CONTRIBUTING.md) for detailed instructions on how to get started with our project.
3434

3535
## Dependencies and Licenses
36-
View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/vaadin-addon-template/dependencies/)
36+
View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/vaadin-addon-template/dependencies)

vaadin-addon-template-demo/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,19 @@
9393
<finalName>${project.artifactId}</finalName>
9494

9595
<pluginManagement>
96+
<plugins>
97+
<plugin>
98+
<groupId>org.apache.maven.plugins</groupId>
99+
<artifactId>maven-site-plugin</artifactId>
100+
<version>4.0.0-M13</version>
101+
</plugin>
102+
<plugin>
103+
<groupId>org.apache.maven.plugins</groupId>
104+
<artifactId>maven-project-info-reports-plugin</artifactId>
105+
<version>3.5.0</version>
106+
</plugin>
107+
</plugins>
108+
96109
<plugins>
97110
<plugin>
98111
<groupId>org.springframework.boot</groupId>

vaadin-addon-template/pom.xml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<scm>
1717
<url>https://github.com/xdev-software/vaadin-addon-template</url>
18-
<connection>https://github.com/xdev-software/vaadin-addon-template.git</connection>
18+
<connection>scm:git:https://github.com/xdev-software/vaadin-addon-template.git</connection>
1919
</scm>
2020

2121
<inceptionYear>2022</inceptionYear>
@@ -114,6 +114,20 @@
114114
</dependencies>
115115

116116
<build>
117+
<pluginManagement>
118+
<plugins>
119+
<plugin>
120+
<groupId>org.apache.maven.plugins</groupId>
121+
<artifactId>maven-site-plugin</artifactId>
122+
<version>4.0.0-M13</version>
123+
</plugin>
124+
<plugin>
125+
<groupId>org.apache.maven.plugins</groupId>
126+
<artifactId>maven-project-info-reports-plugin</artifactId>
127+
<version>3.5.0</version>
128+
</plugin>
129+
</plugins>
130+
</pluginManagement>
117131
<plugins>
118132
<plugin>
119133
<groupId>com.mycila</groupId>
@@ -236,7 +250,7 @@
236250
<plugin>
237251
<groupId>org.apache.maven.plugins</groupId>
238252
<artifactId>maven-gpg-plugin</artifactId>
239-
<version>3.2.1</version>
253+
<version>3.2.2</version>
240254
<executions>
241255
<execution>
242256
<id>sign-artifacts</id>

0 commit comments

Comments
 (0)