Skip to content

Commit

Permalink
Merge pull request #598 from bhamail/master
Browse files Browse the repository at this point in the history 
replace tabs with spaces, format pom files using: mvn tidy:pom
  • Loading branch information
@bhamail
bhamail committed Feb 17, 2016
2 parents b3776b2 + daf5b07 commit 35cd6cf
Show file tree
Hide file tree
Showing 2 changed files with 86 additions and 84 deletions.
89 changes: 46 additions & 43 deletions native/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,51 +4,54 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>net.java.dev.jna</groupId>
<artifactId>parent</artifactId>
<version>4.3.0-SNAPHSOT</version>
<relativePath>../parent</relativePath>
</parent>

<artifactId>native</artifactId>
<packaging>pom</packaging>

<name>net.java.dev.jna:native</name>

<parent>
<groupId>net.java.dev.jna</groupId>
<artifactId>parent</artifactId>
<version>4.3.0-SNAPHSOT</version>
<relativePath>../parent</relativePath>
</parent>

<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>compile-native-library</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<ant dir="${project.basedir}" target="install" inheritRefs="true" useNativeBasedir="true">
<!-- see http://stackoverflow.com/questions/2022622/java-home-gets-mangled-by-maven -->
<!-- property name="build.compiler" value="extJavac"/ -->
</ant>
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <!-- do not install the POM or artifacts since they are embedded inside the JAR -->
<artifactId>maven-install-plugin</artifactId>
<configuration> <!-- TODO consider installing the DLL(s) and using their settings.localRepository location -->
<skip>true</skip>
</configuration>
</plugin>
<plugin> <!-- do not deploy the POM or artifacts since they are embedded inside the JAR -->
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>compile-native-library</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<ant dir="${project.basedir}" target="install" inheritRefs="true"
useNativeBasedir="true">
<!-- see http://stackoverflow.com/questions/2022622/java-home-gets-mangled-by-maven -->
<!-- property name="build.compiler" value="extJavac"/ -->
</ant>
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <!-- do not install the POM or artifacts since they are embedded inside the JAR -->
<artifactId>maven-install-plugin</artifactId>
<configuration> <!-- TODO consider installing the DLL(s) and using their settings.localRepository location -->
<skip>true</skip>
</configuration>
</plugin>
<plugin> <!-- do not deploy the POM or artifacts since they are embedded inside the JAR -->
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
81 changes: 40 additions & 41 deletions parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,50 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>net.java.dev.jna</groupId>
<artifactId>parent</artifactId>
<version>4.3.0-SNAPHSOT</version>
<packaging>pom</packaging>

<name>net.java.dev.jna:parent</name>
<url>https://github.com/java-native-access/jna</url>
<licenses>
<license>
<name>LGPL, version 2.1</name>
<url>http://www.gnu.org/licenses/licenses.html</url>
<distribution>repo</distribution>
</license>
<license>
<name>ASL, version 2</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<developers>
<developer>
<id>twall</id>
<name>Timothy Wall</name>
<roles>
<role>Owner</role>
</roles>
</developer>
</developers>

<prerequisites>
<maven>${min.required.maven.version}</maven>
</prerequisites>

<modules>
<module>../native</module>
</modules>

<scm>
<connection>scm:git:https://github.com/java-native-access/jna</connection>
<developerConnection>scm:git:ssh://[email protected]/java-native-access/jna.git</developerConnection>
<url>https://github.com/java-native-access/jna</url>
</scm>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -41,10 +79,6 @@
<javadoc.plugin.version>2.10.1</javadoc.plugin.version>
</properties>

<prerequisites>
<maven>${min.required.maven.version}</maven>
</prerequisites>

<dependencyManagement>
<dependencies>
<dependency>
Expand All @@ -56,38 +90,8 @@
</dependencies>
</dependencyManagement>

<licenses>
<license>
<name>LGPL, version 2.1</name>
<url>http://www.gnu.org/licenses/licenses.html</url>
<distribution>repo</distribution>
</license>
<license>
<name>ASL, version 2</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<scm>
<connection>scm:git:https://github.com/java-native-access/jna</connection>
<developerConnection>scm:git:ssh://[email protected]/java-native-access/jna.git</developerConnection>
<url>https://github.com/java-native-access/jna</url>
</scm>

<developers>
<developer>
<id>twall</id>
<name>Timothy Wall</name>
<roles>
<role>Owner</role>
</roles>
</developer>
</developers>

<build>
<defaultGoal>package</defaultGoal>

<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse
Expand All @@ -110,7 +114,7 @@
</goals>
</pluginExecutionFilter>
<action>
<execute />
<execute/>
</action>
</pluginExecution>
<pluginExecution>
Expand All @@ -125,7 +129,7 @@
</goals>
</pluginExecutionFilter>
<action>
<execute />
<execute/>
</action>
</pluginExecution>
</pluginExecutions>
Expand Down Expand Up @@ -222,7 +226,6 @@
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
Expand Down Expand Up @@ -273,10 +276,6 @@
</plugins>
</build>

<modules>
<module>../native</module>
</modules>

<reporting>
<plugins>
<plugin>
Expand Down

0 comments on commit 35cd6cf

Please sign in to comment.