Skip to content

Commit

Permalink
Merge branch 'release/2022.11-MT' of github.com:CloudSlang/cloud-slan…
Browse files Browse the repository at this point in the history
…g into upgrade_snakeyaml_mt
  • Loading branch information
pintea-eugen committed Mar 28, 2023
2 parents 8a9fc09 + 6b04b56 commit 0f78c67
Show file tree
Hide file tree
Showing 13 changed files with 20 additions and 44 deletions.
2 changes: 1 addition & 1 deletion cloudslang-all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ http://www.apache.org/licenses/LICENSE-2.0
<parent>
<artifactId>cloudslang</artifactId>
<groupId>io.cloudslang.lang</groupId>
<version>2.0.44</version>
<version>2.0.44.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion cloudslang-api-commons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>cloudslang</artifactId>
<groupId>io.cloudslang.lang</groupId>
<version>2.0.44</version>
<version>2.0.44.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion cloudslang-cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>cloudslang</artifactId>
<groupId>io.cloudslang.lang</groupId>
<version>2.0.44</version>
<version>2.0.44.0-SNAPSHOT</version>
</parent>

<artifactId>cloudslang-cli</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cloudslang-commons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>cloudslang</artifactId>
<groupId>io.cloudslang.lang</groupId>
<version>2.0.44</version>
<version>2.0.44.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion cloudslang-compiler/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<artifactId>cloudslang</artifactId>
<groupId>io.cloudslang.lang</groupId>
<version>2.0.44</version>
<version>2.0.44.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion cloudslang-content-maven-compiler/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<artifactId>cloudslang</artifactId>
<groupId>io.cloudslang.lang</groupId>
<version>2.0.44</version>
<version>2.0.44.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion cloudslang-content-verifier/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>cloudslang</artifactId>
<groupId>io.cloudslang.lang</groupId>
<version>2.0.44</version>
<version>2.0.44.0-SNAPSHOT</version>
</parent>

<artifactId>cloudslang-content-verifier</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cloudslang-enforcer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>cloudslang</artifactId>
<groupId>io.cloudslang.lang</groupId>
<version>2.0.44</version>
<version>2.0.44.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion cloudslang-entities/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<artifactId>cloudslang</artifactId>
<groupId>io.cloudslang.lang</groupId>
<version>2.0.44</version>
<version>2.0.44.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion cloudslang-runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<artifactId>cloudslang</artifactId>
<groupId>io.cloudslang.lang</groupId>
<version>2.0.44</version>
<version>2.0.44.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion cloudslang-spi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<artifactId>cloudslang</artifactId>
<groupId>io.cloudslang.lang</groupId>
<version>2.0.44</version>
<version>2.0.44.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion cloudslang-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<artifactId>cloudslang</artifactId>
<groupId>io.cloudslang.lang</groupId>
<version>2.0.44</version>
<version>2.0.44.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
40 changes: 8 additions & 32 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
-->
<groupId>io.cloudslang.lang</groupId>
<artifactId>cloudslang</artifactId>
<version>2.0.44</version>
<version>2.0.44.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>${project.groupId}:${project.artifactId}</name>
Expand All @@ -28,7 +28,7 @@
<connection>scm:git:https://github.com/CloudSlang/cloud-slang.git</connection>
<developerConnection>scm:git:[email protected]:CloudSlang/cloud-slang.git</developerConnection>
<url>https://github.com/CloudSlang/cloud-slang.git</url>
<tag>cloudslang-2.0.44</tag>
<tag>master</tag>
</scm>

<properties>
Expand Down Expand Up @@ -67,14 +67,14 @@

<distributionManagement>
<repository>
<id>ossrh</id>
<name>Maven Central staging repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
<id>nexus-repository</id>
<name>nexus repository</name>
<url>${nexus.url}/releases/</url>
</repository>
<snapshotRepository>
<id>ossrh</id>
<name>Maven Central snapshots repository</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
<id>nexus-snapshot-repository</id>
<name>nexus snapshots repository</name>
<url>${nexus.url}/snapshots/</url>
</snapshotRepository>
</distributionManagement>

Expand Down Expand Up @@ -793,30 +793,6 @@
</plugins>
</build>
</profile>
<profile>
<id>deploy-internal</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>${maven-deploy-plugin.version}</version>
<executions>
<execution>
<id>custom-deployment-to-nexus</id>
<goals>
<goal>deploy</goal>
</goals>
<phase>deploy</phase>
<configuration>
<altDeploymentRepository>${custom.nexus}</altDeploymentRepository>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<modules>
<module>cloudslang-spi</module>
Expand Down

0 comments on commit 0f78c67

Please sign in to comment.