Skip to content

Commit

Permalink
OK-443 flatten plugin takaisin
Browse files Browse the repository at this point in the history
  • Loading branch information
marjakari committed Dec 16, 2024
1 parent 44cb0b7 commit 4336dd9
Show file tree
Hide file tree
Showing 13 changed files with 41 additions and 41 deletions.
4 changes: 2 additions & 2 deletions integraatio/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<parent>
<groupId>fi.oph.viestinvalitys</groupId>
<artifactId>viestinvalityspalvelu</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
</parent>

<artifactId>integraatio</artifactId>
<packaging>jar</packaging>
<name>integraatio</name>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
54 changes: 27 additions & 27 deletions kirjasto/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>fi.oph.viestinvalitys</groupId>
<artifactId>viestinvalityspalvelu</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
</parent>
<artifactId>kirjasto</artifactId>
<packaging>jar</packaging>
Expand All @@ -18,7 +18,7 @@
<dependency>
<groupId>fi.oph.viestinvalitys</groupId>
<artifactId>lahetysrajapinta</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>fi.vm.sade.java-utils</groupId>
Expand Down Expand Up @@ -102,31 +102,31 @@
</execution>
</executions>
</plugin>
<!-- <plugin>-->
<!-- <groupId>org.codehaus.mojo</groupId>-->
<!-- <artifactId>flatten-maven-plugin</artifactId>-->
<!-- <version>1.6.0</version>-->
<!-- <configuration>-->
<!-- </configuration>-->
<!-- <executions>-->
<!-- &lt;!&ndash; enable flattening &ndash;&gt;-->
<!-- <execution>-->
<!-- <id>flatten</id>-->
<!-- <phase>process-resources</phase>-->
<!-- <goals>-->
<!-- <goal>flatten</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- &lt;!&ndash; ensure proper cleanup &ndash;&gt;-->
<!-- <execution>-->
<!-- <id>flatten.clean</id>-->
<!-- <phase>clean</phase>-->
<!-- <goals>-->
<!-- <goal>clean</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.6.0</version>
<configuration>
</configuration>
<executions>
<!-- enable flattening -->
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<!-- ensure proper cleanup -->
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion lahetysrajapinta/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>fi.oph.viestinvalitys</groupId>
<artifactId>viestinvalityspalvelu</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
</parent>

<artifactId>lahetysrajapinta</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion lambdat/ajastus/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>fi.oph.viestinvalitys</groupId>
<artifactId>viestinvalityspalvelu</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lambdat/lahetys/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>fi.oph.viestinvalitys</groupId>
<artifactId>viestinvalityspalvelu</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lambdat/migraatio/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>fi.oph.viestinvalitys</groupId>
<artifactId>viestinvalityspalvelu</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lambdat/raportointi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>fi.oph.viestinvalitys</groupId>
<artifactId>viestinvalityspalvelu</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lambdat/siivous/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>fi.oph.viestinvalitys</groupId>
<artifactId>viestinvalityspalvelu</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lambdat/skannaus/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>fi.oph.viestinvalitys</groupId>
<artifactId>viestinvalityspalvelu</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lambdat/tilapaivitys/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>fi.oph.viestinvalitys</groupId>
<artifactId>viestinvalityspalvelu</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lambdat/vastaanotto/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>fi.oph.viestinvalitys</groupId>
<artifactId>viestinvalityspalvelu</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>fi.oph.viestinvalitys</groupId>
<artifactId>viestinvalityspalvelu</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>viestinvalityspalvelu</name>
<modules>
Expand All @@ -21,7 +21,7 @@
</modules>

<properties>
<revision>1.0.2-SNAPSHOT</revision>
<revision>1.0.3-SNAPSHOT</revision>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<encoding>UTF-8</encoding>
Expand Down
2 changes: 1 addition & 1 deletion shared/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>fi.oph.viestinvalitys</groupId>
<artifactId>viestinvalityspalvelu</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
</parent>

<artifactId>shared</artifactId>
Expand Down

0 comments on commit 4336dd9

Please sign in to comment.