From 5aacefb692d1bf0bc63c6f4532639a63a56f4bbb Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Wed, 5 Jul 2023 16:20:10 +0200
Subject: [PATCH] Fix inconsistent indents and formatting in build scripts
---
org.eventb.texteditor.feature/pom.xml | 28 ++++----
org.eventb.texteditor.parent/pom.xml | 45 ++++++------
org.eventb.texteditor.parsers/build.gradle | 10 ++-
org.eventb.texteditor.parsers/pom.xml | 71 +++++++++----------
org.eventb.texteditor.repository/category.xml | 11 ++-
org.eventb.texteditor.repository/pom.xml | 32 ++++-----
org.eventb.texteditor.ui/pom.xml | 26 ++++---
org.eventb.texttools/pom.xml | 26 ++++---
8 files changed, 116 insertions(+), 133 deletions(-)
diff --git a/org.eventb.texteditor.feature/pom.xml b/org.eventb.texteditor.feature/pom.xml
index 0f93474..b6cee1b 100644
--- a/org.eventb.texteditor.feature/pom.xml
+++ b/org.eventb.texteditor.feature/pom.xml
@@ -1,16 +1,16 @@
-
<?xml version="1.0" encoding="UTF-8"?>
- <project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.eventb.texteditor</groupId>
- <artifactId>org.eventb.texteditor.parent</artifactId>
- <version>3.4.1.qualifier</version>
- <relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
- </parent>
+<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>
<groupId>org.eventb.texteditor</groupId>
- <artifactId>org.eventb.texteditor.feature</artifactId>
- <version>3.4.1-SNAPSHOT</version>
- <packaging>eclipse-feature</packaging>
- </project>
+ <artifactId>org.eventb.texteditor.parent</artifactId>
+ <version>3.4.1.qualifier</version>
+ <relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.eventb.texteditor</groupId>
+ <artifactId>org.eventb.texteditor.feature</artifactId>
+ <version>3.4.1-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+</project>
diff --git a/org.eventb.texteditor.parent/pom.xml b/org.eventb.texteditor.parent/pom.xml
index 653b725..46cff66 100644
--- a/org.eventb.texteditor.parent/pom.xml
+++ b/org.eventb.texteditor.parent/pom.xml
@@ -3,34 +3,33 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eventb.texteditor</groupId>
- <artifactId>org.eventb.texteditor.parent</artifactId>
- <version>3.4.1.qualifier</version>
+ <artifactId>org.eventb.texteditor.parent</artifactId>
+ <version>3.4.1.qualifier</version>
<packaging>pom</packaging>
<!-- this is the parent POM from which all modules inherit common settings -->
- <repositories>
- <!-- configure p2 repository to resolve against -->
- <repository>
- <id>targetRepository0</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/releases/2020-06</url>
- </repository>
-
- <repository>
- <id>targetRepository1</id>
- <layout>p2</layout>
- <url>http://rodin-b-sharp.sourceforge.net/updates</url>
- </repository>
-
- <repository>
- <id>targetRepository2</id>
- <layout>p2</layout>
- <url>https://stups.hhu-hosting.de/buildlibs/org.rodinp.dev</url>
- </repository>
-
- </repositories>
+ <repositories>
+ <!-- configure p2 repository to resolve against -->
+ <repository>
+ <id>targetRepository0</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/releases/2020-06</url>
+ </repository>
+
+ <repository>
+ <id>targetRepository1</id>
+ <layout>p2</layout>
+ <url>http://rodin-b-sharp.sourceforge.net/updates</url>
+ </repository>
+
+ <repository>
+ <id>targetRepository2</id>
+ <layout>p2</layout>
+ <url>https://stups.hhu-hosting.de/buildlibs/org.rodinp.dev</url>
+ </repository>
+ </repositories>
<build>
<plugins>
diff --git a/org.eventb.texteditor.parsers/build.gradle b/org.eventb.texteditor.parsers/build.gradle
index a070b04..e2ace04 100644
--- a/org.eventb.texteditor.parsers/build.gradle
+++ b/org.eventb.texteditor.parsers/build.gradle
@@ -1,19 +1,17 @@
apply plugin: 'java'
repositories {
- mavenCentral()
+ mavenCentral()
}
def parser_version = '2.4.40'
dependencies {
- compile group: "de.hhu.stups", name: "bparser", version: parser_version, changing: true
- compile group: "de.hhu.stups", name: "eventbstruct", version: parser_version, changing: true
- compile 'com.google.guava:guava:14.0.1'// Apache Licence 2.0
+ compile group: "de.hhu.stups", name: "bparser", version: parser_version, changing: true
+ compile group: "de.hhu.stups", name: "eventbstruct", version: parser_version, changing: true
+ compile 'com.google.guava:guava:14.0.1'// Apache Licence 2.0
}
-
-
task collectDependencies(type: Copy) {
from configurations.compile
from configurations.runtime
diff --git a/org.eventb.texteditor.parsers/pom.xml b/org.eventb.texteditor.parsers/pom.xml
index 1a03849..c87608b 100644
--- a/org.eventb.texteditor.parsers/pom.xml
+++ b/org.eventb.texteditor.parsers/pom.xml
@@ -1,42 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
- <groupId>org.eventb.texteditor</groupId>
- <artifactId>org.eventb.texteditor.parent</artifactId>
- <version>3.4.1.qualifier</version>
- </parent>
+ <parent>
+ <relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
+ <groupId>org.eventb.texteditor</groupId>
+ <artifactId>org.eventb.texteditor.parent</artifactId>
+ <version>3.4.1.qualifier</version>
+ </parent>
- <artifactId>org.eventb.texteditor.parsers</artifactId>
- <version>3.4.1-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.4.0</version>
- <configuration>
- <executable>./gradlew</executable>
- <arguments>
- <argument>collectDependencies</argument>
- </arguments>
- </configuration>
- <executions>
- <execution>
- <!-- You can bind this to any phase you like -->
- <phase>validate</phase>
- <goals>
- <!-- goal must be "invoke" -->
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
-</build>
+ <artifactId>org.eventb.texteditor.parsers</artifactId>
+ <version>3.4.1-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.4.0</version>
+ <configuration>
+ <executable>./gradlew</executable>
+ <arguments>
+ <argument>collectDependencies</argument>
+ </arguments>
+ </configuration>
+ <executions>
+ <execution>
+ <!-- You can bind this to any phase you like -->
+ <phase>validate</phase>
+ <goals>
+ <!-- goal must be "invoke" -->
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/org.eventb.texteditor.repository/category.xml b/org.eventb.texteditor.repository/category.xml
index 88d2853..86bae61 100644
--- a/org.eventb.texteditor.repository/category.xml
+++ b/org.eventb.texteditor.repository/category.xml
@@ -1,15 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
+ <feature url="features/org.eventb.texteditor.feature_3.4.1.qualifier.jar" id="org.eventb.texteditor.feature" version="3.4.1.qualifier">
+ <category name="org.eventb.texteditor.feature.category"/>
+ </feature>
-
- <feature url="features/org.eventb.texteditor.feature_3.4.1.qualifier.jar" id="org.eventb.texteditor.feature" version="3.4.1.qualifier">
- <category name="org.eventb.texteditor.feature.category"/>
- </feature>
-
-<category-def name="org.eventb.texteditor.feature.category" label="Camille Text Editor">
+ <category-def name="org.eventb.texteditor.feature.category" label="Camille Text Editor">
<description>
null
</description>
</category-def>
-
</site>
diff --git a/org.eventb.texteditor.repository/pom.xml b/org.eventb.texteditor.repository/pom.xml
index 3a33bef..e7e9915 100644
--- a/org.eventb.texteditor.repository/pom.xml
+++ b/org.eventb.texteditor.repository/pom.xml
@@ -1,21 +1,15 @@
-
<?xml version="1.0" encoding="UTF-8"?>
- <project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.eventb.texteditor</groupId>
- <artifactId>org.eventb.texteditor.parent</artifactId>
- <version>3.4.1.qualifier</version>
- <relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
- </parent>
-
-
- <groupId>org.eventb.texteditor</groupId>
- <artifactId>org.eventb.texteditor.repository</artifactId>
- <version>3.4.1.qualifier</version>
- <packaging>eclipse-repository</packaging>
-
-
-
+<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>
+ <groupId>org.eventb.texteditor</groupId>
+ <artifactId>org.eventb.texteditor.parent</artifactId>
+ <version>3.4.1.qualifier</version>
+ <relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.eventb.texteditor</groupId>
+ <artifactId>org.eventb.texteditor.repository</artifactId>
+ <version>3.4.1.qualifier</version>
+ <packaging>eclipse-repository</packaging>
</project>
diff --git a/org.eventb.texteditor.ui/pom.xml b/org.eventb.texteditor.ui/pom.xml
index d3e2389..fcda5ad 100644
--- a/org.eventb.texteditor.ui/pom.xml
+++ b/org.eventb.texteditor.ui/pom.xml
@@ -1,18 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
- <project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eventb.texteditor</groupId>
- <artifactId>org.eventb.texteditor.parent</artifactId>
- <version>3.4.1.qualifier</version>
- <relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
- </parent>
+<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>
<groupId>org.eventb.texteditor</groupId>
- <artifactId>org.eventb.texteditor.ui</artifactId>
- <version>3.4.1-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
+ <artifactId>org.eventb.texteditor.parent</artifactId>
+ <version>3.4.1.qualifier</version>
+ <relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
+ </parent>
- </project>
+ <groupId>org.eventb.texteditor</groupId>
+ <artifactId>org.eventb.texteditor.ui</artifactId>
+ <version>3.4.1-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/org.eventb.texttools/pom.xml b/org.eventb.texttools/pom.xml
index 66f7d60..ecc87e4 100644
--- a/org.eventb.texttools/pom.xml
+++ b/org.eventb.texttools/pom.xml
@@ -1,18 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
- <project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eventb.texteditor</groupId>
- <artifactId>org.eventb.texteditor.parent</artifactId>
- <version>3.4.1.qualifier</version>
- <relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
- </parent>
+<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>
<groupId>org.eventb.texteditor</groupId>
- <artifactId>org.eventb.texttools</artifactId>
- <version>3.4.1-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
+ <artifactId>org.eventb.texteditor.parent</artifactId>
+ <version>3.4.1.qualifier</version>
+ <relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
+ </parent>
- </project>
+ <groupId>org.eventb.texteditor</groupId>
+ <artifactId>org.eventb.texttools</artifactId>
+ <version>3.4.1-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
--
GitLab