Skip to content

Commit

Permalink
Merge pull request #949 from /issues/948-change-package-wultra-com
Browse files Browse the repository at this point in the history
Fix #948: Change the package to com.wultra
  • Loading branch information
romanstrobl authored Jan 21, 2025
2 parents 8e32a9a + bb8d063 commit 92404aa
Show file tree
Hide file tree
Showing 195 changed files with 630 additions and 634 deletions.
2 changes: 1 addition & 1 deletion .run/PowerAuthPushServerJavaApplication.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration default="false" name="PowerAuthPushServerJavaApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<option name="ACTIVE_PROFILES" value="dev" />
<module name="powerauth-push-server" />
<option name="SPRING_BOOT_MAIN_CLASS" value="io.getlime.push.PowerAuthPushServerJavaApplication" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.wultra.push.PowerAuthPushServerJavaApplication" />
<option name="VM_PARAMETERS" value="-Dserver.servlet.context-path=/powerauth-push-server -Dserver.port=8089" />
<method v="2">
<option name="Make" enabled="true" />
Expand Down
1 change: 0 additions & 1 deletion docs/Deploying-Wildfly.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ Use the `logback.xml` file to configure logging, for example:
</appender>

<logger name="com.wultra" level="INFO" />
<logger name="io.getlime" level="INFO" />

<root level="INFO">
<appender-ref ref="FILE" />
Expand Down
2 changes: 1 addition & 1 deletion docs/Migration-Instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This page contains PowerAuth Push Server migration instructions.

- [PowerAuth Push Server 1.10.0](./PowerAuth-Push-Server-1.10.0.md)
- [PowerAuth Push Server 2.0.0](./PowerAuth-Push-Server-2.0.0)
- [PowerAuth Push Server 1.9.0](./PowerAuth-Push-Server-1.9.0.md)
- [PowerAuth Push Server 1.8.0](./PowerAuth-Push-Server-1.8.0.md)
- [PowerAuth Push Server 1.7.0](./PowerAuth-Push-Server-1.7.0.md)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Migration from 1.9.x to 1.10.x
# Migration from 1.9.x to 2.0.x

This guide contains instructions for migration from PowerAuth Push Server version `1.9.x` to version `1.10.x`.
This guide contains instructions for migration from PowerAuth Push Server version `1.9.x` to version `2.0.x`.

## Database Changes

Expand Down
4 changes: 2 additions & 2 deletions docs/Push-Server-Integration.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ In order to be able to implement integration easily, add Push Server client Mave

```xml
<dependency>
<groupId>io.getlime.security</groupId>
<groupId>com.wultra.security</groupId>
<artifactId>powerauth-push-client</artifactId>
<version>${powerauth.push-server.version}</version>
</dependency>
Expand All @@ -29,7 +29,7 @@ In order to connect to the PowerAuth Push Server, you need to add following conf

```java
@Configuration
@ComponentScan(basePackages = {"io.getlime.push"})
@ComponentScan(basePackages = {"com.wultra.push"})
public class PowerAuthPushConfiguration {

@Bean
Expand Down
22 changes: 11 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<name>powerauth-push-server-parent</name>
<description>PowerAuth Push Server</description>

<groupId>io.getlime.security</groupId>
<groupId>com.wultra.security</groupId>
<artifactId>powerauth-push-server-parent</artifactId>
<version>1.10.0-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<parent>
Expand Down Expand Up @@ -69,10 +69,10 @@

<properties>
<!-- Wultra Dependencies -->
<wultra-core.version>1.12.0-SNAPSHOT</wultra-core.version>
<powerauth.version>1.10.0-SNAPSHOT</powerauth.version>
<powerauth-crypto.version>1.10.0-SNAPSHOT</powerauth-crypto.version>
<powerauth-restful-integration.version>1.10.0-SNAPSHOT</powerauth-restful-integration.version>
<wultra-core.version>2.0.0-SNAPSHOT</wultra-core.version>
<powerauth.version>2.0.0-SNAPSHOT</powerauth.version>
<powerauth-crypto.version>2.0.0-SNAPSHOT</powerauth-crypto.version>
<powerauth-restful-integration.version>2.0.0-SNAPSHOT</powerauth-restful-integration.version>

<!-- Library Versions -->
<pushy.version>0.15.4</pushy.version>
Expand All @@ -89,32 +89,32 @@
<dependencies>
<!-- Project Dependencies -->
<dependency>
<groupId>io.getlime.security</groupId>
<groupId>com.wultra.security</groupId>
<artifactId>powerauth-push-client</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>io.getlime.security</groupId>
<groupId>com.wultra.security</groupId>
<artifactId>powerauth-push-model</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Wultra Dependencies -->
<dependency>
<groupId>io.getlime.core</groupId>
<groupId>com.wultra.core</groupId>
<artifactId>rest-model-base</artifactId>
<version>${wultra-core.version}</version>
</dependency>

<dependency>
<groupId>io.getlime.core</groupId>
<groupId>com.wultra.core</groupId>
<artifactId>rest-client-base</artifactId>
<version>${wultra-core.version}</version>
</dependency>

<dependency>
<groupId>io.getlime.security</groupId>
<groupId>com.wultra.security</groupId>
<artifactId>powerauth-client-model</artifactId>
<version>${powerauth.version}</version>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions powerauth-push-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@

<parent>
<artifactId>powerauth-push-server-parent</artifactId>
<groupId>io.getlime.security</groupId>
<version>1.10.0-SNAPSHOT</version>
<groupId>com.wultra.security</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>

<dependencies>

<!-- Project Dependencies -->
<dependency>
<groupId>io.getlime.security</groupId>
<groupId>com.wultra.security</groupId>
<artifactId>powerauth-push-model</artifactId>
</dependency>

<!-- Wultra dependencies -->
<dependency>
<groupId>io.getlime.core</groupId>
<groupId>com.wultra.core</groupId>
<artifactId>rest-client-base</artifactId>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,25 @@
* limitations under the License.
*/

package io.getlime.push.client;
package com.wultra.push.client;

import com.fasterxml.jackson.databind.Module;
import com.wultra.core.rest.client.base.DefaultRestClient;
import com.wultra.core.rest.client.base.RestClient;
import com.wultra.core.rest.client.base.RestClientConfiguration;
import com.wultra.core.rest.client.base.RestClientException;
import io.getlime.core.rest.model.base.entity.Error;
import io.getlime.core.rest.model.base.request.ObjectRequest;
import io.getlime.core.rest.model.base.response.ObjectResponse;
import io.getlime.core.rest.model.base.response.Response;
import io.getlime.push.model.base.PagedResponse;
import io.getlime.push.model.entity.*;
import io.getlime.push.model.enumeration.ApnsEnvironment;
import io.getlime.push.model.enumeration.MobilePlatform;
import io.getlime.push.model.enumeration.Mode;
import io.getlime.push.model.request.*;
import io.getlime.push.model.response.*;
import io.getlime.push.model.validator.*;
import com.wultra.core.rest.model.base.entity.Error;
import com.wultra.core.rest.model.base.request.ObjectRequest;
import com.wultra.core.rest.model.base.response.ObjectResponse;
import com.wultra.core.rest.model.base.response.Response;
import com.wultra.push.model.base.PagedResponse;
import com.wultra.push.model.entity.*;
import com.wultra.push.model.enumeration.ApnsEnvironment;
import com.wultra.push.model.enumeration.MobilePlatform;
import com.wultra.push.model.enumeration.Mode;
import com.wultra.push.model.request.*;
import com.wultra.push.model.response.*;
import com.wultra.push.model.validator.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.ParameterizedTypeReference;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.getlime.push.client;
package com.wultra.push.client;

import io.getlime.core.rest.model.base.entity.Error;
import com.wultra.core.rest.model.base.entity.Error;

import java.io.Serial;
import java.io.Serializable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* limitations under the License.
*/

package io.getlime.push.client;
package com.wultra.push.client;

import io.getlime.core.rest.model.base.entity.Error;
import com.wultra.core.rest.model.base.entity.Error;

/**
* Class representing a simple push server client error exception.
Expand Down
8 changes: 4 additions & 4 deletions powerauth-push-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@

<parent>
<artifactId>powerauth-push-server-parent</artifactId>
<groupId>io.getlime.security</groupId>
<version>1.10.0-SNAPSHOT</version>
<groupId>com.wultra.security</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>

<dependencies>
<dependency>
<groupId>io.getlime.core</groupId>
<groupId>com.wultra.core</groupId>
<artifactId>rest-model-base</artifactId>
</dependency>

<dependency>
<groupId>io.getlime.security</groupId>
<groupId>com.wultra.security</groupId>
<artifactId>powerauth-client-model</artifactId>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* limitations under the License.
*/

package io.getlime.push.model.base;
package com.wultra.push.model.base;

import io.getlime.core.rest.model.base.response.ObjectResponse;
import com.wultra.core.rest.model.base.response.ObjectResponse;
import lombok.EqualsAndHashCode;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* limitations under the License.
*/

package io.getlime.push.model.entity;
package com.wultra.push.model.entity;

import io.getlime.push.model.enumeration.Mode;
import com.wultra.push.model.enumeration.Mode;

/**
* Base push message sending result.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* limitations under the License.
*/

package io.getlime.push.model.entity;
package com.wultra.push.model.entity;

import io.getlime.push.model.enumeration.MessageType;
import com.wultra.push.model.enumeration.MessageType;
import lombok.Data;

import java.util.Date;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package io.getlime.push.model.entity;
package com.wultra.push.model.entity;

import java.util.ArrayList;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package io.getlime.push.model.entity;
package com.wultra.push.model.entity;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* limitations under the License.
*/

package io.getlime.push.model.entity;
package com.wultra.push.model.entity;

import io.getlime.push.model.enumeration.Priority;
import com.wultra.push.model.enumeration.Priority;

import jakarta.validation.constraints.NotNull;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.getlime.push.model.entity;
package com.wultra.push.model.entity;

/**
* Extra attributes of the push message.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package io.getlime.push.model.entity;
package com.wultra.push.model.entity;

import java.time.Instant;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* limitations under the License.
*/

package io.getlime.push.model.entity;
package com.wultra.push.model.entity;

import io.getlime.push.model.enumeration.Mode;
import com.wultra.push.model.enumeration.Mode;
import lombok.Data;
import lombok.EqualsAndHashCode;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package io.getlime.push.model.entity;
package com.wultra.push.model.entity;

import lombok.Getter;
import lombok.Setter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.getlime.push.model.enumeration;
package com.wultra.push.model.enumeration;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package io.getlime.push.model.enumeration;
package com.wultra.push.model.enumeration;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package io.getlime.push.model.enumeration;
package com.wultra.push.model.enumeration;

import com.fasterxml.jackson.annotation.JsonProperty;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package io.getlime.push.model.enumeration;
package com.wultra.push.model.enumeration;

/**
* Mode in which push notifications are sent.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package io.getlime.push.model.enumeration;
package com.wultra.push.model.enumeration;

/**
* Enum representing the priority of push notifications.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.getlime.push.model.request;
package com.wultra.push.model.request;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
Expand Down
Loading

0 comments on commit 92404aa

Please sign in to comment.