Skip to content

Commit

Permalink
Remove specific dependencies/plugins versioning
Browse files Browse the repository at this point in the history
Removes specific dependencies/plugins version from following
subproject definition files:

* backend/manager/dependencies/tools/pom.xml
* backend/manager/extensions-tool/pom.xml
* backend/manager/modules/bll/pom.xml
* backend/manager/modules/builtin-extensions/pom.xml
* backend/manager/modules/enginesso/pom.xml
* backend/manager/modules/extensions-manager/pom.xml
* backend/manager/modules/logger/pom.xml
* backend/manager/modules/restapi/jaxrs/pom.xml
* backend/manager/modules/utils/pom.xml
* backend/manager/tools/pom.xml
* build-tools-root/ovirt-checkstyle-extension/pom.xml
* frontend/webadmin/modules/frontend/pom.xml
* frontend/webadmin/modules/gwt-aop/pom.xml
* frontend/webadmin/modules/uicommonweb/pom.xml
* frontend/webadmin/modules/webadmin/pom.xml
* frontend/pom.xml

Signed-off-by: Martin Perina <mperina@redhat.com>
  • Loading branch information
mwperina committed Aug 29, 2022
1 parent 9edc763 commit d3dfcce
Show file tree
Hide file tree
Showing 18 changed files with 130 additions and 134 deletions.
3 changes: 0 additions & 3 deletions backend/manager/dependencies/tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,16 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>${slf4j.version}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
</dependencies>

Expand Down
1 change: 0 additions & 1 deletion backend/manager/extensions-tool/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${commons-lang.version}</version>
</dependency>
</dependencies>

Expand Down
35 changes: 15 additions & 20 deletions backend/manager/modules/bll/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@
<name>Backend Logic @Service bean</name>

<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>${engine.groupId}</groupId>
<artifactId>compat</artifactId>
Expand All @@ -37,11 +33,6 @@
<artifactId>extensions-manager</artifactId>
<version>${engine.version}</version>
</dependency>
<dependency>
<groupId>org.ovirt.engine.api</groupId>
<artifactId>ovirt-engine-extensions-api</artifactId>
<version>${ovirt-engine-extensions-api.version}</version>
</dependency>
<dependency>
<groupId>org.ovirt.engine.extension.aaa</groupId>
<artifactId>builtin</artifactId>
Expand Down Expand Up @@ -86,20 +77,32 @@
<scope>provided</scope>
<type>ejb</type>
</dependency>
<dependency>
<groupId>${engine.groupId}</groupId>
<artifactId>utils</artifactId>
<version>${engine.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ovirt.engine.api</groupId>
<artifactId>ovirt-engine-extensions-api</artifactId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>com.woorea</groupId>
<artifactId>keystone-client</artifactId>
<version>${openstack-client.version}</version>
</dependency>
<dependency>
<groupId>com.woorea</groupId>
<artifactId>quantum-client</artifactId>
<version>${openstack-client.version}</version>
</dependency>
<dependency>
<groupId>com.woorea</groupId>
<artifactId>resteasy-connector</artifactId>
<version>${openstack-client.version}</version>
<exclusions>
<exclusion>
<groupId>commons-httpclient</groupId>
Expand Down Expand Up @@ -165,17 +168,9 @@
<artifactId>slf4j-jdk14</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${engine.groupId}</groupId>
<artifactId>utils</artifactId>
<version>${engine.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>${reflections.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion backend/manager/modules/builtin-extensions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<dependency>
<groupId>org.ovirt.engine.api</groupId>
<artifactId>ovirt-engine-extensions-api</artifactId>
<version>${ovirt-engine-extensions-api.version}</version>
</dependency>
</dependencies>
</project>
18 changes: 5 additions & 13 deletions backend/manager/modules/enginesso/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,46 +15,38 @@
<description>oVirt engine sso</description>

<dependencies>

<dependency>
<groupId>${engine.groupId}</groupId>
<artifactId>uutils</artifactId>
<version>${engine.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>${engine.groupId}</groupId>
<artifactId>extensions-manager</artifactId>
<version>${engine.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>${engine.groupId}</groupId>
<artifactId>branding</artifactId>
<version>${engine.version}</version>
</dependency>
<dependency>
<groupId>org.ovirt.engine.api</groupId>
<artifactId>ovirt-engine-extensions-api</artifactId>
<version>${ovirt-engine-extensions-api.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.1_spec</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>${engine.groupId}</groupId>
<artifactId>branding</artifactId>
<version>${engine.version}</version>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
Expand Down
7 changes: 0 additions & 7 deletions backend/manager/modules/extensions-manager/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,17 @@

<name>Extensions manager</name>
<dependencies>

<dependency>
<groupId>org.ovirt.engine.api</groupId>
<artifactId>ovirt-engine-extensions-api</artifactId>
<version>${ovirt-engine-extensions-api.version}</version>
</dependency>

<dependency>
<groupId>org.jboss.modules</groupId>
<artifactId>jboss-modules</artifactId>
<version>1.1.1.GA</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

</dependencies>

</project>
1 change: 0 additions & 1 deletion backend/manager/modules/logger/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
<dependency>
<groupId>org.ovirt.engine.api</groupId>
<artifactId>ovirt-engine-extensions-api</artifactId>
<version>${ovirt-engine-extensions-api.version}</version>
</dependency>

</dependencies>
Expand Down
1 change: 0 additions & 1 deletion backend/manager/modules/restapi/jaxrs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
<dependency>
<groupId>org.ovirt.engine.api</groupId>
<artifactId>metamodel-server</artifactId>
<version>${metamodel.version}</version>
</dependency>

<dependency>
Expand Down
76 changes: 27 additions & 49 deletions backend/manager/modules/utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,71 +13,61 @@
<name>Common utilities</name>

<dependencies>
<dependency>
<groupId>org.ovirt.engine.api</groupId>
<artifactId>ovirt-engine-extensions-api</artifactId>
<version>${ovirt-engine-extensions-api.version}</version>
</dependency>
<dependency>
<groupId>${engine.groupId}</groupId>
<artifactId>extensions-manager</artifactId>
<version>${engine.version}</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>

<dependency>
<groupId>${engine.groupId}</groupId>
<artifactId>compat</artifactId>
<version>${engine.version}</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</dependency>

<dependency>
<groupId>${engine.groupId}</groupId>
<artifactId>uutils</artifactId>
<version>${engine.version}</version>
</dependency>

<dependency>
<groupId>${engine.groupId}</groupId>
<artifactId>common</artifactId>
<version>${engine.version}</version>
</dependency>

<dependency>
<groupId>${engine.groupId}</groupId>
<artifactId>common</artifactId>
<version>${engine.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.ovirt.engine.api</groupId>
<artifactId>ovirt-engine-extensions-api</artifactId>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
</dependency>

<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>

<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>

<dependency>
<groupId>org.jboss.spec.javax.ejb</groupId>
<artifactId>jboss-ejb-api_3.1_spec</artifactId>
Expand All @@ -103,44 +93,33 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>


<!-- This is not used directly by the source, but the
compiler some how requires it indirectly: -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>

<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
</dependency>

<dependency>
<groupId>com.woorea</groupId>
<artifactId>keystone-client</artifactId>
<version>${openstack-client.version}</version>
</dependency>

<dependency>
<groupId>com.woorea</groupId>
<artifactId>glance-client</artifactId>
<version>${openstack-client.version}</version>
</dependency>

<dependency>
<groupId>com.woorea</groupId>
<artifactId>cinder-client</artifactId>
<version>${openstack-client.version}</version>
</dependency>

<dependency>
<groupId>org.ebaysf.web</groupId>
<artifactId>cors-filter</artifactId>
<version>1.0.1</version>
</dependency>

<!-- This is not used directly by the source, but the
compiler some how requires it indirectly: -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
</dependencies>

<build>
Expand All @@ -158,16 +137,15 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
<version>${javacc.version}</version>
<executions>
<execution>
<id>javacc</id>
<goals>
<goal>javacc</goal>
</goals>
<id>javacc</id>
<goals>
<goal>javacc</goal>
</goals>
</execution>
</executions>
</plugin>
</plugin>
</plugins>
</build>

Expand Down
Loading

0 comments on commit d3dfcce

Please sign in to comment.