Skip to content

Replace remote resource plugin with license plugin #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pavelhoral merged 1 commit into from
Feb 18, 2026
Merged

Replace remote resource plugin with license plugin #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ Significant dependency updates:
* Grizzly - from 2.3.35 to 4.0.2
* Protobuf - from 3.0.2 to 3.25.8

Change in license file fetching:

* logic moved from maven-remote-resources-plugin to license-maven-plugin:
* the license plugin needs to be defined in connector projects instead of the former one


# 1.5.3.0

Expand Down
51 changes: 29 additions & 22 deletions bundle-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@
</description>

<properties>
<licenseResourceBundle>org.wrensecurity.wrenicf:license:${project.version}</licenseResourceBundle>

<!-- Connector framework compatibility -->
<framework.compatibilityVersion>1.5</framework.compatibilityVersion>
<framework.releaseVersion>4.0</framework.releaseVersion>
Expand Down Expand Up @@ -233,26 +231,6 @@
</configuration>
</plugin>

<!-- We want to package up license resources in the JARs produced -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>

<executions>
<execution>
<goals>
<goal>process</goal>
</goals>

<configuration>
<resourceBundles>
<resourceBundle>${licenseResourceBundle}</resourceBundle>
</resourceBundles>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down Expand Up @@ -314,6 +292,35 @@
</configuration>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>

<dependencies>
<dependency>
<groupId>org.wrensecurity.wrenicf</groupId>
<artifactId>license</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<executions>
<execution>
<id>update-project-license</id>

<goals>
<goal>update-project-license</goal>
</goals>

<configuration>
<licenseFile>${project.build.outputDirectory}/CDDLv1.1.txt</licenseFile>
<licenseName>cddl_v1_1</licenseName>
<licenseResolver>classpath://META-INF/wrensec-licenses</licenseResolver>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.forgerock.maven.plugins</groupId>
<artifactId>openicf-maven-plugin</artifactId>
Expand Down
21 changes: 0 additions & 21 deletions framework-license/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,28 +34,7 @@
</description>

<build>
<resources>
<!-- Include top-level legal folder to keep things simple -->
<resource>
<directory>../legal</directory>
<targetPath>legal-notices</targetPath>
</resource>
</resources>

<plugins>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>

<executions>
<execution>
<?m2e execute onConfiguration?>
<goals>
<goal>bundle</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
Expand Down
13 changes: 13 additions & 0 deletions framework-license/src/main/resources/META-INF/wrensec-licenses/cddl_v1_1/header.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
The contents of this file are subject to the terms of the Common Development and
Distribution License (the License). You may not use this file except in compliance with the
License.

You can obtain a copy of the License at legal/CDDLv1.1.txt. See the License for the
specific language governing permission and limitations under the License.

When distributing Covered Software, include this CDDL Header Notice in each file and include
the License file at legal/CDDLv1.1.txt. If applicable, add the following below the CDDL
Header, with the fields enclosed by brackets [] replaced by your own identifying
information: "Portions copyright [year] [name of copyright owner]".

[COPYRIGHT LINES]
0 legal/CDDLv1.1.txt → ...NF/wrensec-licenses/cddl_v1_1/license.txt
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions framework-license/src/main/resources/META-INF/wrensec-licenses/licenses.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cddl_v1_1=Common Development and Distribution License (CDDL) version 1.1
29 changes: 0 additions & 29 deletions framework-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,35 +172,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>

<executions>
<execution>
<id>legal-files</id>

<goals>
<goal>process</goal>
</goals>

<configuration>
<resourceBundles>
<resourceBundle>org.wrensecurity.wrenicf:license:${project.version}</resourceBundle>
</resourceBundles>
</configuration>
</execution>
</executions>

<dependencies>
<dependency>
<groupId>org.wrensecurity.wrenicf</groupId>
<artifactId>license</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
Loading