Skip to content

Commit

Permalink
* Add missing presets/package-info.java required for OSGi and add …
Browse files Browse the repository at this point in the history
…profile for M2Eclipse (pull #490)
  • Loading branch information
reckart committed Jun 3, 2021
1 parent 4352581 commit d943c8f
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

* Add missing `presets/package-info.java` required for OSGi and add profile for M2Eclipse ([pull #490](https://github.com/bytedeco/javacpp/pull/490))
* Remove unnecessary mutex lock for pthreads on callbacks in `Generator` ([pull #489](https://github.com/bytedeco/javacpp/pull/489))
* Fix `@AsUtf16` handling for setter methods paired with getters in `Generator` ([pull #488](https://github.com/bytedeco/javacpp/pull/488))
* Allow defining `NO_JNI_DETACH_THREAD` to avoid overhead from pthreads on callbacks ([issue #486](https://github.com/bytedeco/javacpp/issues/486))
Expand Down
67 changes: 67 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,73 @@ Import-Package: \
</plugins>
</build>
</profile>

<!-- *********************************** -->
<!-- * Eclipse: m2e lifecycle bindings * -->
<!-- *********************************** -->
<profile>
<id>m2e</id>
<activation>
<property>
<name>m2e.version</name>
</property>
</activation>
<build>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<!-- *********************************************** -->
<!-- The Maven Dev Connector for Eclipse m2e is no -->
<!-- longer maintained. We copy the relevant part -->
<!-- of the lifecycle mapping for the -->
<!-- maven-plugin-plugin here. -->
<!-- -->
<!-- See https://github.com/ifedorenko/com.ifedorenko.m2e.mavendev/blob/master/com.ifedorenko.m2e.mavendev/lifecycle-mapping-metadata.xml -->
<!-- *********************************************** -->
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<versionRange>[3.5.2,)</versionRange>
<goals>
<goal>descriptor</goal>
</goals>
</pluginExecutionFilter>
<action>
<execute>
<runOnIncremental>false</runOnIncremental>
</execute>
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<versionRange>[3.5.2,)</versionRange>
<goals>
<goal>helpmojo</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
</profiles>

</project>
5 changes: 5 additions & 0 deletions src/main/java/org/bytedeco/javacpp/presets/package-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/**
* Contains base presets which can be inherited.
*/
@org.osgi.annotation.bundle.Export
package org.bytedeco.javacpp.presets;

0 comments on commit d943c8f

Please sign in to comment.