raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

fix osgi-dining-hakkers sample

Browse source
This commit is contained in:
tpfeifer 2016-04-06 20:07:51 +02:00
parent 770c216ceb
commit c0c1981f30
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
akka-samples/akka-sample-osgi-dining-hakkers/assembly-features/src/main/resources/features.xml
View file

@ -8,6 +8,7 @@
<feature name='scala' description='Scala' version='${scala.version}' resolver='(obr)'>
<bundle start-level="15">mvn:org.scala-lang/scala-library/${scala.version}</bundle>
<bundle start-level="15">mvn:org.scala-lang/scala-reflect/${scala.version}</bundle>
<bundle start-level="15">mvn:org.scala-lang.modules/scala-java8-compat_2.11/0.7.0</bundle>
</feature>
<feature name='uncommons-maths' description='Uncommons Maths' version='${uncommons-maths.version}' resolver='(obr)'>
@ -15,10 +16,6 @@
<bundle start-level="20">mvn:com.typesafe.akka.akka-sample-osgi-dining-hakkers/uncommons/1.2.2</bundle>
</feature>
<feature name='protobuf' description='Protobuf feature' version='${protobuf.version}' resolver='(obr)'>
<bundle start-level="20">mvn:com.google.protobuf/protobuf-java/${protobuf.version}</bundle>
</feature>
<feature name='netty' description='Netty feature' version='${netty.version}' resolver='(obr)'>
<bundle start-level="20">mvn:io.netty/netty/${netty.version}</bundle>
</feature>
@ -36,14 +33,14 @@
<feature version="${scala.version}">scala</feature>
<feature version="${netty.version}">netty</feature>
<feature version="${uncommons-maths.version}">uncommons-maths</feature>
<feature version="${protobuf.version}">protobuf</feature>
<feature version="${typesafe.config.version}">typesafe-config</feature>
<feature version="${leveldb.version}">leveldb</feature>
<bundle start-level="20">mvn:com.typesafe.akka/akka-protobuf_${scala.dep.version}/${akka.version}</bundle>
<bundle start-level="30">mvn:com.typesafe.akka/akka-actor_${scala.dep.version}/${akka.version}</bundle>
<bundle start-level="30">mvn:com.typesafe.akka/akka-osgi_${scala.dep.version}/${akka.version}</bundle>
<bundle start-level="30">mvn:com.typesafe.akka/akka-remote_${scala.dep.version}/${akka.version}</bundle>
<bundle start-level="30">mvn:com.typesafe.akka/akka-cluster_${scala.dep.version}/${akka.version}</bundle>
<bundle start-level="30">mvn:com.typesafe.akka/akka-persistence-experimental_${scala.dep.version}/${akka.version}</bundle>
<bundle start-level="30">mvn:com.typesafe.akka/akka-persistence_${scala.dep.version}/${akka.version}</bundle>
<bundle start-level="30">mvn:com.typesafe.akka/akka-slf4j_${scala.dep.version}/${akka.version}</bundle>
</feature>

6
akka-samples/akka-sample-osgi-dining-hakkers/pom.xml
View file

@ -12,7 +12,7 @@
<akka.version>2.4-SNAPSHOT</akka.version>
<karaf.version>2.3.1</karaf.version>
<karaf.tooling.exam.version>${karaf.version}</karaf.tooling.exam.version>
<netty.version>3.8.0.Final</netty.version>
<netty.version>3.10.5.Final</netty.version>
<osgi.version>4.3.1</osgi.version>
<paxexam.version>2.6.0</paxexam.version>
<paxswissbox.version>1.6.0</paxswissbox.version>
@ -20,7 +20,7 @@
<scala.version>2.11.7</scala.version>
<scala.dep.version>2.11</scala.dep.version>
<scalatest.version>2.2.3</scalatest.version>
<typesafe.config.version>1.2.1</typesafe.config.version>
<typesafe.config.version>1.3.0</typesafe.config.version>
<leveldb.version>0.7</leveldb.version>
<leveldbjni.version>1.8</leveldbjni.version>
<uncommons-maths.version>1.2.2</uncommons-maths.version>
@ -96,7 +96,7 @@
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-persistence-experimental_${scala.dep.version}</artifactId>
<artifactId>akka-persistence_${scala.dep.version}</artifactId>
<version>${akka.version}</version>
</dependency>
<dependency>