Skip to content

Commit

Permalink
Issue faktorips#13 make the build use a public parent pom
Browse files Browse the repository at this point in the history
  • Loading branch information
Christoph Läubrich committed Feb 8, 2022
1 parent eb33fb1 commit fdd9a5a
Show file tree
Hide file tree
Showing 21 changed files with 279 additions and 306 deletions.
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
target
target/

# files generated (temporary) by the tycho maven builds
.polyglot.*
.META-INF_*
pom.tycho
.tycho-consumer-pom.xml
8 changes: 8 additions & 0 deletions .mvn/extensions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<extensions>
<extension>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-build</artifactId>
<version>2.7.0-SNAPSHOT</version>
</extension>
</extensions>
1 change: 1 addition & 0 deletions .mvn/maven.config
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-Dtycho.localArtifacts=ignore
21 changes: 13 additions & 8 deletions faktorips-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@
<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>

<groupId>org.faktorips</groupId>
<parent>
<groupId>org.faktorips</groupId>
<artifactId>base</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>


<artifactId>faktorips-maven-plugin</artifactId>
<version>22.6.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
Expand All @@ -25,9 +31,8 @@
<jdk.version>11</jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<tycho-version>2.4.0</tycho-version>
<tycho-extras-version>2.4.0</tycho-extras-version>
<!-- TODO should there be a different version for build and dependency? -->
<tycho-dependency-version>2.4.0</tycho-dependency-version>
<maven-plugin-api-version>3.6.3</maven-plugin-api-version>
<maven-plugin-annotations-version>3.6.0</maven-plugin-annotations-version>
<maven-deploy-plugin-version>2.8.2</maven-deploy-plugin-version>
Expand Down Expand Up @@ -58,12 +63,12 @@
<dependency>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-extras-version}</version>
<version>${tycho-dependency-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.tycho</groupId>
<artifactId>sisu-equinox-launching</artifactId>
<version>${tycho-version}</version>
<version>${tycho-dependency-version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
Expand Down Expand Up @@ -128,8 +133,8 @@
</extension>
<extension>
<groupId>org.faktorips</groupId>
<artifactId>org.faktorips.build.config</artifactId>
<version>1.2.2</version>
<artifactId>codequality-config</artifactId>
<version>1.0.0-SNAPSHOT</version>
</extension>
</extensions>
<pluginManagement>
Expand Down
1 change: 0 additions & 1 deletion org.faktorips.aggregator/plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>org.faktorips</groupId>
<artifactId>org.faktorips.aggregator.plugins</artifactId>
<packaging>pom</packaging>

Expand Down
56 changes: 15 additions & 41 deletions org.faktorips.aggregator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,35 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.faktorips</groupId>
<artifactId>base</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>

<properties>
<git.user>${user.name}</git.user>
<java.version>11</java.version>
<target-platform>eclipse-2019-03</target-platform>
<checkstyle.header.file>${project.basedir}/../org.faktorips.aggregator/checkstyle.java.header</checkstyle.header.file>
</properties>

<groupId>org.faktorips</groupId>
<artifactId>org.faktorips.aggregator</artifactId>
<version>22.6.0-SNAPSHOT</version>
<packaging>pom</packaging>

<parent>
<groupId>de.faktorzehn</groupId>
<artifactId>faktorzehn-tycho-build</artifactId>
<version>1.3.0</version>
</parent>

<!-- These are all modules that are included in the Faktor-IPS build -->

<modules>
<module>targets</module>
<module>features</module>
<module>plugins</module>
<module>nexus8</module>
<module>nexus11</module>
<module>features</module>
<module>tests</module>
<!-- <module>nexus8</module> -->
<!-- <module>nexus11</module> -->
<module>../faktorips-maven-archetype</module>
<module>../faktorips-maven-plugin</module>
<module>../faktorips-documentation</module>
<module>../faktorips-schemas</module>
<module>sites</module>
<module>../faktorips-coverage</module>
<!-- <module>sites</module> -->
</modules>

<scm>
Expand All @@ -47,10 +43,14 @@
<build>

<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-versions-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<artifacts>
${project.artifactId},
Expand All @@ -63,32 +63,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<configuration>
<target>
<artifact>
<groupId>org.faktorips</groupId>
<artifactId>${target-platform}</artifactId>
<version>1.0.0-SNAPSHOT</version>
</artifact>
</target>
<environments>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
</environments>
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down
20 changes: 0 additions & 20 deletions org.faktorips.aggregator/targets/2019-03/pom.xml

This file was deleted.

20 changes: 0 additions & 20 deletions org.faktorips.aggregator/targets/2019-06/pom.xml

This file was deleted.

20 changes: 0 additions & 20 deletions org.faktorips.aggregator/targets/2019-09/pom.xml

This file was deleted.

20 changes: 0 additions & 20 deletions org.faktorips.aggregator/targets/2019-12/pom.xml

This file was deleted.

20 changes: 0 additions & 20 deletions org.faktorips.aggregator/targets/2020-03/pom.xml

This file was deleted.

20 changes: 0 additions & 20 deletions org.faktorips.aggregator/targets/2020-06/pom.xml

This file was deleted.

20 changes: 0 additions & 20 deletions org.faktorips.aggregator/targets/2020-09/pom.xml

This file was deleted.

20 changes: 0 additions & 20 deletions org.faktorips.aggregator/targets/2020-12/pom.xml

This file was deleted.

20 changes: 0 additions & 20 deletions org.faktorips.aggregator/targets/2021-03/pom.xml

This file was deleted.

20 changes: 0 additions & 20 deletions org.faktorips.aggregator/targets/2021-06/pom.xml

This file was deleted.

0 comments on commit fdd9a5a

Please sign in to comment.