Skip to content

Commit 5413fc7

Browse files
committed
ARIES-2169: Make blueprint-maven-plugin a top level module
1 parent cf26229 commit 5413fc7

File tree

297 files changed

+15
-13
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

297 files changed

+15
-13
lines changed

.github/labeler.yml

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ async:
77
blueprint:
88
- changed-files:
99
- any-glob-to-any-file: 'blueprint/**/*'
10+
blueprint-maven-plugin:
11+
- changed-files:
12+
- any-glob-to-any-file: 'blueprint-maven-plugin/**/*'
1013
eba-maven-plugin:
1114
- changed-files:
1215
- any-glob-to-any-file: 'eba-maven-plugin/**/*'

.github/workflows/blueprint-plugin.yml .github/workflows/blueprint-maven-plugin.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
# See the License for the specific language governing permissions and
1111
# limitations under the License.
1212

13-
name: Blueprint Plugin - CI Build
13+
name: Blueprint Maven Plugin - CI Build
1414

1515
on:
1616
pull_request:
1717
paths:
1818
- parent/**
19-
- blueprint/plugin/**
20-
- .github/workflows/blueprint-plugin.yml
19+
- blueprint-maven-plugin/**
20+
- .github/workflows/blueprint-maven-plugin.yml
2121
push:
2222
branches:
2323
- 'trunk'
@@ -48,4 +48,4 @@ jobs:
4848
run: mvn -U -e -B -ntp clean install -f parent
4949
- name: Build blueprint plugin
5050
shell: bash
51-
run: mvn -U -e -B -ntp clean install -f blueprint/plugin
51+
run: mvn -U -e -B -ntp clean install -f blueprint-maven-plugin

.github/workflows/blueprint.yml

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ on:
2323
- quiesce/**
2424
- blueprint/**
2525
- .github/workflows/blueprint.yml
26-
- '!blueprint/plugin/**'
2726
push:
2827
branches:
2928
- 'trunk'

blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml blueprint-maven-plugin/blueprint-maven-plugin-annotation/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<groupId>org.apache.aries</groupId>
2727
<artifactId>parent</artifactId>
2828
<version>2.1.2-SNAPSHOT</version>
29-
<relativePath>../../../parent/pom.xml</relativePath>
29+
<relativePath>../../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>org.apache.aries.blueprint</groupId>

blueprint/plugin/blueprint-maven-plugin-itest/pom.xml blueprint-maven-plugin/blueprint-maven-plugin-itest/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<groupId>org.apache.aries</groupId>
2626
<artifactId>parent</artifactId>
2727
<version>2.1.2-SNAPSHOT</version>
28-
<relativePath>../../../parent/pom.xml</relativePath>
28+
<relativePath>../../parent/pom.xml</relativePath>
2929
</parent>
3030

3131
<groupId>org.apache.aries.blueprint</groupId>

blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<groupId>org.apache.aries</groupId>
2626
<artifactId>parent</artifactId>
2727
<version>2.1.2-SNAPSHOT</version>
28-
<relativePath>../../../parent/pom.xml</relativePath>
28+
<relativePath>../../parent/pom.xml</relativePath>
2929
</parent>
3030

3131
<groupId>org.apache.aries.blueprint</groupId>

blueprint/plugin/blueprint-maven-plugin-spi/pom.xml blueprint-maven-plugin/blueprint-maven-plugin-spi/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<groupId>org.apache.aries</groupId>
2626
<artifactId>parent</artifactId>
2727
<version>2.1.2-SNAPSHOT</version>
28-
<relativePath>../../../parent/pom.xml</relativePath>
28+
<relativePath>../../parent/pom.xml</relativePath>
2929
</parent>
3030

3131
<groupId>org.apache.aries.blueprint</groupId>

blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<groupId>org.apache.aries</groupId>
2525
<artifactId>parent</artifactId>
2626
<version>2.1.2-SNAPSHOT</version>
27-
<relativePath>../../../parent/pom.xml</relativePath>
27+
<relativePath>../../parent/pom.xml</relativePath>
2828
</parent>
2929

3030
<groupId>org.apache.aries.blueprint</groupId>

blueprint/plugin/blueprint-maven-plugin/pom.xml blueprint-maven-plugin/blueprint-maven-plugin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<groupId>org.apache.aries</groupId>
2626
<artifactId>parent</artifactId>
2727
<version>2.1.2-SNAPSHOT</version>
28-
<relativePath>../../../parent/pom.xml</relativePath>
28+
<relativePath>../../parent/pom.xml</relativePath>
2929
</parent>
3030

3131
<groupId>org.apache.aries.blueprint</groupId>

blueprint/plugin/pom.xml blueprint-maven-plugin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<groupId>org.apache.aries</groupId>
2626
<artifactId>parent</artifactId>
2727
<version>2.1.2-SNAPSHOT</version>
28-
<relativePath>../../parent/pom.xml</relativePath>
28+
<relativePath>../parent/pom.xml</relativePath>
2929
</parent>
3030

3131
<groupId>org.apache.aries.blueprint</groupId>

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<module>application</module>
4141
<module>async</module>
4242
<module>blueprint</module>
43-
<module>blueprint/plugin</module>
43+
<module>blueprint-maven-plugin</module>
4444
<module>eba-maven-plugin</module>
4545
<module>esa-ant-task</module>
4646
<module>esa-maven-plugin</module>

0 commit comments

Comments
 (0)