Skip to content

Commit 69a7afc

Browse files
Merge pull request #285 from QA-Automation-Starter/284-aspectj-weaver-sporically-fails
284 aspectj weaver sporically fails
2 parents 6dc9da0 + 4e3b712 commit 69a7afc

File tree

7 files changed

+34
-9
lines changed

7 files changed

+34
-9
lines changed

.github/workflows/on-main-push.yml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ jobs:
5252
with:
5353
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
5454

55-
- name: deploy snapshots and publish site
55+
- name: deploy snapshots
5656
id: deploy
5757
shell: bash
5858
run: |
5959
git config --global core.longpaths true
6060
git config --global user.name "Adrian Herscu"
6161
git config --global user.email "adrian.herscu@gmail.com"
62-
chmod +x mvnw && ./mvnw deploy site site:stage scm-publish:publish-scm \
62+
chmod +x mvnw && ./mvnw deploy \
6363
--threads 1 \
6464
-s $GITHUB_WORKSPACE/settings.xml \
6565
-Pmode-build-full,provider-saucelabs-selenium,testing-tutorials
@@ -70,6 +70,24 @@ jobs:
7070
SAUCELABS_USER: ${{ secrets.SAUCELABS_USER }}
7171
SAUCELABS_PASSWORD: ${{ secrets.SAUCELABS_PASSWORD }}
7272

73+
- name: build and publish site
74+
id: site
75+
shell: bash
76+
run: |
77+
git config --global core.longpaths true
78+
git config --global user.name "Adrian Herscu"
79+
git config --global user.email "adrian.herscu@gmail.com"
80+
chmod +x mvnw && ./mvnw site site:stage scm-publish:publish-scm \
81+
--threads 1 \
82+
-s $GITHUB_WORKSPACE/settings.xml \
83+
-Pmode-aspectj-skip
84+
env:
85+
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
86+
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
87+
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
88+
SAUCELABS_USER: ${{ secrets.SAUCELABS_USER }}
89+
SAUCELABS_PASSWORD: ${{ secrets.SAUCELABS_PASSWORD }}
90+
7391
- name: save project version
7492
id: version
7593
shell: bash

.idea/runConfigurations/site_stage.xml

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

.idea/runConfigurations/site_stage_fast.xml

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

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@
434434
see https://stackoverflow.com/questions/75142147/re-importing-a-maven-project-into-intellij-turns-off-aspectj-post-compile-mode -->
435435
<groupId>dev.aspectj</groupId>
436436
<artifactId>aspectj-maven-plugin</artifactId>
437-
<version>1.13.1</version>
437+
<version>1.14.1</version>
438438
<dependencies>
439439
<dependency>
440440
<groupId>org.aspectj</groupId>

qa-testing-archetype/src/main/resources/archetype-resources/testing-self.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<test name="Self Tests" parallel="classes" thread-count="15">
3434
<classes>
3535
<class
36-
name="${package}.scenarios.tutorial3.TestingWebWithJGiven"/>
36+
name="${package}.scenarios.SelfTests"/>
3737
</classes>
3838
</test>
3939
</suite>

site-stage-fast.launch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<stringAttribute key="M2_GOALS" value="site site:stage"/>
66
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
77
<booleanAttribute key="M2_OFFLINE" value="false"/>
8-
<stringAttribute key="M2_PROFILES" value="mode-site-fast"/>
8+
<stringAttribute key="M2_PROFILES" value="mode-site-fast mode-aspectj-skip"/>
99
<listAttribute key="M2_PROPERTIES"/>
1010
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
1111
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>

site-stage.launch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<stringAttribute key="M2_GOALS" value="site site:stage"/>
66
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
77
<booleanAttribute key="M2_OFFLINE" value="false"/>
8-
<stringAttribute key="M2_PROFILES" value=""/>
8+
<stringAttribute key="M2_PROFILES" value="mode-aspectj-skip"/>
99
<listAttribute key="M2_PROPERTIES"/>
1010
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
1111
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>

0 commit comments

Comments
 (0)