Skip to content

Commit

Permalink
Format and unify whitespace in pom.xml files
Browse files Browse the repository at this point in the history
  • Loading branch information
@HannesWell
HannesWell committed Jan 17, 2024
1 parent 0032340 commit c3195fb
Show file tree
Hide file tree
Showing 3 changed files with 101 additions and 94 deletions.
5 changes: 3 additions & 2 deletions examples/org.eclipse.swt.examples.ole.win32/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
Contributors:
Igor Fedorenko - initial implementation
-->
<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">
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>eclipse.platform.swt</artifactId>
Expand All @@ -27,7 +29,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
<environments>
<environment>
Expand Down
182 changes: 92 additions & 90 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@
Contributors:
Igor Fedorenko - initial implementation
Conrad Groth - add platform specific JUnit test bundles
Conrad Groth - add platform specific JUnit test bundles
-->
<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">
<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">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand Down Expand Up @@ -46,7 +48,7 @@
To build individual bundles, we specify a repository where to find parent pom,
in case it is not in local maven cache already
and that parent pom also has fuller individual-bundle profile
defined that is combined with this one. -->
defined that is combined with this one. -->
<profiles>
<profile>
<id>build-individual-bundles</id>
Expand All @@ -63,20 +65,20 @@
</repository>
</repositories>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
<dependency-resolution>
<profileProperties>
<org.eclipse.swt.buildtime>true</org.eclipse.swt.buildtime>
</profileProperties>
</dependency-resolution>
</configuration>
</plugin>
</plugins>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
<dependency-resolution>
<profileProperties>
<org.eclipse.swt.buildtime>true</org.eclipse.swt.buildtime>
</profileProperties>
</dependency-resolution>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
Expand All @@ -86,69 +88,69 @@
<family>mac</family>
</os>
</activation>
<modules>
<module>tests/org.eclipse.swt.tests.cocoa</module>
</modules>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
<environments>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>aarch64</arch>
</environment>
</environments>
</configuration>
</plugin>
</plugins>
<modules>
<module>tests/org.eclipse.swt.tests.cocoa</module>
</modules>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
<environments>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>aarch64</arch>
</environment>
</environments>
</configuration>
</plugin>
</plugins>
</build>
<properties>
<os-jvm-flags>-XstartOnFirstThread</os-jvm-flags>
</properties>
<properties>
<os-jvm-flags>-XstartOnFirstThread</os-jvm-flags>
</properties>
</profile>
<profile>
<id>unix</id>
<activation>
<os>
<family>unix</family>
<name>Linux</name>
</os>
</os>
</activation>
<modules>
<module>tests/org.eclipse.swt.tests.gtk</module>
</modules>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
<environments>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>ppc64le</arch>
</environment>
</environments>
</configuration>
</plugin>
</plugins>
<modules>
<module>tests/org.eclipse.swt.tests.gtk</module>
</modules>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
<environments>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>ppc64le</arch>
</environment>
</environments>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
Expand All @@ -158,25 +160,25 @@
<family>windows</family>
</os>
</activation>
<modules>
<module>tests/org.eclipse.swt.tests.win32</module>
</modules>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<configuration>
<environments>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
</environments>
</configuration>
</plugin>
</plugins>
<modules>
<module>tests/org.eclipse.swt.tests.win32</module>
</modules>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<configuration>
<environments>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
</environments>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
Expand Down
8 changes: 6 additions & 2 deletions tests/org.eclipse.swt.tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
Contributors:
Igor Fedorenko - initial implementation
-->
<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">
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>eclipse.platform.swt.localbuild</artifactId>
Expand Down Expand Up @@ -41,7 +43,9 @@
<executions>
<execution>
<id>test</id>
<goals><goal>test</goal></goals>
<goals>
<goal>test</goal>
</goals>
<phase>integration-test</phase>
<configuration>
<testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
Expand Down

0 comments on commit c3195fb

Please sign in to comment.