Skip to content

Commit

Permalink
Merge branch 'release/2.0.0-RC4'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Aklakan
Aklakan committed Oct 15, 2024
2 parents a234e84 + 932fb94 commit e0f4ef4
Show file tree
Hide file tree
Showing 15 changed files with 22 additions and 23 deletions.
2 changes: 1 addition & 1 deletion lsq-cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.aksw.simba.lsq</groupId>
<artifactId>lsq-parent</artifactId>
<version>2.0.0-RC3</version>
<version>2.0.0-RC4</version>
</parent>

<!-- scm section needs to be duplicated on child module for github-release-plugin;
Expand Down
2 changes: 1 addition & 1 deletion lsq-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.aksw.simba.lsq</groupId>
<artifactId>lsq-parent</artifactId>
<version>2.0.0-RC3</version>
<version>2.0.0-RC4</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion lsq-debian-cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.aksw.simba.lsq</groupId>
<artifactId>lsq-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0-RC4-SNAPSHOT</version>
</parent>

<artifactId>lsq-debian-cli</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion lsq-enrichers/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.aksw.simba.lsq</groupId>
<artifactId>lsq-parent</artifactId>
<version>2.0.0-RC3</version>
<version>2.0.0-RC4</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion lsq-model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.aksw.simba.lsq</groupId>
<artifactId>lsq-parent</artifactId>
<version>2.0.0-RC3</version>
<version>2.0.0-RC4</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion lsq-parser/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.aksw.simba.lsq</groupId>
<artifactId>lsq-parent</artifactId>
<version>2.0.0-RC3</version>
<version>2.0.0-RC4</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion lsq-pkg-parent/lsq-pkg-deb-cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.aksw.simba.lsq</groupId>
<artifactId>lsq-pkg-parent</artifactId>
<version>2.0.0-RC3</version>
<version>2.0.0-RC4</version>
</parent>

<artifactId>lsq-pkg-deb-cli</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion lsq-pkg-parent/lsq-pkg-docker-cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.aksw.simba.lsq</groupId>
<artifactId>lsq-pkg-parent</artifactId>
<version>2.0.0-RC3</version>
<version>2.0.0-RC4</version>
</parent>

<artifactId>lsq-pkg-docker-cli</artifactId>
Expand Down
6 changes: 2 additions & 4 deletions lsq-pkg-parent/lsq-pkg-dummy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>lsq-pkg-dummy</artifactId>
<packaging>pom</packaging>

<parent>
<groupId>org.aksw.simba.lsq</groupId>
<artifactId>lsq-pkg-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0-RC4</version>
</parent>

<dependencies>
Expand All @@ -23,14 +24,11 @@
<artifactId>lsq-pkg-deb-cli</artifactId>
<scope>provided</scope>
</dependency>
<!--
<dependency>
<groupId>org.aksw.simba.lsq</groupId>
<artifactId>lsq-pkg-rpm-cli</artifactId>
<type>rpm</type>
<scope>provided</scope>
</dependency>
-->
<dependency>
<groupId>org.aksw.simba.lsq</groupId>
<artifactId>lsq-pkg-docker-cli</artifactId>
Expand Down
8 changes: 5 additions & 3 deletions lsq-pkg-parent/lsq-pkg-rpm-cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<parent>
<groupId>org.aksw.simba.lsq</groupId>
<artifactId>lsq-pkg-parent</artifactId>
<version>2.0.0-RC3</version>
<version>2.0.0-RC4</version>
</parent>

<artifactId>lsq-pkg-rpm-cli</artifactId>
<packaging>rpm</packaging>
<packaging>jar</packaging>

<properties>
<rpm.packageName>lsq-cli</rpm.packageName>
Expand Down Expand Up @@ -41,7 +41,7 @@
<plugin>
<groupId>de.dentrassi.maven</groupId>
<artifactId>rpm</artifactId>
<extensions>true</extensions>
<!-- <extensions>true</extensions> -->

<executions>
<execution>
Expand Down Expand Up @@ -138,11 +138,13 @@
<build>
<plugins>
<!-- Needed in order for <packaging>rpm</packaging> to be recognized -->
<!--
<plugin>
<groupId>de.dentrassi.maven</groupId>
<artifactId>rpm</artifactId>
<extensions>true</extensions>
</plugin>
-->

<!-- <plugin> -->
<!-- <groupId>org.apache.maven.plugins</groupId> -->
Expand Down
2 changes: 1 addition & 1 deletion lsq-pkg-parent/lsq-pkg-uberjar-cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.aksw.simba.lsq</groupId>
<artifactId>lsq-pkg-parent</artifactId>
<version>2.0.0-RC3</version>
<version>2.0.0-RC4</version>
</parent>

<!-- scm section needs to be duplicated on child module for
Expand Down
4 changes: 2 additions & 2 deletions lsq-pkg-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.aksw.simba.lsq</groupId>
<artifactId>lsq-parent</artifactId>
<version>2.0.0-RC3</version>
<version>2.0.0-RC4</version>
</parent>

<!--
Expand All @@ -26,7 +26,7 @@
<module>lsq-pkg-deb-cli</module>
<module>lsq-pkg-rpm-cli</module>
<module>lsq-pkg-docker-cli</module>
<!-- <module>lsq-pkg-dummy</module> -->
<module>lsq-pkg-dummy</module>
</modules>

<!--
Expand Down
2 changes: 1 addition & 1 deletion lsq-spark-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.aksw.simba.lsq</groupId>
<artifactId>lsq-parent</artifactId>
<version>2.0.0-RC3</version>
<version>2.0.0-RC4</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion lsq-vocab-jena/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.aksw.simba.lsq</groupId>
<artifactId>lsq-parent</artifactId>
<version>2.0.0-RC3</version>
<version>2.0.0-RC4</version>
</parent>

<dependencies>
Expand Down
5 changes: 2 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.aksw.simba.lsq</groupId>
<artifactId>lsq-parent</artifactId>
<version>2.0.0-RC3</version>
<version>2.0.0-RC4</version>

<packaging>pom</packaging>

Expand Down Expand Up @@ -140,7 +140,6 @@
<dependency>
<groupId>org.aksw.simba.lsq</groupId>
<artifactId>lsq-pkg-rpm-cli</artifactId>
<type>rpm</type>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -475,7 +474,7 @@
<plugin>
<artifactId>jdeb</artifactId>
<groupId>org.vafer</groupId>
<version>1.9</version>
<version>1.10</version>
</plugin>
<plugin>
<groupId>de.dentrassi.maven</groupId>
Expand Down

0 comments on commit e0f4ef4

Please sign in to comment.