You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by fa...@apache.org on 2022/10/31 09:35:13 UTC
[incubator-pekko-samples] 01/01: Don't support multiple scala versions in pom.xml's
This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch removeScalaVersionsFromPoms
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-samples.git
commit 25e045334554f8708b72547e38b8f4d1b757a362
Author: Arnout Engelen <ar...@bzzt.net>
AuthorDate: Mon Feb 19 11:02:58 2018 +0100
Don't support multiple scala versions in pom.xml's
---
akka-sample-fsm-java/pom.xml | 22 ++--------------------
akka-sample-javaslang/pom.xml | 20 +-------------------
akka-sample-main-java/pom.xml | 20 +-------------------
akka-sample-osgi-dining-hakkers/pom.xml | 24 ++----------------------
akka-sample-persistence-java/pom.xml | 24 +++---------------------
akka-sample-supervision-java/pom.xml | 22 ++--------------------
6 files changed, 11 insertions(+), 121 deletions(-)
diff --git a/akka-sample-fsm-java/pom.xml b/akka-sample-fsm-java/pom.xml
index cc7823f..04ad640 100644
--- a/akka-sample-fsm-java/pom.xml
+++ b/akka-sample-fsm-java/pom.xml
@@ -13,33 +13,15 @@
<packaging>jar</packaging>
<version>empty</version>
- <profiles>
- <profile>
- <id>2.12.1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <scalaBinaryVersion>2.12</scalaBinaryVersion>
- </properties>
- </profile>
- <profile>
- <id>2.11.8</id>
- <properties>
- <scalaBinaryVersion>2.11</scalaBinaryVersion>
- </properties>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-actor_${scalaBinaryVersion}</artifactId>
+ <artifactId>akka-actor_2.12</artifactId>
<version>2.5.0</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-testkit_${scalaBinaryVersion}</artifactId>
+ <artifactId>akka-testkit_2.12</artifactId>
<version>2.5.0</version>
</dependency>
<dependency>
diff --git a/akka-sample-javaslang/pom.xml b/akka-sample-javaslang/pom.xml
index 45329ad..3e2832a 100644
--- a/akka-sample-javaslang/pom.xml
+++ b/akka-sample-javaslang/pom.xml
@@ -13,28 +13,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
- <profiles>
- <profile>
- <id>2.12.1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <scalaBinaryVersion>2.12</scalaBinaryVersion>
- </properties>
- </profile>
- <profile>
- <id>2.11.8</id>
- <properties>
- <scalaBinaryVersion>2.11</scalaBinaryVersion>
- </properties>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-actor_${scalaBinaryVersion}</artifactId>
+ <artifactId>akka-actor_2.12</artifactId>
<version>2.5-M2</version>
</dependency>
<dependency>
diff --git a/akka-sample-main-java/pom.xml b/akka-sample-main-java/pom.xml
index d1dc4c1..95d7d92 100644
--- a/akka-sample-main-java/pom.xml
+++ b/akka-sample-main-java/pom.xml
@@ -13,28 +13,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
- <profiles>
- <profile>
- <id>2.12.1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <scalaBinaryVersion>2.12</scalaBinaryVersion>
- </properties>
- </profile>
- <profile>
- <id>2.11.8</id>
- <properties>
- <scalaBinaryVersion>2.11</scalaBinaryVersion>
- </properties>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-actor_${scalaBinaryVersion}</artifactId>
+ <artifactId>akka-actor_2.12</artifactId>
<version>2.5.0</version>
</dependency>
</dependencies>
diff --git a/akka-sample-osgi-dining-hakkers/pom.xml b/akka-sample-osgi-dining-hakkers/pom.xml
index a5d8880..36b418c 100644
--- a/akka-sample-osgi-dining-hakkers/pom.xml
+++ b/akka-sample-osgi-dining-hakkers/pom.xml
@@ -7,26 +7,6 @@
<artifactId>project</artifactId>
<version>2.4-SNAPSHOT</version>
- <profiles>
- <profile>
- <id>2.12.1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <scalaVersion>2.12.1</scalaVersion>
- <scalaBinaryVersion>2.12</scalaBinaryVersion>
- </properties>
- </profile>
- <profile>
- <id>2.11.8</id>
- <properties>
- <scalaVersion>2.11.8</scalaVersion>
- <scalaBinaryVersion>2.11</scalaBinaryVersion>
- </properties>
- </profile>
- </profiles>
-
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<akka.version>2.5.0</akka.version>
@@ -40,8 +20,8 @@
<paxexam.version>2.6.0</paxexam.version>
<paxswissbox.version>1.6.0</paxswissbox.version>
<protobuf.version>2.5.0</protobuf.version>
- <scala.version>${scalaVersion}</scala.version>
- <scala.dep.version>${scalaBinaryVersion}</scala.dep.version>
+ <scala.version>2.12.4</scala.version>
+ <scala.dep.version>2.12</scala.dep.version>
<typesafe.config.version>1.3.0</typesafe.config.version>
<leveldb.version>0.7</leveldb.version>
<leveldbjni.version>1.8</leveldbjni.version>
diff --git a/akka-sample-persistence-java/pom.xml b/akka-sample-persistence-java/pom.xml
index 519d595..c1f44db 100644
--- a/akka-sample-persistence-java/pom.xml
+++ b/akka-sample-persistence-java/pom.xml
@@ -13,38 +13,20 @@
<packaging>jar</packaging>
<version>empty</version>
- <profiles>
- <profile>
- <id>2.12.1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <scalaBinaryVersion>2.12</scalaBinaryVersion>
- </properties>
- </profile>
- <profile>
- <id>2.11.8</id>
- <properties>
- <scalaBinaryVersion>2.11</scalaBinaryVersion>
- </properties>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-actor_${scalaBinaryVersion}</artifactId>
+ <artifactId>akka-actor_2.12</artifactId>
<version>2.5.0</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-persistence_${scalaBinaryVersion}</artifactId>
+ <artifactId>akka-persistence_2.12</artifactId>
<version>2.5.0</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-testkit_${scalaBinaryVersion}</artifactId>
+ <artifactId>akka-testkit_2.12</artifactId>
<version>2.5.0</version>
</dependency>
<dependency>
diff --git a/akka-sample-supervision-java/pom.xml b/akka-sample-supervision-java/pom.xml
index 0769bb5..6b70b49 100644
--- a/akka-sample-supervision-java/pom.xml
+++ b/akka-sample-supervision-java/pom.xml
@@ -13,33 +13,15 @@
<packaging>jar</packaging>
<version>empty</version>
- <profiles>
- <profile>
- <id>2.12.1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <scalaBinaryVersion>2.12</scalaBinaryVersion>
- </properties>
- </profile>
- <profile>
- <id>2.11.8</id>
- <properties>
- <scalaBinaryVersion>2.11</scalaBinaryVersion>
- </properties>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-actor_${scalaBinaryVersion}</artifactId>
+ <artifactId>akka-actor_2.12</artifactId>
<version>2.5.0</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-testkit_${scalaBinaryVersion}</artifactId>
+ <artifactId>akka-testkit_2.12</artifactId>
<version>2.5.0</version>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org