You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by pe...@apache.org on 2020/07/05 11:41:42 UTC
svn commit: r1879521 [6/37] - in
/river/jtsk/modules/modularize/apache-river: ./ browser/
browser/src/main/java/org/apache/river/example/browser/ extra/
groovy-config/ river-activation/ river-collections/
river-collections/src/main/java/org/apache/rive...
Modified: river/jtsk/modules/modularize/apache-river/river-dl/src/main/java/org/apache/river/admin/JavaSpaceAdmin.java
URL: http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-dl/src/main/java/org/apache/river/admin/JavaSpaceAdmin.java?rev=1879521&r1=1879520&r2=1879521&view=diff
==============================================================================
--- river/jtsk/modules/modularize/apache-river/river-dl/src/main/java/org/apache/river/admin/JavaSpaceAdmin.java (original)
+++ river/jtsk/modules/modularize/apache-river/river-dl/src/main/java/org/apache/river/admin/JavaSpaceAdmin.java Sun Jul 5 11:41:39 2020
@@ -1,111 +1,111 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.river.outrigger;
-
-import org.apache.river.admin.DestroyAdmin;
-
-import java.rmi.RemoteException;
-
-import net.jini.admin.JoinAdmin;
-import net.jini.core.entry.Entry;
-import net.jini.core.transaction.Transaction;
-import net.jini.core.transaction.TransactionException;
-import net.jini.space.JavaSpace;
-import net.jini.space.JavaSpace05;
-
-/**
- * This interface contains all the administrative methods that Outrigger
- * provides to control its JavaSpaces<sup><font size=-2>TM</font></sup>
- * service. <p>
- *
- * @deprecated Invoke the {@link JoinAdmin} and {@link
- * DestroyAdmin} methods though those interfaces. A view
- * of the space contents can be obtained through the
- * {@link JavaSpace05#contents JavaSpace05.contents}
- * method.
- *
- * @author Sun Microsystems, Inc.
- */
-public interface JavaSpaceAdmin extends JoinAdmin, DestroyAdmin {
- /**
- * Can be passed to <code>contents</code> to indicate
- * no preference for the fetch size.
- */
- final int USE_DEFAULT = -1;
-
- /**
- * Return the space that this administrative object governs.
- * @throws RemoteException if communications with the
- * server is necessary and it can not be completed.
- */
- JavaSpace space() throws RemoteException;
-
- /**
- * Return an <code>AdminIterator</code> that will iterate over all
- * the entries in the space that match the given template and are
- * visible under the given transaction.
- * <p>
- * The interactions between other operations on the space and
- * the returned iterator are undefined
- * <p>
- * @param tmpl The iterator should return only entries that match
- * tmpl
- * @param txn The iterator should return only entries that match
- * this transaction
- * @throws RemoteException if communications with the
- * server is necessary and it can not be completed.
- * @throws TransactionException if there is a problem with
- * <code>txn</code>.
- * @throws SecurityException If the space is performing
- * access control and it can not be confirmed
- * that the subject making this call has permission
- * to create an <code>AdminIterator</code> with
- * the specified template and transaction.
- */
- AdminIterator contents(Entry tmpl, Transaction txn)
- throws TransactionException, RemoteException;
-
- /**
- * Return an <code>AdminIterator</code> that will iterate over all
- * the entries in the space that match the given template and are
- * visible under the given transaction.
- * <p>
- * The interactions between other operations on the space and
- * the returned iterator are undefined
- * <p>
- * @param tmpl The iterator should return only entries that match
- * tmpl
- * @param txn The iterator should return only entries that match
- * this transaction
- * @param fetchSize advice on how many entries to fetch when the iterator
- * has to go to the server for more entries.
- * @throws RemoteException if communications with the
- * server is necessary and it can not be completed.
- * @throws TransactionException if there is a problem with
- * <code>txn</code>.
- * @throws SecurityException If the space is performing
- * access control and it can not be confirmed
- * that the subject making this call has permission
- * to create an <code>AdminIterator</code> with
- * the specified template and transaction.
- * @throws IllegalArgumentException if fetchSize is
- * not positive, or <code>USE_DEFAULT</code>.
- */
- AdminIterator contents(Entry tmpl, Transaction txn, int fetchSize)
- throws TransactionException, RemoteException;
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.river.admin;
+
+import org.apache.river.admin.DestroyAdmin;
+
+import java.rmi.RemoteException;
+
+import net.jini.admin.JoinAdmin;
+import net.jini.core.entry.Entry;
+import net.jini.core.transaction.Transaction;
+import net.jini.core.transaction.TransactionException;
+import net.jini.space.JavaSpace;
+import net.jini.space.JavaSpace05;
+
+/**
+ * This interface contains all the administrative methods that Outrigger
+ * provides to control its JavaSpaces<sup><font size=-2>TM</font></sup>
+ * service. <p>
+ *
+ * @deprecated Invoke the {@link JoinAdmin} and {@link
+ * DestroyAdmin} methods though those interfaces. A view
+ * of the space contents can be obtained through the
+ * {@link JavaSpace05#contents JavaSpace05.contents}
+ * method.
+ *
+ * @author Sun Microsystems, Inc.
+ */
+public interface JavaSpaceAdmin extends JoinAdmin, DestroyAdmin {
+ /**
+ * Can be passed to <code>contents</code> to indicate
+ * no preference for the fetch size.
+ */
+ final int USE_DEFAULT = -1;
+
+ /**
+ * Return the space that this administrative object governs.
+ * @throws RemoteException if communications with the
+ * server is necessary and it can not be completed.
+ */
+ JavaSpace space() throws RemoteException;
+
+ /**
+ * Return an <code>AdminIterator</code> that will iterate over all
+ * the entries in the space that match the given template and are
+ * visible under the given transaction.
+ * <p>
+ * The interactions between other operations on the space and
+ * the returned iterator are undefined
+ * <p>
+ * @param tmpl The iterator should return only entries that match
+ * tmpl
+ * @param txn The iterator should return only entries that match
+ * this transaction
+ * @throws RemoteException if communications with the
+ * server is necessary and it can not be completed.
+ * @throws TransactionException if there is a problem with
+ * <code>txn</code>.
+ * @throws SecurityException If the space is performing
+ * access control and it can not be confirmed
+ * that the subject making this call has permission
+ * to create an <code>AdminIterator</code> with
+ * the specified template and transaction.
+ */
+ AdminIterator contents(Entry tmpl, Transaction txn)
+ throws TransactionException, RemoteException;
+
+ /**
+ * Return an <code>AdminIterator</code> that will iterate over all
+ * the entries in the space that match the given template and are
+ * visible under the given transaction.
+ * <p>
+ * The interactions between other operations on the space and
+ * the returned iterator are undefined
+ * <p>
+ * @param tmpl The iterator should return only entries that match
+ * tmpl
+ * @param txn The iterator should return only entries that match
+ * this transaction
+ * @param fetchSize advice on how many entries to fetch when the iterator
+ * has to go to the server for more entries.
+ * @throws RemoteException if communications with the
+ * server is necessary and it can not be completed.
+ * @throws TransactionException if there is a problem with
+ * <code>txn</code>.
+ * @throws SecurityException If the space is performing
+ * access control and it can not be confirmed
+ * that the subject making this call has permission
+ * to create an <code>AdminIterator</code> with
+ * the specified template and transaction.
+ * @throws IllegalArgumentException if fetchSize is
+ * not positive, or <code>USE_DEFAULT</code>.
+ */
+ AdminIterator contents(Entry tmpl, Transaction txn, int fetchSize)
+ throws TransactionException, RemoteException;
+}
Modified: river/jtsk/modules/modularize/apache-river/river-dl/src/main/java/org/apache/river/start/group/SharedGroup.java
URL: http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-dl/src/main/java/org/apache/river/start/group/SharedGroup.java?rev=1879521&r1=1879520&r2=1879521&view=diff
==============================================================================
--- river/jtsk/modules/modularize/apache-river/river-dl/src/main/java/org/apache/river/start/group/SharedGroup.java (original)
+++ river/jtsk/modules/modularize/apache-river/river-dl/src/main/java/org/apache/river/start/group/SharedGroup.java Sun Jul 5 11:41:39 2020
@@ -1,56 +1,56 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.river.start;
-
-import java.rmi.activation.ActivationException;
-import java.rmi.RemoteException;
-
-/**
- * The {@linkplain org.apache.river.start service starter}
- * supported interface for shared group objects.
- * Shared group objects are used to destroy the VM in which they are
- * placed.
- *
- * @author Sun Microsystems, Inc.
- *
- */
-
-public interface SharedGroup {
- /**
- * Cause the hosting VM to exit.
- * This method should (in effect) spawn a
- * separate thread to do the actual work asynchronously,
- * and make a reasonable attempt to let this remote call
- * return successfully. As such, a successful return from this
- * method does not mean that the VM has been
- * destroyed. Although the service should make a reasonable
- * attempt to let this remote call return successfully,
- * the service must not wait indefinitely for other
- * (in-progress and subsequent) remote calls to finish before
- * proceeding to destroy its hosting VM. Once this method has been called,
- * the service can, but need not, reject all other
- * (in-progress and subsequent) remote calls to the service.
- *
- * @throws RemoteException if there was a problem communicating with
- * the shared group object
- * @throws ActivationException if there was a problem creating an
- * activatable shared group instance
- */
- public void destroyVM() throws RemoteException, ActivationException;
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.river.start.group;
+
+import java.rmi.activation.ActivationException;
+import java.rmi.RemoteException;
+
+/**
+ * The {@linkplain org.apache.river.start service starter}
+ * supported interface for shared group objects.
+ * Shared group objects are used to destroy the VM in which they are
+ * placed.
+ *
+ * @author Sun Microsystems, Inc.
+ *
+ */
+
+public interface SharedGroup {
+ /**
+ * Cause the hosting VM to exit.
+ * This method should (in effect) spawn a
+ * separate thread to do the actual work asynchronously,
+ * and make a reasonable attempt to let this remote call
+ * return successfully. As such, a successful return from this
+ * method does not mean that the VM has been
+ * destroyed. Although the service should make a reasonable
+ * attempt to let this remote call return successfully,
+ * the service must not wait indefinitely for other
+ * (in-progress and subsequent) remote calls to finish before
+ * proceeding to destroy its hosting VM. Once this method has been called,
+ * the service can, but need not, reject all other
+ * (in-progress and subsequent) remote calls to the service.
+ *
+ * @throws RemoteException if there was a problem communicating with
+ * the shared group object
+ * @throws ActivationException if there was a problem creating an
+ * activatable shared group instance
+ */
+ public void destroyVM() throws RemoteException, ActivationException;
+}
Modified: river/jtsk/modules/modularize/apache-river/river-iiop/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-iiop/pom.xml?rev=1879521&r1=1879520&r2=1879521&view=diff
==============================================================================
--- river/jtsk/modules/modularize/apache-river/river-iiop/pom.xml (original)
+++ river/jtsk/modules/modularize/apache-river/river-iiop/pom.xml Sun Jul 5 11:41:39 2020
@@ -1,200 +1,205 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-~ Copyright (C) 2014 the original author or authors.
-~
-~ Licensed under the Apache License, Version 2.0 (the "License");
-~ you may not use this file except in compliance with the License.
-~ You may obtain a copy of the License at
-~
-~ http://www.apache.org/licenses/LICENSE-2.0
-~
-~ Unless required by applicable law or agreed to in writing, software
-~ distributed under the License is distributed on an "AS IS" BASIS,
-~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~ See the License for the specific language governing permissions and
-~ limitations under the License.
--->
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>river</artifactId>
- <version>3.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.river</groupId>
- <artifactId>river-iiop</artifactId>
- <packaging>jar</packaging>
-
- <name>Module :: River IIOP</name>
- <description>River IIOP Exporter
- </description>
-
- <properties>
- <high.scale.lib.version>1.0.3</high.scale.lib.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.river</groupId>
- <artifactId>river-platform</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.river</groupId>
- <artifactId>river-jeri</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>river-resources</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.6</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>bnd-process</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.owasp</groupId>
- <artifactId>dependency-check-maven</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!--<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <archive>
- <manifestEntries>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Class-Path>river-resources-${project.version}.jar high-scale-lib-${high.scale.lib.version}.jar</Class-Path>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>-->
-
- <!--<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <configuration>
- <providerSelection>${gmavenProviderSelection}</providerSelection>
- <source/>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generateStubs</goal>
- <goal>compile</goal>
- <goal>generateTestStubs</goal>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>${groovy.version}</version>
- </dependency>
- </dependencies>
- </plugin>-->
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.5</source>
- <profile>compact1</profile>
- <target>1.5</target>
- <debug>true</debug>
- <optimize>true</optimize>
- <encoding>UTF-8</encoding>
- <meminitial>128m</meminitial>
- <maxmem>1024m</maxmem>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>retrotranslator-maven-plugin</artifactId>
- <version>1.0-alpha-4</version>
- <executions>
- <execution>
- <goals>
- <goal>translate-project</goal>
- </goals>
- <configuration>
- <classifier>jdk14</classifier>
- <attach>true</attach>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalDependencies>
- <additionalDependency>
- <groupId>org.apache.river</groupId>
- <artifactId>river-lib</artifactId>
- <version>${project.version}</version>
- </additionalDependency>
-<!--
- <additionalDependency>
- <groupId>org.apache.river</groupId>
- <artifactId>river-lib-dl</artifactId>
- <version>${project.version}</version>
- </additionalDependency>
--->
- </additionalDependencies>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+~ Copyright (C) 2014 the original author or authors.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>river</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.river</groupId>
+ <artifactId>river-iiop</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Module :: River IIOP</name>
+ <description>River IIOP Exporter
+ </description>
+
+ <properties>
+ <high.scale.lib.version>1.0.3</high.scale.lib.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.river</groupId>
+ <artifactId>river-logging</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.river</groupId>
+ <artifactId>river-platform</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.river</groupId>
+ <artifactId>river-jeri</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>river-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.6</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!--<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Class-Path>river-resources-${project.version}.jar high-scale-lib-${high.scale.lib.version}.jar</Class-Path>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>-->
+
+ <!--<plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <configuration>
+ <providerSelection>${gmavenProviderSelection}</providerSelection>
+ <source/>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generateStubs</goal>
+ <goal>compile</goal>
+ <goal>generateTestStubs</goal>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>-->
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.8</source>
+ <profile>compact1</profile>
+ <target>1.8</target>
+ <debug>true</debug>
+ <optimize>true</optimize>
+ <encoding>UTF-8</encoding>
+ <meminitial>128m</meminitial>
+ <maxmem>1024m</maxmem>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>retrotranslator-maven-plugin</artifactId>
+ <version>1.0-alpha-4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>translate-project</goal>
+ </goals>
+ <configuration>
+ <classifier>jdk14</classifier>
+ <attach>true</attach>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <additionalDependencies>
+ <additionalDependency>
+ <groupId>org.apache.river</groupId>
+ <artifactId>river-lib</artifactId>
+ <version>${project.version}</version>
+ </additionalDependency>
+<!--
+ <additionalDependency>
+ <groupId>org.apache.river</groupId>
+ <artifactId>river-lib-dl</artifactId>
+ <version>${project.version}</version>
+ </additionalDependency>
+-->
+ </additionalDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Modified: river/jtsk/modules/modularize/apache-river/river-jeri/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-jeri/pom.xml?rev=1879521&r1=1879520&r2=1879521&view=diff
==============================================================================
--- river/jtsk/modules/modularize/apache-river/river-jeri/pom.xml (original)
+++ river/jtsk/modules/modularize/apache-river/river-jeri/pom.xml Sun Jul 5 11:41:39 2020
@@ -1,218 +1,189 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-~ Copyright (C) 2014 the original author or authors.
-~
-~ Licensed under the Apache License, Version 2.0 (the "License");
-~ you may not use this file except in compliance with the License.
-~ You may obtain a copy of the License at
-~
-~ http://www.apache.org/licenses/LICENSE-2.0
-~
-~ Unless required by applicable law or agreed to in writing, software
-~ distributed under the License is distributed on an "AS IS" BASIS,
-~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~ See the License for the specific language governing permissions and
-~ limitations under the License.
--->
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>river</artifactId>
- <version>3.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.river</groupId>
- <artifactId>river-jeri</artifactId>
- <packaging>jar</packaging>
-
- <name>Module :: River Jini Extensible Remote Invocation</name>
- <description>Apache River Remote Micro Services Platform
- </description>
-
- <properties>
- <high.scale.lib.version>1.0.6</high.scale.lib.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.bnd.annotation</artifactId>
- <version>3.3.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.river</groupId>
- <artifactId>river-platform</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.boundary</groupId>
- <artifactId>high-scale-lib</artifactId>
- <version>${high.scale.lib.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.6</version>
- <scope>test</scope>
- </dependency>
- <!--<dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
- <version>132</version>
- <type>jar</type>
- </dependency>-->
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Class-Path>river-resources-${project.version}.jar high-scale-lib-${high.scale.lib.version}.jar</Class-Path>
- </manifestEntries>
- </archive>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>bnd-process</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.owasp</groupId>
- <artifactId>dependency-check-maven</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!--<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <archive>
- <manifestEntries>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Class-Path>river-resources-${project.version}.jar high-scale-lib-${high.scale.lib.version}.jar</Class-Path>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>-->
-
- <!--<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <configuration>
- <providerSelection>${gmavenProviderSelection}</providerSelection>
- <source/>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generateStubs</goal>
- <goal>compile</goal>
- <goal>generateTestStubs</goal>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>${groovy.version}</version>
- </dependency>
- </dependencies>
- </plugin>-->
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.5</source>
- <profile>compact1</profile>
- <target>1.5</target>
- <debug>true</debug>
- <optimize>true</optimize>
- <encoding>UTF-8</encoding>
- <meminitial>128m</meminitial>
- <maxmem>1024m</maxmem>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>retrotranslator-maven-plugin</artifactId>
- <version>1.0-alpha-4</version>
- <executions>
- <execution>
- <goals>
- <goal>translate-project</goal>
- </goals>
- <configuration>
- <classifier>jdk14</classifier>
- <attach>true</attach>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <!--
- <additionalDependencies>
- <additionalDependency>
- <groupId>org.apache.river</groupId>
- <artifactId>river-lib</artifactId>
- <version>${project.version}</version>
- </additionalDependency>
- <additionalDependency>
- <groupId>org.apache.river</groupId>
- <artifactId>river-lib-dl</artifactId>
- <version>${project.version}</version>
- </additionalDependency>
- </additionalDependencies>
--->
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <configuration>
- <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ~ Copyright (C) 2014 the original author or authors. ~ ~ Licensed under
+ the Apache License, Version 2.0 (the "License"); ~ you may not use this file
+ except in compliance with the License. ~ You may obtain a copy of the License
+ at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by
+ applicable law or agreed to in writing, software ~ distributed under the
+ License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. ~ See the License for the specific
+ language governing permissions and ~ limitations under the License. -->
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>river</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.river</groupId>
+ <artifactId>river-jeri</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Module :: River Jini Extensible Remote Invocation</name>
+ <description>Apache River Remote Micro Services Platform
+ </description>
+
+ <properties>
+ <high.scale.lib.version>1.0.6</high.scale.lib.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>biz.aQute.bnd.annotation</artifactId>
+ <version>3.3.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.river</groupId>
+ <artifactId>river-logging</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!--
+ <dependency>
+ <groupId>org.apache.river</groupId>
+ <artifactId>river-platform</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ -->
+
+ <dependency>
+ <groupId>org.apache.river</groupId>
+ <artifactId>river-lib</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.boundary</groupId>
+ <artifactId>high-scale-lib</artifactId>
+ <version>${high.scale.lib.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.6</version>
+ <scope>test</scope>
+ </dependency>
+ <!--<dependency> <groupId>bouncycastle</groupId> <artifactId>bcprov-jdk14</artifactId>
+ <version>132</version> <type>jar</type> </dependency> -->
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Class-Path>river-resources-${project.version}.jar
+ high-scale-lib-${high.scale.lib.version}.jar</Class-Path>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!--<plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version> <configuration> <archive> <manifestEntries> <Implementation-Version>${project.version}</Implementation-Version>
+ <Class-Path>river-resources-${project.version}.jar high-scale-lib-${high.scale.lib.version}.jar</Class-Path>
+ </manifestEntries> </archive> </configuration> </plugin> -->
+
+ <!--<plugin> <groupId>org.codehaus.gmaven</groupId> <artifactId>gmaven-plugin</artifactId>
+ <configuration> <providerSelection>${gmavenProviderSelection}</providerSelection>
+ <source/> </configuration> <executions> <execution> <goals> <goal>generateStubs</goal>
+ <goal>compile</goal> <goal>generateTestStubs</goal> <goal>testCompile</goal>
+ </goals> </execution> </executions> <dependencies> <dependency> <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId> <version>${groovy.version}</version>
+ </dependency> </dependencies> </plugin> -->
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.8</source>
+ <profile>compact1</profile>
+ <target>1.8</target>
+ <debug>true</debug>
+ <optimize>true</optimize>
+ <encoding>UTF-8</encoding>
+ <meminitial>128m</meminitial>
+ <maxmem>1024m</maxmem>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>retrotranslator-maven-plugin</artifactId>
+ <version>1.0-alpha-4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>translate-project</goal>
+ </goals>
+ <configuration>
+ <classifier>jdk14</classifier>
+ <attach>true</attach>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <!-- <additionalDependencies> <additionalDependency> <groupId>org.apache.river</groupId>
+ <artifactId>river-lib</artifactId> <version>${project.version}</version>
+ </additionalDependency> <additionalDependency> <groupId>org.apache.river</groupId>
+ <artifactId>river-lib-dl</artifactId> <version>${project.version}</version>
+ </additionalDependency> </additionalDependencies> -->
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <configuration>
+ <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Modified: river/jtsk/modules/modularize/apache-river/river-jrmp/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-jrmp/pom.xml?rev=1879521&r1=1879520&r2=1879521&view=diff
==============================================================================
--- river/jtsk/modules/modularize/apache-river/river-jrmp/pom.xml (original)
+++ river/jtsk/modules/modularize/apache-river/river-jrmp/pom.xml Sun Jul 5 11:41:39 2020
@@ -1,203 +1,170 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-~ Copyright (C) 2014 the original author or authors.
-~
-~ Licensed under the Apache License, Version 2.0 (the "License");
-~ you may not use this file except in compliance with the License.
-~ You may obtain a copy of the License at
-~
-~ http://www.apache.org/licenses/LICENSE-2.0
-~
-~ Unless required by applicable law or agreed to in writing, software
-~ distributed under the License is distributed on an "AS IS" BASIS,
-~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~ See the License for the specific language governing permissions and
-~ limitations under the License.
--->
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>river</artifactId>
- <version>3.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.river</groupId>
- <artifactId>river-jrmp</artifactId>
- <packaging>jar</packaging>
-
- <name>Module :: River JRMP</name>
- <description>River JRMP Exporter
- </description>
-
- <properties>
- <high.scale.lib.version>1.0.3</high.scale.lib.version>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.river</groupId>
- <artifactId>river-platform</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.river</groupId>
- <artifactId>river-jeri</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>river-resources</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.6</version>
- <scope>test</scope>
- </dependency>
-
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>bnd-process</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.owasp</groupId>
- <artifactId>dependency-check-maven</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!--<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <archive>
- <manifestEntries>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Class-Path>river-resources-${project.version}.jar high-scale-lib-${high.scale.lib.version}.jar</Class-Path>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>-->
-
- <!--<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <configuration>
- <providerSelection>${gmavenProviderSelection}</providerSelection>
- <source/>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generateStubs</goal>
- <goal>compile</goal>
- <goal>generateTestStubs</goal>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>${groovy.version}</version>
- </dependency>
- </dependencies>
- </plugin>-->
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.5</source>
- <profile>compact1</profile>
- <target>1.5</target>
- <debug>true</debug>
- <optimize>true</optimize>
- <encoding>UTF-8</encoding>
- <meminitial>128m</meminitial>
- <maxmem>1024m</maxmem>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>retrotranslator-maven-plugin</artifactId>
- <version>1.0-alpha-4</version>
- <executions>
- <execution>
- <goals>
- <goal>translate-project</goal>
- </goals>
- <configuration>
- <classifier>jdk14</classifier>
- <attach>true</attach>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalDependencies>
- <additionalDependency>
- <groupId>org.apache.river</groupId>
- <artifactId>river-lib</artifactId>
- <version>${project.version}</version>
- </additionalDependency>
-<!--
- <additionalDependency>
- <groupId>org.apache.river</groupId>
- <artifactId>river-lib-dl</artifactId>
- <version>${project.version}</version>
- </additionalDependency>
--->
- </additionalDependencies>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ~ Copyright (C) 2014 the original author or authors. ~ ~ Licensed under
+ the Apache License, Version 2.0 (the "License"); ~ you may not use this file
+ except in compliance with the License. ~ You may obtain a copy of the License
+ at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by
+ applicable law or agreed to in writing, software ~ distributed under the
+ License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. ~ See the License for the specific
+ language governing permissions and ~ limitations under the License. -->
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>river</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.river</groupId>
+ <artifactId>river-jrmp</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Module :: River JRMP</name>
+ <description>River JRMP Exporter
+ </description>
+
+ <properties>
+ <high.scale.lib.version>1.0.3</high.scale.lib.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.river</groupId>
+ <artifactId>river-logging</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.river</groupId>
+ <artifactId>river-platform</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.river</groupId>
+ <artifactId>river-jeri</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>river-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.6</version>
+ <scope>test</scope>
+ </dependency>
+
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!--<plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version> <configuration> <archive> <manifestEntries> <Implementation-Version>${project.version}</Implementation-Version>
+ <Class-Path>river-resources-${project.version}.jar high-scale-lib-${high.scale.lib.version}.jar</Class-Path>
+ </manifestEntries> </archive> </configuration> </plugin> -->
+
+ <!--<plugin> <groupId>org.codehaus.gmaven</groupId> <artifactId>gmaven-plugin</artifactId>
+ <configuration> <providerSelection>${gmavenProviderSelection}</providerSelection>
+ <source/> </configuration> <executions> <execution> <goals> <goal>generateStubs</goal>
+ <goal>compile</goal> <goal>generateTestStubs</goal> <goal>testCompile</goal>
+ </goals> </execution> </executions> <dependencies> <dependency> <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId> <version>${groovy.version}</version>
+ </dependency> </dependencies> </plugin> -->
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.8</source>
+ <profile>compact1</profile>
+ <target>1.8</target>
+ <debug>true</debug>
+ <optimize>true</optimize>
+ <encoding>UTF-8</encoding>
+ <meminitial>128m</meminitial>
+ <maxmem>1024m</maxmem>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>retrotranslator-maven-plugin</artifactId>
+ <version>1.0-alpha-4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>translate-project</goal>
+ </goals>
+ <configuration>
+ <classifier>jdk14</classifier>
+ <attach>true</attach>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <additionalDependencies>
+ <additionalDependency>
+ <groupId>org.apache.river</groupId>
+ <artifactId>river-lib</artifactId>
+ <version>${project.version}</version>
+ </additionalDependency>
+ <!-- <additionalDependency> <groupId>org.apache.river</groupId> <artifactId>river-lib-dl</artifactId>
+ <version>${project.version}</version> </additionalDependency> -->
+ </additionalDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Modified: river/jtsk/modules/modularize/apache-river/river-lib/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-lib/pom.xml?rev=1879521&r1=1879520&r2=1879521&view=diff
==============================================================================
--- river/jtsk/modules/modularize/apache-river/river-lib/pom.xml (original)
+++ river/jtsk/modules/modularize/apache-river/river-lib/pom.xml Sun Jul 5 11:41:39 2020
@@ -1,65 +1,87 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-~ Copyright (C) 2014 the original author or authors.
-~
-~ Licensed under the Apache License, Version 2.0 (the "License");
-~ you may not use this file except in compliance with the License.
-~ You may obtain a copy of the License at
-~
-~ http://www.apache.org/licenses/LICENSE-2.0
-~
-~ Unless required by applicable law or agreed to in writing, software
-~ distributed under the License is distributed on an "AS IS" BASIS,
-~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~ See the License for the specific language governing permissions and
-~ limitations under the License.
--->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>river</artifactId>
- <groupId>org.apache</groupId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <groupId>org.apache.river</groupId>
- <artifactId>river-lib</artifactId>
- <url>http://river.apache.org</url>
- <name>Module :: River Service Library</name>
- <description>This artifact contains the River utility APIs that are not tied
- to a specific service implementation.</description>
-
- <dependencies>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>river-dl</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ~ Copyright (C) 2014 the original author or authors. ~ ~ Licensed under
+ the Apache License, Version 2.0 (the "License"); ~ you may not use this file
+ except in compliance with the License. ~ You may obtain a copy of the License
+ at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by
+ applicable law or agreed to in writing, software ~ distributed under the
+ License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. ~ See the License for the specific
+ language governing permissions and ~ limitations under the License. -->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>river</artifactId>
+ <groupId>org.apache</groupId>
+ <version>3.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.river</groupId>
+ <artifactId>river-lib</artifactId>
+ <url>http://river.apache.org</url>
+ <name>Module :: River Service Library</name>
+ <description>This artifact contains the River utility APIs that are not tied
+ to a specific service implementation.</description>
+
+ <properties>
+ <high.scale.lib.version>1.0.6</high.scale.lib.version>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ </properties>
+
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.river</groupId>
+ <artifactId>river-logging</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.river</groupId>
+ <artifactId>river-collections</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.boundary</groupId>
+ <artifactId>high-scale-lib</artifactId>
+ <version>${high.scale.lib.version}</version>
+ </dependency>
+
+ <!-- https://mvnrepository.com/artifact/org.apache.velocity/velocity -->
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.7</version>
+ </dependency>
+
+
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
+
+</project>
Modified: river/jtsk/modules/modularize/apache-river/river-lib/src/main/java/org/apache/river/start/lifecycle/LifeCycle.java
URL: http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-lib/src/main/java/org/apache/river/start/lifecycle/LifeCycle.java?rev=1879521&r1=1879520&r2=1879521&view=diff
==============================================================================
--- river/jtsk/modules/modularize/apache-river/river-lib/src/main/java/org/apache/river/start/lifecycle/LifeCycle.java (original)
+++ river/jtsk/modules/modularize/apache-river/river-lib/src/main/java/org/apache/river/start/lifecycle/LifeCycle.java Sun Jul 5 11:41:39 2020
@@ -1,54 +1,54 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.river.start;
-
-/**
- * The interface used to manage the lifecycle of shared, non-activatable
- * services started by the
- * {@linkplain org.apache.river.start service starter}. Services
- * started via a
- * {@link org.apache.river.start.NonActivatableServiceDescriptor} get passed a
- * reference to a <code>LifeCycle</code> object, which can be used by the
- * server to inform the hosting environment that it can release any resources
- * associated with the server (presumably because the server is terminating).
- *
- * @see org.apache.river.start.NonActivatableServiceDescriptor
- * @see org.apache.river.start.ServiceStarter
- *
- * @author Sun Microsystems, Inc.
- *
- * @since 2.0
- */
-public interface LifeCycle {
-
- /**
- * Method invoked by a server to inform the <code>LifeCycle</code>
- * object that it can release any resources associated with the server.
- *
- * @param impl Object reference to the implementation object
- * created by the <code>NonActivatableServiceDescriptor</code>.
- * This reference must be equal, in the "==" sense, to the
- * object created by the
- * <code>NonActivatableServiceDescriptor</code>.
- * @return true if the invocation was successfully processed and
- * false otherwise.
- */
- public boolean unregister(Object impl);
-}
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.river.start.lifecycle;
+
+/**
+ * The interface used to manage the lifecycle of shared, non-activatable
+ * services started by the
+ * {@linkplain org.apache.river.start service starter}. Services
+ * started via a
+ * {@link org.apache.river.start.NonActivatableServiceDescriptor} get passed a
+ * reference to a <code>LifeCycle</code> object, which can be used by the
+ * server to inform the hosting environment that it can release any resources
+ * associated with the server (presumably because the server is terminating).
+ *
+ * @see org.apache.river.start.NonActivatableServiceDescriptor
+ * @see org.apache.river.start.ServiceStarter
+ *
+ * @author Sun Microsystems, Inc.
+ *
+ * @since 2.0
+ */
+public interface LifeCycle {
+
+ /**
+ * Method invoked by a server to inform the <code>LifeCycle</code>
+ * object that it can release any resources associated with the server.
+ *
+ * @param impl Object reference to the implementation object
+ * created by the <code>NonActivatableServiceDescriptor</code>.
+ * This reference must be equal, in the "==" sense, to the
+ * object created by the
+ * <code>NonActivatableServiceDescriptor</code>.
+ * @return true if the invocation was successfully processed and
+ * false otherwise.
+ */
+ public boolean unregister(Object impl);
+}
+
Modified: river/jtsk/modules/modularize/apache-river/river-platform/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-platform/pom.xml?rev=1879521&r1=1879520&r2=1879521&view=diff
==============================================================================
--- river/jtsk/modules/modularize/apache-river/river-platform/pom.xml (original)
+++ river/jtsk/modules/modularize/apache-river/river-platform/pom.xml Sun Jul 5 11:41:39 2020
@@ -1,126 +1,115 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-~ Copyright (C) 2014 the original author or authors.
-~
-~ Licensed under the Apache License, Version 2.0 (the "License");
-~ you may not use this file except in compliance with the License.
-~ You may obtain a copy of the License at
-~
-~ http://www.apache.org/licenses/LICENSE-2.0
-~
-~ Unless required by applicable law or agreed to in writing, software
-~ distributed under the License is distributed on an "AS IS" BASIS,
-~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~ See the License for the specific language governing permissions and
-~ limitations under the License.
--->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>river</artifactId>
- <groupId>org.apache</groupId>
- <version>3.0-SNAPSHOT</version>
- </parent>
- <groupId>org.apache.river</groupId>
- <artifactId>river-platform</artifactId>
- <url>http://river.apache.org</url>
- <name>Module :: River Platform</name>
- <description>Configures specific service providers to be used, such as
- PreferredClassProvider, trust and integrity verifiers, and DiscoveryFormatProvider
- </description>
-
- <dependencies>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>river-resources</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </dependency>
-
- <dependency>
- <groupId>au.net.Zeus</groupId>
- <artifactId>custard-apple</artifactId>
- <version>${custard.apple.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.boundary</groupId>
- <artifactId>high-scale-lib</artifactId>
- <version>${high.scale.lib.version}</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <archive>
- <manifestEntries>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Class-Path>river-resources-${project.version}.jar custard-apple-${custard.apple.version}.jar high-scale-lib-${high.scale.lib.version}.jar</Class-Path>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <configuration>
- <providerSelection>${gmavenProviderSelection}</providerSelection>
- <source/>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generateStubs</goal>
- <goal>compile</goal>
- <goal>generateTestStubs</goal>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>${groovy.version}</version>
- </dependency>
- </dependencies>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-
- <properties>
- <high.scale.lib.version>1.0.3</high.scale.lib.version>
- <custard.apple.version>1.0.3</custard.apple.version>
- </properties>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ~ Copyright (C) 2014 the original author or authors. ~ ~ Licensed under
+ the Apache License, Version 2.0 (the "License"); ~ you may not use this file
+ except in compliance with the License. ~ You may obtain a copy of the License
+ at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by
+ applicable law or agreed to in writing, software ~ distributed under the
+ License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. ~ See the License for the specific
+ language governing permissions and ~ limitations under the License. -->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>river</artifactId>
+ <groupId>org.apache</groupId>
+ <version>3.0-SNAPSHOT</version>
+ <relativePath>../</relativePath>
+ </parent>
+ <groupId>org.apache.river</groupId>
+ <artifactId>river-platform</artifactId>
+ <url>http://river.apache.org</url>
+ <name>Module :: River Platform</name>
+ <description>Configures specific service providers to be used, such as
+ PreferredClassProvider, trust and integrity verifiers, and DiscoveryFormatProvider
+ </description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>river-logging</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>river-lib</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>river-collections</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!--
+ <dependency>
+ <groupId>org.apache.river</groupId>
+ <artifactId>river-discovery-providers</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ -->
+
+ <dependency>
+ <groupId>com.boundary</groupId>
+ <artifactId>high-scale-lib</artifactId>
+ <version>${high.scale.lib.version}</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Class-Path>river-resources-${project.version}.jar
+ custard-apple-${custard.apple.version}.jar
+ high-scale-lib-${high.scale.lib.version}.jar</Class-Path>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <!-- <plugin> <groupId>org.codehaus.gmaven</groupId> <artifactId>gmaven-plugin</artifactId>
+ <configuration> <providerSelection>${gmavenProviderSelection}</providerSelection>
+ <source/> </configuration> <executions> <execution> <goals> <goal>generateStubs</goal>
+ <goal>compile</goal> <goal>generateTestStubs</goal> <goal>testCompile</goal>
+ </goals> </execution> </executions> <dependencies> <dependency> <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId> <version>${groovy.version}</version>
+ </dependency> </dependencies> </plugin> -->
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <properties>
+ <high.scale.lib.version>1.0.6</high.scale.lib.version>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ </properties>
+
+</project>