Skip to content
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
20 changes: 10 additions & 10 deletions ambari-project/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,25 @@
<solr.version>5.5.2</solr.version>
<ambari.dir>${project.parent.basedir}</ambari.dir>
<powermock.version>2.0.9</powermock.version>
<jetty.version>11.0.24</jetty.version>
<jetty.version>12.0.12</jetty.version>
<ldap-api.version>1.0.0</ldap-api.version>
<checkstyle.version>8.9</checkstyle.version>
<swagger.version>1.6.8</swagger.version>
<swagger.maven.plugin.version>3.1.5</swagger.maven.plugin.version>
<slf4j.version>2.0.0</slf4j.version>
<reload4j.version>1.2.22</reload4j.version>
<logback.version>1.2.13</logback.version>
<logback.version>1.3.15</logback.version>
<guice.version>7.0.0</guice.version>
<spring.version>6.0.23</spring.version>
<spring.security.version>6.0.8</spring.security.version>
<spring.version>6.1.14</spring.version>
<spring.security.version>6.1.8</spring.security.version>
<fasterxml.jackson.version>2.18.2</fasterxml.jackson.version>
<fasterxml.jackson.databind.version>2.18.2</fasterxml.jackson.databind.version>
<postgres.version>42.3.9</postgres.version>
<testContainers.version>1.17.6</testContainers.version>
<forkCount>4</forkCount>
<reuseForks>false</reuseForks>
<surefire.argLine>-Xmx1024m -Xms512m</surefire.argLine>
<jersey.version>3.1.5</jersey.version>
<jersey.version>3.1.10</jersey.version>
</properties>
<profiles>
<profile>
Expand Down Expand Up @@ -117,7 +117,7 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.4</version>
<version>1.11.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
Expand All @@ -128,7 +128,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.8.0</version>
<version>2.14.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -143,7 +143,7 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>1.1</version>
<version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
Expand Down Expand Up @@ -262,7 +262,7 @@
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-core</artifactId>
<version>2.3.2.RELEASE</version>
<version>2.4.4</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -429,7 +429,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.8</version>
<version>1.14</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Expand Down
57 changes: 26 additions & 31 deletions ambari-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<stackHooksLocation>src/main/resources/stack-hooks</stackHooksLocation>
<stacksSrcLocation>src/main/resources/stacks/${stack.distribution}</stacksSrcLocation>
<tarballResourcesFolder>src/main/resources</tarballResourcesFolder>
<hadoop.version>3.3.4</hadoop.version>
<hadoop.version>3.3.6</hadoop.version>
<ambari.metrics.version>2.7.0.0.0</ambari.metrics.version>
<empty.dir>src/main/package</empty.dir>
<el.log>ALL</el.log>
Expand All @@ -70,12 +70,12 @@
<equalsverifier.version>3.15.6</equalsverifier.version>
<persistence.version>3.1.0</persistence.version>
<collections4.version>4.4</collections4.version>
<commons.compress.version>1.21</commons.compress.version>
<commons.text.version>1.10.0</commons.text.version>
<commons.net.version>1.4.1</commons.net.version>
<commons.compress.version>1.26.0</commons.compress.version>
<commons.text.version>1.14.0</commons.text.version>
<commons.net.version>3.9.0</commons.net.version>
<cloning.version>1.9.2</cloning.version>
<guava.version>32.1.3-jre</guava.version>
<h2database.version>1.4.193</h2database.version>
<h2database.version>1.4.198</h2database.version>
<mockito.core.version>3.5.10</mockito.core.version>
<mockito.inline.version>3.5.10</mockito.inline.version>
<objenesis.tck.version>1.2</objenesis.tck.version>
Expand All @@ -88,21 +88,21 @@
<mailapi.version>1.5.2</mailapi.version>
<smtp.version>1.5.2</smtp.version>
<snmp4j.version>1.10.1</snmp4j.version>
<yamlbeans.version>1.13</yamlbeans.version>
<yamlbeans.version>1.17</yamlbeans.version>
<jaxb.api.version>2.3.1</jaxb.api.version>
<istack.commons.runtime.version>4.0.0</istack.commons.runtime.version>
<FastInfoset.version>1.2.16</FastInfoset.version>
<ehcache.version>3.10.0</ehcache.version>
<nimbus.jose.jwt.version>5.9</nimbus.jose.jwt.version>
<nimbus.jose.jwt.version>7.8.1</nimbus.jose.jwt.version>
<jsch.version>0.1.54</jsch.version>
<c3p0.version>0.9.5.4</c3p0.version>
<metrics.core.version>3.1.0</metrics.core.version>
<metrics.jvm.version>3.1.0</metrics.jvm.version>
<libpam4j.version>1.10</libpam4j.version>
<jna.version>4.2.2</jna.version>
<api.ldap.model.version>2.0.0.AM1</api.ldap.model.version>
<api.ldap.client.api.version>2.0.0.AM1</api.ldap.client.api.version>
<apacheds.kerberos.codec.version>2.0.0-M24</apacheds.kerberos.codec.version>
<api.ldap.model.version>2.0.0.AM3</api.ldap.model.version>
<api.ldap.client.api.version>2.0.0.AM3</api.ldap.client.api.version>
<apacheds.kerberos.codec.version>2.0.0.AM27</apacheds.kerberos.codec.version>
<kerberos.client.version>2.0.0-M24</kerberos.client.version>
<json.schema.validator.version>0.1.10</json.schema.validator.version>
</properties>
Expand Down Expand Up @@ -185,20 +185,17 @@
<configuration>
<tasks>
<jar destfile="target/DBConnectionVerification.jar">
<fileset dir="${basedir}/target/classes/"
includes="**/DBConnectionVerification.class" />
<fileset dir="${basedir}/target/classes/" includes="**/DBConnectionVerification.class"/>
<manifest>
<attribute name="Main-Class"
value="org.apache.ambari.server.DBConnectionVerification" />
<attribute name="Main-Class" value="org.apache.ambari.server.DBConnectionVerification"/>
</manifest>
</jar>
<jar destfile="target/CredentialUtil.jar">
<fileset dir="${basedir}/target/classes/">
<include name="**/CredentialUtil*.class" />
<include name="**/CredentialUtil*.class"/>
</fileset>
<manifest>
<attribute name="Main-Class"
value="org.apache.ambari.server.credentialapi.CredentialUtil" />
<attribute name="Main-Class" value="org.apache.ambari.server.credentialapi.CredentialUtil"/>
</manifest>
</jar>
</tasks>
Expand All @@ -218,9 +215,9 @@
<target>
<copy todir="${ambari-admin-dir}/target" flatten="true">
<fileset dir="${contrib-views-dir}">
<include name="*/target/*jar" />
<exclude name="**/ambari-views-utils*jar" />
<exclude name="**/ambari-views-commons*jar" />
<include name="*/target/*jar"/>
<exclude name="**/ambari-views-utils*jar"/>
<exclude name="**/ambari-views-commons*jar"/>
</fileset>
</copy>
</target>
Expand Down Expand Up @@ -759,8 +756,7 @@
<outputDir>${project.basedir}/target/findbugs</outputDir>
<stylesheet>fancy-hist.xsl</stylesheet>
<fileMappers>
<fileMapper
implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
<targetExtension>.html</targetExtension>
</fileMapper>
</fileMappers>
Expand Down Expand Up @@ -945,12 +941,11 @@
</goals>
<configuration>
<target name="ambari-server-compile">
<exec dir="${basedir}" executable="bash"
failonerror="true">
<arg value="${basedir}/set-hdp-repo-url.sh" />
<arg value="${hdpUrlForCentos6}" />
<arg value="${hdpLatestUrl}" />
<arg value="${basedir}" />
<exec dir="${basedir}" executable="bash" failonerror="true">
<arg value="${basedir}/set-hdp-repo-url.sh"/>
<arg value="${hdpUrlForCentos6}"/>
<arg value="${hdpLatestUrl}"/>
<arg value="${basedir}"/>
</exec>
</target>
</configuration>
Expand Down Expand Up @@ -1112,7 +1107,7 @@
<executable.python>${project.basedir}/../ambari-common/src/main/unix/ambari-python-wrap</executable.python>
<executable.shell>sh</executable.shell>
<fileextension.shell>sh</fileextension.shell>
<fileextension.dot.shell-default></fileextension.dot.shell-default>
<fileextension.dot.shell-default/>
<path.python.1>${project.basedir}/../ambari-common/src/main/python:${project.basedir}/../ambari-agent/src/main/python:${project.basedir}/../ambari-common/src/main/python/ambari_jinja2:${project.basedir}/../ambari-common/src/main/python/ambari_commons:${project.basedir}/../ambari-common/src/test/python:${project.basedir}/src/main/python:${project.basedir}/src/main/python/ambari-server-state:${project.basedir}/src/main/resources/custom_actions:${project.basedir}/src/main/resources/scripts:${project.basedir}/src/test/python</path.python.1>
<assemblydescriptor>src/main/assemblies/server.xml</assemblydescriptor>
</properties>
Expand Down Expand Up @@ -1335,7 +1330,7 @@
<dependency>
<groupId>org.springframework.security.kerberos</groupId>
<artifactId>spring-security-kerberos-web</artifactId>
<version>2.1.0</version>
<version>2.2.0</version>
</dependency>
<dependency>
<groupId>org.springframework.security.kerberos</groupId>
Expand Down Expand Up @@ -1479,7 +1474,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.9</version>
<version>3.18.0</version>
</dependency>
<dependency>
<groupId>commons-net</groupId>
Expand Down
2 changes: 1 addition & 1 deletion contrib/ambari-scom/ambari-scom-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.7</version>
<version>1.4.21</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion contrib/ambari-scom/metrics-sink/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>2.2.0</version>
<version>2.6.5</version>
</dependency>
</dependencies>
<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"ember-cli-app-version": "^1.0.0",
"ember-cli-dependency-checker": "^1.2.0",
"ember-cli-font-awesome": "1.5.0",
"ember-cli-htmlbars": "^1.0.1",
"ember-cli-htmlbars": "^7.0.0",
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
"ember-cli-inject-live-reload": "^1.3.1",
"ember-cli-qunit": "^1.1.0",
Expand All @@ -46,7 +46,7 @@
],
"dependencies": {
"ember-cli-babel": "^5.1.5",
"ember-cli-htmlbars": "^1.0.1"
"ember-cli-htmlbars": "^7.0.0"
},
"ember-addon": {
"configPath": "tests/dummy/config"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"ember-cli-app-version": "^1.0.0",
"ember-cli-dependency-checker": "^1.2.0",
"ember-cli-font-awesome": "1.5.0",
"ember-cli-htmlbars": "^1.0.1",
"ember-cli-htmlbars": "^7.0.0",
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
"ember-cli-inject-live-reload": "^1.3.1",
"ember-cli-qunit": "^1.1.0",
Expand All @@ -46,7 +46,7 @@
],
"dependencies": {
"ember-cli-babel": "^5.1.5",
"ember-cli-htmlbars": "^1.0.1"
"ember-cli-htmlbars": "^7.0.0"
},
"ember-addon": {
"configPath": "tests/dummy/config"
Expand Down
Loading