Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update protobuf #61

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 31 additions & 26 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,24 @@
<name>subscription-matcher</name>
<description>Expert system to match SUSE subscriptions to a set of systems</description>

<scm>
<developerConnection>scm:git:[email protected]:openSUSE/subscription-matcher.git</developerConnection>
</scm>

<packaging>jar</packaging>

<properties>
<drools.version>7.17.0.Final</drools.version>
<optaplanner.version>7.17.0.Final</optaplanner.version>
</properties>

<build>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
<resource>
<directory>src/main/resources-filtered</directory>
<filtering>true</filtering>
</resource>
</resources>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -67,24 +78,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.kie</groupId>
<artifactId>kie-maven-plugin</artifactId>
<version>7.17.0.Final</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-scm-plugin</artifactId>
<version>1.9.4</version>
<configuration>
<tag>v${project.version}</tag>
</configuration>
</plugin>
</plugins>
</build>

Expand All @@ -108,12 +101,12 @@
<dependency>
<groupId>org.kie</groupId>
<artifactId>kie-api</artifactId>
<version>7.17.0.Final</version>
<version>${drools.version}</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core</artifactId>
<version>7.17.0.Final</version>
<version>${optaplanner.version}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
Expand Down Expand Up @@ -161,7 +154,7 @@
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-compiler</artifactId>
<version>7.17.0.Final</version>
<version>${drools.version}</version>
<scope>runtime</scope>
<exclusions>
<!-- ECJ has been moved to org.eclipse.jdt:ecj -->
Expand Down Expand Up @@ -192,7 +185,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.9.2</version>
<version>3.25.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
Expand All @@ -207,6 +200,18 @@
<version>1.4.20</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr-runtime</artifactId>
<version>3.5.3</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.29.2-GA</version>
<scope>runtime</scope>
</dependency>

<!-- Test dependencies -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
groupId=${project.groupId}
artifactId=${project.artifactId}
version=${project.version}
3 changes: 0 additions & 3 deletions src/main/resources/META-INF/maven/pom.properties

This file was deleted.

Loading
Loading