Skip to content

Changes to Rio, to use the latest release of JGDMS 3.1.0 Jini Platfor… #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pfirmstone wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changes to Rio, to use the latest release of JGDMS 3.1.0 Jini Platfor… #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions distribution/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,13 @@
</dependency>

<dependency>
<groupId>org.apache.river</groupId>
<artifactId>reggie</artifactId>
<groupId>au.net.zeus.jgdms.reggie</groupId>
<artifactId>reggie-service</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.apache.river</groupId>
<groupId>au.net.zeus.jgdms.reggie</groupId>
<artifactId>reggie-dl</artifactId>
<optional>true</optional>
</dependency>
Expand Down
10 changes: 5 additions & 5 deletions distribution/src/main/config/poms/reggie-dl-2.2.2.pom
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
<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 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.river</groupId>
<groupId>au.net.zeus.jgdms.reggie</groupId>
<artifactId>reggie-dl</artifactId>
<version>2.2.2</version>
<version>3.1</version>
<url>http://river.apache.org</url>
<description>River Lookup and Registry service client download jar</description>

Expand All @@ -38,9 +38,9 @@

<dependencies>
<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-dl</artifactId>
<version>2.2.2</version>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-lib-dl</artifactId>
<version>3.1</version>
</dependency>
</dependencies>

Expand Down
28 changes: 14 additions & 14 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,44 +177,44 @@
<dependencies>

<dependency>
<groupId>org.apache.river</groupId>
<artifactId>start</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jini-2.1-compat</artifactId>
<version>${river.version}</version>
</dependency>

<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-lib</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-lib</artifactId>
<version>${river.version}</version>
</dependency>

<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-dl</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-lib-dl</artifactId>
<version>${river.version}</version>
</dependency>

<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-platform</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-platform</artifactId>
<version>${river.version}</version>
</dependency>

<dependency>
<groupId>org.apache.river</groupId>
<artifactId>reggie</artifactId>
<groupId>au.net.zeus.jgdms.reggie</groupId>
<artifactId>reggie-service</artifactId>
<version>${river.version}</version>
</dependency>

<dependency>
<groupId>org.apache.river</groupId>
<groupId>au.net.zeus.jgdms.reggie</groupId>
<artifactId>reggie-dl</artifactId>
<version>${river.version}</version>
</dependency>

<dependency>
<groupId>net.jini.lookup</groupId>
<artifactId>serviceui</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-ui-factory</artifactId>
<version>${river.version}</version>
</dependency>

Expand Down Expand Up @@ -436,7 +436,7 @@
<junit.version>4.12</junit.version>
<rio.version>5.6.6</rio.version>
<rio.plugin.version>5.1</rio.plugin.version>
<river.version>2.2.2</river.version>
<river.version>3.1.0</river.version>
<hyperic.version>1.6.3.82</hyperic.version>
<hyperic.repo.dir>${settings.localRepository}/org/hyperic/sigar-dist</hyperic.repo.dir>
<sigar.dist>${hyperic.repo.dir}/${hyperic.version}/sigar-dist-${hyperic.version}</sigar.dist>
Expand Down
17 changes: 11 additions & 6 deletions rio-core/rio-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
<dependencies>

<dependency>
<groupId>net.jini.lookup</groupId>
<artifactId>serviceui</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-ui-factory</artifactId>
</dependency>

<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-dl</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-lib-dl</artifactId>
</dependency>

<dependency>
Expand All @@ -39,10 +39,15 @@
</dependency>

<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-platform</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-platform</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jini-2.1-compat</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
Expand Down
4 changes: 2 additions & 2 deletions rio-core/rio-api/src/main/java/org/rioproject/deploy/ServiceProvisionEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class ServiceProvisionEvent extends RemoteEvent implements Serializable {
* @param source The event source
*/
public ServiceProvisionEvent(Object source) {
super(source, ID, 0, null);
super(source, ID, 0, (MarshalledObject) null);
}

/**
Expand All @@ -58,7 +58,7 @@ public ServiceProvisionEvent(Object source) {
public ServiceProvisionEvent(Object source,
OperationalStringManager opStringManager,
ServiceElement svcElement) {
super(source, ID, 0, null);
super(source, ID, 0, (MarshalledObject) null);
this.opStringManager = opStringManager;
this.svcElement = svcElement;
}
Expand Down
2 changes: 1 addition & 1 deletion rio-core/rio-api/src/main/java/org/rioproject/event/RemoteServiceEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public RemoteServiceEvent(Object source) {
* <code>source</code> is required by RemoteEvents' superclass,
* EventObject, which rejects a null for <code>source</code>.
*/
super(source, 0, 0, null);
super(source, 0, 0, (MarshalledObject) null);
date = new Date(System.currentTimeMillis());
}

Expand Down
29 changes: 21 additions & 8 deletions rio-core/rio-lib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,24 +55,37 @@
</dependency>

<dependency>
<groupId>org.apache.river</groupId>
<artifactId>start</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>service-starter</artifactId>
<version>${river.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>net.jini.lookup</groupId>
<artifactId>serviceui</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-ui-factory</artifactId>
</dependency>

<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-lib</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-lib</artifactId>
</dependency>

<dependency>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-discovery-providers</artifactId>
<version>${river.version}</version>
</dependency>

<dependency>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-jrmp</artifactId>
<version>${river.version}</version>
</dependency>

<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-platform</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-platform</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions rio-core/rio-proxy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
</dependency>

<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-platform</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-platform</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
14 changes: 11 additions & 3 deletions rio-platform/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,16 @@
<dependencies>

<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-platform</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-platform</artifactId>
<version>${river.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-jeri</artifactId>
<version>${river.version}</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -62,7 +70,7 @@
<Implementation-Version>${project.version}</Implementation-Version>
<Rio-Version>${project.version}</Rio-Version>
<Rio-Build>${maven.build.timestamp}</Rio-Build>
<Class-Path>jsk-platform-${river.version}.jar groovy-all-${groovy.version}.jar logging/slf4j-api-${slf4j.version}.jar</Class-Path>
<Class-Path>jgdms-platform-${river.version}.jar groovy-all-${groovy.version}.jar logging/slf4j-api-${slf4j.version}.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
Expand Down
9 changes: 5 additions & 4 deletions rio-services/cybernode/cybernode-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,14 @@
</dependency>

<dependency>
<groupId>net.jini.lookup</groupId>
<artifactId>serviceui</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-ui-factory</artifactId>
</dependency>

<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-platform</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-platform</artifactId>
<version>${river.version}</version>
<scope>provided</scope>
</dependency>

Expand Down
5 changes: 3 additions & 2 deletions rio-services/cybernode/cybernode-proxy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@
</dependency>

<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-platform</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-platform</artifactId>
<version>${river.version}</version>
<scope>provided</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions rio-services/cybernode/cybernode-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
</dependency>

<dependency>
<groupId>net.jini.lookup</groupId>
<artifactId>serviceui</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-ui-factory</artifactId>
</dependency>

<dependency>
Expand Down
8 changes: 4 additions & 4 deletions rio-services/cybernode/cybernode-ui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
</dependency>

<dependency>
<groupId>net.jini.lookup</groupId>
<artifactId>serviceui</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-ui-factory</artifactId>
</dependency>

<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-platform</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-platform</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
5 changes: 3 additions & 2 deletions rio-services/event-collector/event-collector-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@
</dependency>

<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-platform</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-platform</artifactId>
<version>${river.version}</version>
<scope>provided</scope>
</dependency>

Expand Down
5 changes: 3 additions & 2 deletions rio-services/event-collector/event-collector-proxy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@
</dependency>

<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-platform</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-platform</artifactId>
<version>${river.version}</version>
<scope>provided</scope>
</dependency>

Expand Down
8 changes: 4 additions & 4 deletions rio-services/monitor/monitor-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
</dependency>

<dependency>
<groupId>net.jini.lookup</groupId>
<artifactId>serviceui</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-ui-factory</artifactId>
</dependency>

<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-platform</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-platform</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
8 changes: 4 additions & 4 deletions rio-services/monitor/monitor-proxy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
</dependency>

<dependency>
<groupId>net.jini.lookup</groupId>
<artifactId>serviceui</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-ui-factory</artifactId>
</dependency>

<dependency>
<groupId>net.jini</groupId>
<artifactId>jsk-platform</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-platform</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
9 changes: 4 additions & 5 deletions rio-services/monitor/monitor-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
</dependency>

<dependency>
<groupId>net.jini.lookup</groupId>
<artifactId>serviceui</artifactId>
<groupId>au.net.zeus.jgdms</groupId>
<artifactId>jgdms-ui-factory</artifactId>
</dependency>

<dependency>
Expand Down Expand Up @@ -65,9 +65,8 @@
</dependency>

<dependency>
<groupId>org.apache.river</groupId>
<artifactId>reggie</artifactId>
<version>${river.version}</version>
<groupId>au.net.zeus.jgdms.reggie</groupId>
<artifactId>reggie-service</artifactId>
<scope>test</scope>
</dependency>

Expand Down
Loading