Skip to content

Commit 00196d9

Browse files
authored
Merge pull request #38 from xdev-software/vaadin-directory-maven-direct
Vaadin directory is no more
2 parents 1a68519 + c79493f commit 00196d9

File tree

5 files changed

+2
-132
lines changed

5 files changed

+2
-132
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -137,49 +137,6 @@ jobs:
137137
MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
138138
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
139139
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
140-
141-
build_directory: # Build a ZIP that can be uploaded to Vaadin Directory
142-
runs-on: ubuntu-latest
143-
needs: [prepare_release]
144-
steps:
145-
- uses: actions/checkout@v3
146-
147-
- name: Init Git and pull
148-
run: |
149-
git config --global user.email "[email protected]"
150-
git config --global user.name "GitHub Actions"
151-
git pull
152-
153-
- name: Set up JDK
154-
uses: actions/setup-java@v3
155-
with:
156-
java-version: '11'
157-
distribution: 'temurin'
158-
159-
- name: Build for Vaadin Directory
160-
run: mvn -B install -Pdirectory
161-
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
162-
163-
- name: Upload asset
164-
uses: actions/upload-artifact@v3
165-
with:
166-
name: vaadin-directory-files
167-
path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/${{ env.PRIMARY_MAVEN_MODULE }}-*.zip
168-
if-no-files-found: error
169-
170-
- name: Get version
171-
id: version
172-
run: |
173-
echo "release=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_OUTPUT
174-
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
175-
176-
- name: Upload Release Asset
177-
uses: shogo82148/actions-upload-release-asset@v1
178-
with:
179-
upload_url: ${{ needs.prepare_release.outputs.upload_url }}
180-
asset_path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/${{ env.PRIMARY_MAVEN_MODULE }}-${{ steps.version.outputs.release }}.zip
181-
asset_name: ${{ env.PRIMARY_MAVEN_MODULE }}-${{ steps.version.outputs.release }}.zip
182-
asset_content_type: application/zip
183140

184141
publish-pages:
185142
name: Publish dependencies and licenses to github pages
@@ -238,7 +195,7 @@ jobs:
238195

239196
after_release:
240197
runs-on: ubuntu-latest
241-
needs: [publish_central, build_directory]
198+
needs: [publish_central]
242199
steps:
243200
- uses: actions/checkout@v3
244201

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@ If the ``develop`` is ready for release, create a pull request to the ``master``
5757

5858
When the release is finished do the following:
5959
* Merge the auto-generated PR (with the incremented version number) back into the ``develop``
60-
* Upload the generated release asset zip into the [Vaadin Directory](https://vaadin.com/directory) and update the component there
60+
* Ensure that [Vaadin Directory](https://vaadin.com/directory) syncs the update and maybe update the component / version there

vaadin-addon-template/assembly/MANIFEST.MF

Lines changed: 0 additions & 6 deletions
This file was deleted.

vaadin-addon-template/assembly/assembly.xml

Lines changed: 0 additions & 42 deletions
This file was deleted.

vaadin-addon-template/pom.xml

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -265,44 +265,5 @@
265265
</plugins>
266266
</build>
267267
</profile>
268-
<profile>
269-
<id>directory</id>
270-
<build>
271-
<plugins>
272-
<plugin>
273-
<groupId>org.apache.maven.plugins</groupId>
274-
<artifactId>maven-assembly-plugin</artifactId>
275-
<version>3.5.0</version>
276-
<configuration>
277-
<appendAssemblyId>false</appendAssemblyId>
278-
<descriptors>
279-
<descriptor>assembly/assembly.xml</descriptor>
280-
</descriptors>
281-
</configuration>
282-
<executions>
283-
<execution>
284-
<goals>
285-
<goal>single</goal>
286-
</goals>
287-
<phase>install</phase>
288-
</execution>
289-
</executions>
290-
</plugin>
291-
<plugin>
292-
<groupId>org.apache.maven.plugins</groupId>
293-
<artifactId>maven-jar-plugin</artifactId>
294-
<version>3.3.0</version>
295-
<configuration>
296-
<!-- VAADIN files that shouldn't be included in add-ons -->
297-
<excludes>
298-
<exclude>
299-
META-INF/VAADIN/
300-
</exclude>
301-
</excludes>
302-
</configuration>
303-
</plugin>
304-
</plugins>
305-
</build>
306-
</profile>
307268
</profiles>
308269
</project>

0 commit comments

Comments
 (0)