Skip to content

Commit 64e5e4e

Browse files
ebarboniebarboni
authored
Merge pull request #251 from ebarboni/custommoduleoverwriteit
add IT for a module overriding codebasename + profile removal
2 parents 063fe0d + ef1060c commit 64e5e4e

File tree

11 files changed

+518
-25
lines changed

11 files changed

+518
-25
lines changed

‎nbm-maven-plugin/src/it/custommoduleoverride/application/pom.xml

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Licensed to the Apache Software Foundation (ASF) under one
4+
or more contributor license agreements. See the NOTICE file
5+
distributed with this work for additional information
6+
regarding copyright ownership. The ASF licenses this file
7+
to you under the Apache License, Version 2.0 (the
8+
"License"); you may not use this file except in compliance
9+
with the License. You may obtain a copy of the License at
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
Unless required by applicable law or agreed to in writing,
12+
software distributed under the License is distributed on an
13+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
KIND, either express or implied. See the License for the
15+
specific language governing permissions and limitations
16+
under the License.
17+
-->
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<modelVersion>4.0.0</modelVersion>
21+
<parent>
22+
<groupId>org.apache.netbeans.utilities</groupId>
23+
<artifactId>moduleoverride-parent</artifactId>
24+
<version>1.0-SNAPSHOT</version>
25+
</parent>
26+
27+
<artifactId>moduleoverride-app</artifactId>
28+
<packaging>nbm-application</packaging>
29+
30+
<properties>
31+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
32+
<all.clusters>${project.build.directory}/${brandingToken}</all.clusters>
33+
</properties>
34+
35+
<dependencies>
36+
<dependency>
37+
<groupId>org.netbeans.cluster</groupId>
38+
<artifactId>platform</artifactId>
39+
<version>${netbeans.version}</version>
40+
<type>pom</type>
41+
</dependency>
42+
<dependency>
43+
<groupId>org.netbeans.cluster</groupId>
44+
<artifactId>ide</artifactId>
45+
<version>${netbeans.version}</version>
46+
<type>pom</type>
47+
<exclusions>
48+
<exclusion>
49+
<groupId>org.netbeans.modules</groupId>
50+
<artifactId>org-netbeans-libs-jaxb</artifactId>
51+
</exclusion>
52+
</exclusions>
53+
</dependency>
54+
<dependency>
55+
<groupId>org.netbeans.cluster</groupId>
56+
<artifactId>harness</artifactId>
57+
<version>${netbeans.version}</version>
58+
<type>pom</type>
59+
</dependency>
60+
<dependency>
61+
<groupId>org.netbeans.cluster</groupId>
62+
<artifactId>java</artifactId>
63+
<version>${netbeans.version}</version>
64+
<type>pom</type>
65+
66+
</dependency>
67+
<dependency>
68+
<groupId>org.netbeans.cluster</groupId>
69+
<artifactId>extide</artifactId>
70+
<version>${netbeans.version}</version>
71+
<type>pom</type>
72+
</dependency>
73+
<dependency>
74+
<groupId>org.netbeans.cluster</groupId>
75+
<artifactId>websvccommon</artifactId>
76+
<version>${netbeans.version}</version>
77+
<type>pom</type>
78+
</dependency>
79+
<dependency>
80+
<groupId>org.netbeans.cluster</groupId>
81+
<artifactId>webcommon</artifactId>
82+
<version>${netbeans.version}</version>
83+
<type>pom</type>
84+
</dependency>
85+
<dependency>
86+
<groupId>${project.groupId}</groupId>
87+
<artifactId>moduleoverride-branding</artifactId>
88+
<version>${project.version}</version>
89+
</dependency>
90+
<dependency>
91+
<groupId>org.netbeans.api</groupId>
92+
<artifactId>org-netbeans-modules-nbjunit</artifactId>
93+
<version>${netbeans.version}</version>
94+
<scope>test</scope>
95+
96+
</dependency>
97+
<dependency>
98+
<groupId>${project.groupId}</groupId>
99+
<artifactId>moduleoverride-jaxbwrapper</artifactId>
100+
<version>${project.version}</version>
101+
</dependency>
102+
</dependencies>
103+
104+
<build>
105+
<plugins>
106+
<plugin>
107+
<groupId>org.apache.netbeans.utilities</groupId>
108+
<artifactId>nbm-maven-plugin</artifactId>
109+
<configuration>
110+
<verifyRuntime>fail</verifyRuntime>
111+
<additionalArguments>-J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.text=ALL-UNNAMED -J--add-opens=java.prefs/java.util.prefs=ALL-UNNAMED</additionalArguments>
112+
</configuration>
113+
</plugin>
114+
<!-- Permits NbModuleSuite to be run in integration-test phase: -->
115+
<plugin>
116+
<groupId>org.apache.maven.plugins</groupId>
117+
<artifactId>maven-surefire-plugin</artifactId>
118+
<configuration>
119+
<skipTests>true</skipTests>
120+
<systemPropertyVariables>
121+
<all.clusters>${all.clusters}</all.clusters>
122+
<branding.token>${brandingToken}</branding.token>
123+
</systemPropertyVariables>
124+
</configuration>
125+
</plugin>
126+
</plugins>
127+
</build>
128+
</project>

‎nbm-maven-plugin/src/it/custommoduleoverride/branding/pom.xml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Licensed to the Apache Software Foundation (ASF) under one
4+
or more contributor license agreements. See the NOTICE file
5+
distributed with this work for additional information
6+
regarding copyright ownership. The ASF licenses this file
7+
to you under the Apache License, Version 2.0 (the
8+
"License"); you may not use this file except in compliance
9+
with the License. You may obtain a copy of the License at
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
Unless required by applicable law or agreed to in writing,
12+
software distributed under the License is distributed on an
13+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
KIND, either express or implied. See the License for the
15+
specific language governing permissions and limitations
16+
under the License.
17+
-->
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<modelVersion>4.0.0</modelVersion>
21+
<parent>
22+
<groupId>org.apache.netbeans.utilities</groupId>
23+
<artifactId>moduleoverride-parent</artifactId>
24+
<version>1.0-SNAPSHOT</version>
25+
</parent>
26+
27+
<artifactId>moduleoverride-branding</artifactId>
28+
<packaging>nbm</packaging>
29+
30+
<properties>
31+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
32+
</properties>
33+
34+
<dependencies>
35+
<dependency>
36+
<groupId>org.netbeans.api</groupId>
37+
<artifactId>org-netbeans-api-annotations-common</artifactId>
38+
<version>${netbeans.version}</version>
39+
</dependency>
40+
</dependencies>
41+
42+
<build>
43+
<plugins>
44+
<plugin>
45+
<groupId>org.apache.netbeans.utilities</groupId>
46+
<artifactId>nbm-maven-plugin</artifactId>
47+
</plugin>
48+
<plugin>
49+
<groupId>org.apache.maven.plugins</groupId>
50+
<artifactId>maven-jar-plugin</artifactId>
51+
<configuration>
52+
<!-- to have the jar plugin pickup the nbm generated manifest -->
53+
<archive>
54+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
55+
</archive>
56+
</configuration>
57+
</plugin>
58+
</plugins>
59+
</build>
60+
</project>

‎nbm-maven-plugin/src/it/custommoduleoverride/branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
currentVersion=test module override {0}
19+
LBL_splash_window_title=Starting test module override

‎nbm-maven-plugin/src/it/custommoduleoverride/branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
CTL_MainWindow_Title=test module override {0}
19+
CTL_MainWindow_Title_No_Project=test module override {0}

‎nbm-maven-plugin/src/it/custommoduleoverride/branding/src/main/nbm-branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
LBL_ProductInformation=test module override

‎nbm-maven-plugin/src/it/custommoduleoverride/branding/src/main/nbm/manifest.mf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Manifest-Version: 1.0
2+
AutoUpdate-Essential-Module: true

‎nbm-maven-plugin/src/it/custommoduleoverride/jaxbwrapper/pom.xml

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Licensed to the Apache Software Foundation (ASF) under one
4+
or more contributor license agreements. See the NOTICE file
5+
distributed with this work for additional information
6+
regarding copyright ownership. The ASF licenses this file
7+
to you under the Apache License, Version 2.0 (the
8+
"License"); you may not use this file except in compliance
9+
with the License. You may obtain a copy of the License at
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
Unless required by applicable law or agreed to in writing,
12+
software distributed under the License is distributed on an
13+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
KIND, either express or implied. See the License for the
15+
specific language governing permissions and limitations
16+
under the License.
17+
-->
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
19+
<modelVersion>4.0.0</modelVersion>
20+
<parent>
21+
<groupId>org.apache.netbeans.utilities</groupId>
22+
<artifactId>moduleoverride-parent</artifactId>
23+
<version>1.0-SNAPSHOT</version>
24+
</parent>
25+
<artifactId>moduleoverride-jaxbwrapper</artifactId>
26+
<packaging>nbm</packaging>
27+
<dependencies>
28+
<dependency>
29+
<groupId>jakarta.xml.bind</groupId>
30+
<artifactId>jakarta.xml.bind-api</artifactId>
31+
<version>4.0.2</version>
32+
<exclusions>
33+
<exclusion>
34+
<groupId>jakarta.activation</groupId>
35+
<artifactId>jakarta.activation-api</artifactId>
36+
</exclusion>
37+
</exclusions>
38+
</dependency>
39+
<dependency>
40+
<groupId>com.sun.xml.bind</groupId>
41+
<artifactId>jaxb-impl</artifactId>
42+
<version>4.0.5</version>
43+
<exclusions>
44+
<exclusion>
45+
<groupId>jakarta.activation</groupId>
46+
<artifactId>jakarta.activation-api</artifactId>
47+
</exclusion>
48+
</exclusions>
49+
</dependency>
50+
<dependency>
51+
<groupId>jakarta.activation</groupId>
52+
<artifactId>jakarta.activation-api</artifactId>
53+
<version>2.1.2</version>
54+
</dependency>
55+
56+
</dependencies>
57+
<build>
58+
59+
<plugins>
60+
<plugin>
61+
<groupId>org.apache.netbeans.utilities</groupId>
62+
<artifactId>nbm-maven-plugin</artifactId>
63+
<extensions>true</extensions>
64+
<configuration>
65+
<codeNameBase>org.netbeans.libs.jaxb</codeNameBase>
66+
<cluster>${clustername}</cluster>
67+
<useOSGiDependencies>false</useOSGiDependencies>
68+
<publicPackages>
69+
<publicPackage>jakarta.xml.*</publicPackage>
70+
<publicPackage>jakarta.xml.bind.annotation.*</publicPackage>
71+
<publicPackage>jakarta.activation.*</publicPackage>
72+
</publicPackages>
73+
</configuration>
74+
</plugin>
75+
<plugin>
76+
<groupId>org.apache.maven.plugins</groupId>
77+
<artifactId>maven-jar-plugin</artifactId>
78+
<configuration>
79+
<archive>
80+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
81+
</archive>
82+
</configuration>
83+
</plugin>
84+
</plugins>
85+
</build>
86+
</project>

‎nbm-maven-plugin/src/it/custommoduleoverride/jaxbwrapper/src/main/nbm/manifest.mf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
OpenIDE-Module-Provides: com.sun.xml.bind
2+
OpenIDE-Module: org.netbeans.libs.jaxb/1

0 commit comments

Comments
 (0)