Skip to content

Commit

Permalink
MGR-133
Browse files Browse the repository at this point in the history
  • Loading branch information
madness-inc authored and Matthias Müller committed Oct 25, 2022
1 parent 5c2fe46 commit d26802e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 28 deletions.
6 changes: 3 additions & 3 deletions application-home/conf/events/ev-repositories.xml
Expand Up @@ -78,7 +78,7 @@
<param name="form_action" />
</params>
</config>
<condition expression="${form_action eq 'delete-repository' and not empty repositoryid}" />
<condition expression="${form_action eq 'delete-repository'}" />
<bean id="repositories">
<option name="repository" id="${repositoryid}" />
<option name="action" id="delete" />
Expand Down Expand Up @@ -117,7 +117,7 @@
<param name="timestamp" />
</params>
</config>
<condition expression="${form_action eq 'install' and not empty repositoryid and not empty name and not empty version}" />
<condition expression="${form_action eq 'install'}" />
<bean id="installation">
<option name="repository" id="${repositoryid}" />
<option name="package" packageName="${name}" packageVersion="${version}" packageTimestamp="${timestamp}" />
Expand All @@ -139,7 +139,7 @@
<param name="timestamp" />
</params>
</config>
<condition expression="${form_action eq 'delete-package' and not empty repositoryid and not empty name and not empty version and not empty timestamp}" />
<condition expression="${form_action eq 'delete-package'}" />
<bean id="installation">
<option name="repository" id="${repositoryid}" />
<option name="package" packageName="${name}" packageVersion="${version}" packageTimestamp="${timestamp}" />
Expand Down
2 changes: 1 addition & 1 deletion application-home/conf/pages/pg-repositories.xml
Expand Up @@ -102,7 +102,7 @@
<param name="version">${packageversion}</param>
<param name="timestamp">${packagetimestamp}</param>
</params>
<condition expression="${not empty act and not empty id and not empty packagename and not empty packageversion}" />
<condition expression="${not empty act and not empty id and not empty packagename and not empty packageversion and not empty packagetimestamp}" />
</action>
</element>
</section>
Expand Down
24 changes: 0 additions & 24 deletions pom.xml
Expand Up @@ -363,30 +363,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.28</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>2.7.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>10.2.0.jre8</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.appng</groupId>
<artifactId>appng-testsupport</artifactId>
Expand Down

0 comments on commit d26802e

Please sign in to comment.