Skip to content

Commit

Permalink
Merge pull request #3 from axonivy-market/new-release
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
ivy-fhe authored Oct 26, 2023
2 parents 4de40c4 + bb547f0 commit ed536f9
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 37 deletions.
6 changes: 2 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.connector.threema</groupId><!-- your group id: e.g.
com.axonivy.connector.<myconnector> or com.axonivy.utils.<myutil> -->
<name>threema-connector</name>
<artifactId>threema-connector-modules</artifactId>
<version>10.0.0-SNAPSHOT</version><!-- identicate your minimal compliant
<version>10.0.1-SNAPSHOT</version><!-- identicate your minimal compliant
ivy version with the first 2 digits -->
<packaging>pom</packaging>

Expand Down
7 changes: 2 additions & 5 deletions threema-connector-demo/pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.connector.threema</groupId>
<artifactId>threema-connector-demo</artifactId>
<version>10.0.0-SNAPSHOT</version>
<version>10.0.1-SNAPSHOT</version>
<packaging>iar</packaging>
<dependencies>
<dependency>
Expand Down
17 changes: 5 additions & 12 deletions threema-connector-product/pom.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.connector.threema</groupId>
<artifactId>threema-connector-product</artifactId>
<version>10.0.0-SNAPSHOT</version>
<version>10.0.1-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down Expand Up @@ -44,14 +42,9 @@
<copy todir="${project.build.directory}">
<fileset dir="../../" includes="doc/**" />
</copy>
<copy file="README.md"
tofile="${project.build.directory}/README.md" />
<loadfile property="variables.yaml"
srcFile="${variables.yaml.file}" encoding="UTF-8"
failonerror="false" />
<replace
file="${project.build.directory}/README.md"
token="@variables.yaml@" value="${variables.yaml}" />
<copy file="README.md" tofile="${project.build.directory}/README.md" />
<loadfile property="variables.yaml" srcFile="${variables.yaml.file}" encoding="UTF-8" failonerror="false" />
<replace file="${project.build.directory}/README.md" token="@variables.yaml@" value="${variables.yaml}" />
</target>
</configuration>
<goals>
Expand Down
7 changes: 2 additions & 5 deletions threema-connector-test/pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.connector.threema</groupId>
<artifactId>threema-connector-test</artifactId>
<version>10.0.0-SNAPSHOT</version>
<version>10.0.1-SNAPSHOT</version>
<packaging>iar</packaging>
<dependencies>
<dependency>
Expand Down
7 changes: 2 additions & 5 deletions threema-connector-webtest/pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.connector.threema</groupId>
<artifactId>threema-connector-webtest</artifactId>
<version>10.0.0-SNAPSHOT</version>
<version>10.0.1-SNAPSHOT</version>
<packaging>iar-integration-test</packaging>
<dependencies>
<dependency>
Expand Down
9 changes: 3 additions & 6 deletions threema-connector/pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.connector.threema</groupId>
<artifactId>threema-connector</artifactId>
<version>10.0.0-SNAPSHOT</version>
<version>10.0.1-SNAPSHOT</version>
<packaging>iar</packaging>

<build>
Expand All @@ -30,7 +27,7 @@
</goals>
<configuration>
<target>
<mkdir dir="${project.basedir}/lib"/>
<mkdir dir="${project.basedir}/lib"/>
<get src="https://gateway.threema.ch/sdk/threema-msgapi-sdk-java-2.0.1.zip"
dest="${project.basedir}/lib/threema-msgapi-tool.zip"/>
<unzip src="${project.basedir}/lib/threema-msgapi-tool.zip"
Expand Down

0 comments on commit ed536f9

Please sign in to comment.