Skip to content

Commit 9d1ce74

Browse files
authored
Move parent pom.xml to repository root (#14)
1 parent 4318217 commit 9d1ce74

File tree

10 files changed

+13
-31
lines changed

10 files changed

+13
-31
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,8 @@ jobs:
6464
steps:
6565
- uses: actions/checkout@v3
6666

67-
- name: Set up JDK
68-
uses: actions/setup-java@v3
69-
with:
70-
java-version: '17'
71-
distribution: temurin
72-
server-id: set-github
73-
cache: maven
67+
- name: Setup Java
68+
uses: eclipse-set/build/.github/actions/setup-java@main
7469

7570
- name: Set up Workspace
7671
run: |
@@ -107,18 +102,11 @@ jobs:
107102
name: chromium-swt-libs
108103
path: java/org.eclipse.set.browser.lib/res/
109104

110-
- name: Set up Maven
111-
uses: stCarolas/setup-maven@07fbbe97d97ef44336b7382563d66743297e442f # v4.5
112-
with:
113-
maven-version: 3.9.3
114-
115105
- name: Build
116106
run: mvn -T 1.5C -B clean verify
117-
working-directory: java
118107

119108
- name: Publish
120109
run: mvn -T 1.5C -B deploy -DaltDeploymentRepository=set-github::https://maven.pkg.github.com/${{ github.repository }}
121110
if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/tags/')
122-
working-directory: java
123111
env:
124112
GITHUB_TOKEN: ${{ github.token }}

.github/workflows/create-release-branch.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ jobs:
2020
contents: write
2121
with:
2222
version: ${{ inputs.version }}
23-
target: "java/org.eclipse.set.browser.releng.target/org.eclipse.set.browser.releng.target.target"
24-
pom: java/pom.xml
23+
target: "java/org.eclipse.set.browser.releng.target/org.eclipse.set.browser.releng.target.target"

.github/workflows/create-release-tag.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ jobs:
2020
contents: write
2121
with:
2222
version: ${{ inputs.version }}
23-
target: "java/org.eclipse.set.browser.releng.target/org.eclipse.set.browser.releng.target.target"
24-
pom: java/pom.xml
23+
target: "java/org.eclipse.set.browser.releng.target/org.eclipse.set.browser.releng.target.target"

.github/workflows/license.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,5 @@ jobs:
1414
contents: write
1515
issues: write
1616
pull-requests: write
17-
with:
18-
pom: java/pom.xml
1917
secrets:
2018
gitlabAPIToken: ${{ secrets.GITLAB_API_TOKEN }}

.github/workflows/update-dependencies.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,4 @@ jobs:
1010
dependencies:
1111
uses: eclipse-set/build/.github/workflows/update-dependencies.yml@main
1212
permissions:
13-
contents: write
14-
with:
15-
pom: java/pom.xml
13+
contents: write

java/org.eclipse.set.browser.cef.win32/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<packaging>eclipse-plugin</packaging>
99

1010
<parent>
11-
<relativePath>..</relativePath>
11+
<relativePath>../..</relativePath>
1212
<groupId>org.eclipse.set</groupId>
1313
<artifactId>org.eclipse.set.browser.releng.parent</artifactId>
1414
<version>2.1.0-SNAPSHOT</version>

java/org.eclipse.set.browser.lib/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<packaging>eclipse-plugin</packaging>
99

1010
<parent>
11-
<relativePath>..</relativePath>
11+
<relativePath>../..</relativePath>
1212
<groupId>org.eclipse.set</groupId>
1313
<artifactId>org.eclipse.set.browser.releng.parent</artifactId>
1414
<version>2.1.0-SNAPSHOT</version>

java/org.eclipse.set.browser.releng.target/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<packaging>eclipse-target-definition</packaging>
99

1010
<parent>
11-
<relativePath>..</relativePath>
11+
<relativePath>../..</relativePath>
1212
<groupId>org.eclipse.set</groupId>
1313
<artifactId>org.eclipse.set.browser.releng.parent</artifactId>
1414
<version>2.1.0-SNAPSHOT</version>

java/org.eclipse.set.browser/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<packaging>eclipse-plugin</packaging>
99

1010
<parent>
11-
<relativePath>..</relativePath>
11+
<relativePath>../..</relativePath>
1212
<groupId>org.eclipse.set</groupId>
1313
<artifactId>org.eclipse.set.browser.releng.parent</artifactId>
1414
<version>2.1.0-SNAPSHOT</version>

java/pom.xml renamed to pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
</properties>
1717

1818
<modules>
19-
<module>org.eclipse.set.browser</module>
20-
<module>org.eclipse.set.browser.lib</module>
21-
<module>org.eclipse.set.browser.cef.win32</module>
22-
<module>org.eclipse.set.browser.releng.target</module>
19+
<module>java/org.eclipse.set.browser</module>
20+
<module>java/org.eclipse.set.browser.lib</module>
21+
<module>java/org.eclipse.set.browser.cef.win32</module>
22+
<module>java/org.eclipse.set.browser.releng.target</module>
2323
</modules>
2424

2525
<build>

0 commit comments

Comments
 (0)