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 [3/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/browser/src/main/java/org/apache/river/example/browser/SpaceBrowser.java
URL: http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/browser/src/main/java/org/apache/river/example/browser/SpaceBrowser.java?rev=1879521&r1=1879520&r2=1879521&view=diff
==============================================================================
--- river/jtsk/modules/modularize/apache-river/browser/src/main/java/org/apache/river/example/browser/SpaceBrowser.java (original)
+++ river/jtsk/modules/modularize/apache-river/browser/src/main/java/org/apache/river/example/browser/SpaceBrowser.java Sun Jul  5 11:41:39 2020
@@ -1,174 +1,174 @@
-/*
- * 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.example.browser;
-
-import org.apache.river.outrigger.JavaSpaceAdmin;
-import org.apache.river.outrigger.AdminIterator;
-import net.jini.core.entry.Entry;
-import net.jini.core.entry.UnusableEntryException;
-import net.jini.core.lease.Lease;
-import net.jini.space.JavaSpace05;
-import net.jini.space.MatchSet;
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.Rectangle;
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
-import java.util.Collections;
-import java.util.List;
-import java.util.logging.Level;
-import javax.swing.JFrame;
-import javax.swing.JMenuBar;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-
-/**
- * A browser utility to browse entries in a specified space.
- *
- * @author Sun Microsystems, Inc.
- *
- * @version 0.2 06/04/98
- */
-class SpaceBrowser extends JFrame {
-  //private SpaceEntryPanel entryPanel;
-  private final static int MINIMUM_WINDOW_WIDTH = 320;
-  private Browser browser;
-
-  public SpaceBrowser(Object proxy, Browser browser) {
-    super("SpaceBrowser");
-
-    this.browser = browser;
-    // init main components
-    SpaceEntryPanel entryPanel = new SpaceEntryPanel(proxy);
-
-    // add menu and attr panel
-    getContentPane().setLayout(new BorderLayout());
-    getContentPane().add(new BrowserMenuBar(entryPanel), "North");
-    getContentPane().add(entryPanel, "Center");
-
-    validate();
-    pack();
-    setSize(((getSize().width < MINIMUM_WINDOW_WIDTH) ? MINIMUM_WINDOW_WIDTH : getSize().width),
-	    getSize().height);
-
-    // center in parent frame
-    Rectangle bounds = browser.getBounds();
-    Dimension dialogSize = getPreferredSize();
-    int xpos = bounds.x + (bounds.width - dialogSize.width)/ 2;
-    int ypos = bounds.y + (bounds.height - dialogSize.height)/2;
-    setLocation((xpos < 0) ? 0 : xpos,
-		(ypos < 0) ? 0 : ypos);
-  }
-
-
-  class BrowserMenuBar extends JMenuBar {
-    private EntryTreePanel entryPanel;
-
-    public BrowserMenuBar(EntryTreePanel entryPanel) {
-      this.entryPanel = entryPanel;
-      JMenuItem mitem;
-
-      // "File" Menu
-      JMenu fileMenu = (JMenu) add(new JMenu("File"));
-      mitem = (JMenuItem) fileMenu.add(new JMenuItem("Refresh"));
-      mitem.addActionListener(browser.wrap(new ActionListener() {
-	public void actionPerformed(ActionEvent ev) {
-	  BrowserMenuBar.this.entryPanel.refreshPanel();
-	}
-      }));
-      mitem = (JMenuItem) fileMenu.add(new JMenuItem("Close"));
-      mitem.addActionListener(browser.wrap(new ActionListener() {
-	public void actionPerformed(ActionEvent ev) {
-	  SpaceBrowser.this.setVisible(false);
-	}
-      }));
-    }
-  }
-
-  class SpaceEntryPanel extends EntryTreePanel {
-    private Object proxy;
-
-    public SpaceEntryPanel(Object proxy) {
-      super(false);	// Entries are not editable.
-      this.proxy = proxy;
-
-      refreshPanel();
-    }
-
-    protected Entry[] getEntryArray() {
-      try {
-	List acc = new java.util.LinkedList();
-	if (proxy instanceof JavaSpace05) {
-	  MatchSet set =
-	    ((JavaSpace05) proxy).contents(Collections.singleton(null),
-					   null, Lease.ANY, Integer.MAX_VALUE);
-	  Lease lease = set.getLease();
-	  if (lease != null) {
-	    lease = (Lease) browser.leasePreparer.prepareProxy(lease);
-	    browser.leaseMgr.renewUntil(lease, Lease.ANY, null);
-	  }
-	  try {
-	    while (true) {
-	      try {
-		Entry e = set.next();
-		if (e == null)
-		  break;
-		acc.add(e);
-	      } catch (UnusableEntryException e) {
-		Browser.logger.log(Level.INFO, "unusable entry", e);
-	      }
-	    }
-	  } finally {
-	    if (lease != null) {
-	      try {
-		browser.leaseMgr.cancel(lease);
-	      } catch (Exception e) {
-	      }
-	    }
-	  }
-	} else {
-	  AdminIterator iter =
-			   ((JavaSpaceAdmin) proxy).contents(null, null, 128);
-	  try {
-	    while (true) {
-	      try {
-		Entry e = iter.next();
-		if (e == null)
-		  break;
-		acc.add(e);
-	      } catch (UnusableEntryException e) {
-		Browser.logger.log(Level.INFO, "unusable entry", e);
-	      }
-	    }
-	  } finally {
-	    try {
-	      iter.close();
-	    } catch (Exception e) {
-	    }
-	  }
-	}
-	return (Entry[])acc.toArray(new Entry[acc.size()]);
-      } catch (Throwable t) {
-	Browser.logger.log(Level.INFO, "obtaining entries failed", t);
-      }
-
-      return null;
-    }
-  }
-}
-
+/*
+ * 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.example.browser;
+
+import org.apache.river.admin.JavaSpaceAdmin;
+import org.apache.river.admin.AdminIterator;
+import net.jini.core.entry.Entry;
+import net.jini.core.entry.UnusableEntryException;
+import net.jini.core.lease.Lease;
+import net.jini.space.JavaSpace05;
+import net.jini.space.MatchSet;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Rectangle;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+import javax.swing.JFrame;
+import javax.swing.JMenuBar;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+
+/**
+ * A browser utility to browse entries in a specified space.
+ *
+ * @author Sun Microsystems, Inc.
+ *
+ * @version 0.2 06/04/98
+ */
+class SpaceBrowser extends JFrame {
+  //private SpaceEntryPanel entryPanel;
+  private final static int MINIMUM_WINDOW_WIDTH = 320;
+  private Browser browser;
+
+  public SpaceBrowser(Object proxy, Browser browser) {
+    super("SpaceBrowser");
+
+    this.browser = browser;
+    // init main components
+    SpaceEntryPanel entryPanel = new SpaceEntryPanel(proxy);
+
+    // add menu and attr panel
+    getContentPane().setLayout(new BorderLayout());
+    getContentPane().add(new BrowserMenuBar(entryPanel), "North");
+    getContentPane().add(entryPanel, "Center");
+
+    validate();
+    pack();
+    setSize(((getSize().width < MINIMUM_WINDOW_WIDTH) ? MINIMUM_WINDOW_WIDTH : getSize().width),
+	    getSize().height);
+
+    // center in parent frame
+    Rectangle bounds = browser.getBounds();
+    Dimension dialogSize = getPreferredSize();
+    int xpos = bounds.x + (bounds.width - dialogSize.width)/ 2;
+    int ypos = bounds.y + (bounds.height - dialogSize.height)/2;
+    setLocation((xpos < 0) ? 0 : xpos,
+		(ypos < 0) ? 0 : ypos);
+  }
+
+
+  class BrowserMenuBar extends JMenuBar {
+    private EntryTreePanel entryPanel;
+
+    public BrowserMenuBar(EntryTreePanel entryPanel) {
+      this.entryPanel = entryPanel;
+      JMenuItem mitem;
+
+      // "File" Menu
+      JMenu fileMenu = (JMenu) add(new JMenu("File"));
+      mitem = (JMenuItem) fileMenu.add(new JMenuItem("Refresh"));
+      mitem.addActionListener(browser.wrap(new ActionListener() {
+	public void actionPerformed(ActionEvent ev) {
+	  BrowserMenuBar.this.entryPanel.refreshPanel();
+	}
+      }));
+      mitem = (JMenuItem) fileMenu.add(new JMenuItem("Close"));
+      mitem.addActionListener(browser.wrap(new ActionListener() {
+	public void actionPerformed(ActionEvent ev) {
+	  SpaceBrowser.this.setVisible(false);
+	}
+      }));
+    }
+  }
+
+  class SpaceEntryPanel extends EntryTreePanel {
+    private Object proxy;
+
+    public SpaceEntryPanel(Object proxy) {
+      super(false);	// Entries are not editable.
+      this.proxy = proxy;
+
+      refreshPanel();
+    }
+
+    protected Entry[] getEntryArray() {
+      try {
+	List acc = new java.util.LinkedList();
+	if (proxy instanceof JavaSpace05) {
+	  MatchSet set =
+	    ((JavaSpace05) proxy).contents(Collections.singleton(null),
+					   null, Lease.ANY, Integer.MAX_VALUE);
+	  Lease lease = set.getLease();
+	  if (lease != null) {
+	    lease = (Lease) browser.leasePreparer.prepareProxy(lease);
+	    browser.leaseMgr.renewUntil(lease, Lease.ANY, null);
+	  }
+	  try {
+	    while (true) {
+	      try {
+		Entry e = set.next();
+		if (e == null)
+		  break;
+		acc.add(e);
+	      } catch (UnusableEntryException e) {
+		Browser.logger.log(Level.INFO, "unusable entry", e);
+	      }
+	    }
+	  } finally {
+	    if (lease != null) {
+	      try {
+		browser.leaseMgr.cancel(lease);
+	      } catch (Exception e) {
+	      }
+	    }
+	  }
+	} else {
+	  AdminIterator iter =
+			   ((JavaSpaceAdmin) proxy).contents(null, null, 128);
+	  try {
+	    while (true) {
+	      try {
+		Entry e = iter.next();
+		if (e == null)
+		  break;
+		acc.add(e);
+	      } catch (UnusableEntryException e) {
+		Browser.logger.log(Level.INFO, "unusable entry", e);
+	      }
+	    }
+	  } finally {
+	    try {
+	      iter.close();
+	    } catch (Exception e) {
+	    }
+	  }
+	}
+	return (Entry[])acc.toArray(new Entry[acc.size()]);
+      } catch (Throwable t) {
+	Browser.logger.log(Level.INFO, "obtaining entries failed", t);
+      }
+
+      return null;
+    }
+  }
+}
+

Modified: river/jtsk/modules/modularize/apache-river/extra/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/extra/pom.xml?rev=1879521&r1=1879520&r2=1879521&view=diff
==============================================================================
--- river/jtsk/modules/modularize/apache-river/extra/pom.xml (original)
+++ river/jtsk/modules/modularize/apache-river/extra/pom.xml Sun Jul  5 11:41:39 2020
@@ -1,194 +1,185 @@
-<?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>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <groupId>org.apache.river</groupId>
-    <artifactId>extra</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Module :: River Extra service utilities</name>
-    <description>Apache River Extra service utilities</description>
-
-    <properties>
-        <high.scale.lib.version>1.0.6</high.scale.lib.version>
-    </properties>
-
-    <dependencies>  
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.6</version>
-            <scope>test</scope>
-        </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-dl</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.river</groupId>
-            <artifactId>river-jeri</artifactId>
-            <version>${project.version}</version>
-        </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>
-        </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>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<groupId>org.apache.river</groupId>
+	<artifactId>extra</artifactId>
+	<packaging>jar</packaging>
+
+	<name>Module :: River Extra service utilities</name>
+	<description>Apache River Extra service utilities</description>
+
+	<properties>
+		<high.scale.lib.version>1.0.6</high.scale.lib.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.6</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.river</groupId>
+			<artifactId>river-platform</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.river</groupId>
+			<artifactId>river-dl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.river</groupId>
+			<artifactId>river-jeri</artifactId>
+			<version>${project.version}</version>
+		</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>
+		</plugins>
+
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>biz.aQute.bnd</groupId>
+										<artifactId>bnd-maven-plugin</artifactId>
+										<versionRange>[1.0.0,)</versionRange>
+										<goals>
+											<goal>bnd-process</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore />
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+
+	</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/groovy-config/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/groovy-config/pom.xml?rev=1879521&r1=1879520&r2=1879521&view=diff
==============================================================================
--- river/jtsk/modules/modularize/apache-river/groovy-config/pom.xml (original)
+++ river/jtsk/modules/modularize/apache-river/groovy-config/pom.xml Sun Jul  5 11:41:39 2020
@@ -1,153 +1,156 @@
-<?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>groovy-config</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Module :: Groovy Configuration</name>
-    <description>Configure River with Groovy.
-    </description>
-
-    <properties>
-        <high.scale.lib.version>1.0.3</high.scale.lib.version>
-    </properties>
-
-    <dependencies>  
-	
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.river</groupId>
-            <artifactId>river-jeri</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-	<!--<dependency>
-            <groupId>biz.aQute.bnd</groupId>
-            <artifactId>biz.aQute.bnd.annotation</artifactId>
-            <version>3.3.0</version>
-            <scope>compile</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.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <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>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
-                        <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>
-</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>groovy-config</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Module :: Groovy Configuration</name>
+    <description>Configure River with Groovy.
+    </description>
+
+    <properties>
+        <high.scale.lib.version>1.0.3</high.scale.lib.version>
+    </properties>
+
+    <dependencies>  
+
+      <!--
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+        </dependency>
+      -->
+      
+        <dependency>
+            <groupId>org.apache.river</groupId>
+            <artifactId>river-jeri</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+	<!--<dependency>
+            <groupId>biz.aQute.bnd</groupId>
+            <artifactId>biz.aQute.bnd.annotation</artifactId>
+            <version>3.3.0</version>
+            <scope>compile</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.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <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>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                        <source>1.8</source>
+                        <target>1.8</target>
+                        <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>
+</project>

Modified: river/jtsk/modules/modularize/apache-river/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/pom.xml?rev=1879521&r1=1879520&r2=1879521&view=diff
==============================================================================
--- river/jtsk/modules/modularize/apache-river/pom.xml (original)
+++ river/jtsk/modules/modularize/apache-river/pom.xml Sun Jul  5 11:41:39 2020
@@ -1,313 +1,325 @@
-<?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/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    
-    <groupId>org.apache</groupId>
-    <artifactId>river</artifactId>
-    <version>3.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>Apache River Project</name>
-    
-    <description>Apache River Project</description>
-    <inceptionYear>2008</inceptionYear>
-    <url>http://river.apache.org</url>
-
-    <licenses>
-        <license>
-            <name>Apache Software License 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <organization>
-        <name>Apache Software Foundation</name>
-        <url>http://www.apache.org</url>
-    </organization>
-
-    <issueManagement>
-        <system>JIRA</system>
-        <url>https://issues.apache.org/jira/browse/RIVER</url>
-    </issueManagement>
-
-    <scm>
-        <connection>scm:http://svn.apache.org/repos/asf/river/jtsk/trunk</connection>
-        <developerConnection>scm:https://svn.apache.org/repos/asf/river/jtsk/trunk</developerConnection>
-        <url>http://svn.apache.org/repos/asf/river/jtsk/trunk</url>
-    </scm>
-
-    <ciManagement>
-        <system>hudson</system>
-        <url>https://builds.apache.org/view/M-R/view/River/</url>
-    </ciManagement>
-
-    <reporting>
-        <excludeDefaults>true</excludeDefaults>
-        <plugins>        
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <inherited>false</inherited>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>modules</report>
-                            <report>cim</report>
-                            <report>issue-tracking</report>
-                            <report>mailing-list</report>
-                            <report>license</report>
-                            <report>project-team</report>
-                            <report>scm</report>
-                            <report>index</report>
-                            <!--<report>findbugs</report>-->
-                        </reports>
-                        <configuration>
-                            <aggregate>true</aggregate>
-                        </configuration>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.2</version>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.5</version>
-                <inherited>false</inherited>
-                <configuration><aggregate>true</aggregate></configuration>
-                <reportSets>
-                    <reportSet>
-                        <id>aggregate</id>
-                        <configuration>
-                            <links>
-                                <link>http://java.sun.com/j2se/1.6.0/docs/api/</link>
-                                <link>https://hudson.apache.org/hudson/view/River/job/River-trunk/javadoc/api/index.html</link>
-                            </links>
-                            <detectLinks>true</detectLinks>
-                            <breakiterator>true</breakiterator>
-                            <top><![CDATA[<h2>Apache River Project ${pom.version} API Documentation</h2>]]></top>
-                            <footer><![CDATA[<i>Copyright &copy;, multiple authors.</i>]]></footer>
-                            <excludePackageNames></excludePackageNames>
-                        </configuration>
-                        <reports>
-                            <report>aggregate</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-            <!--
-            <plugin>
-                <artifactId>maven-jxr-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <aggregate>true</aggregate>
-                </configuration>
-            </plugin>
-            -->
-        </plugins>
-    </reporting>
-
-    <mailingLists>
-        <mailingList>
-            <name>River User List</name>
-            <archive>river-dev@apache.org</archive>
-        </mailingList>
-        <mailingList>
-            <name>River Developer List</name>
-            <archive>river-dev@apache.org</archive>
-        </mailingList>
-        <mailingList>
-            <name>River Commits List</name>
-	        <archive>river-commits@apache.org</archive>
-        </mailingList>
-    </mailingLists>
-
-    <developers>
-        <developer>
-            <id>peter_firmstone</id>
-            <name>Peter Firmstone</name>
-            <email></email>
-            <roles>
-                <role>Developer</role>
-            </roles>
-            <timezone>-5</timezone>
-        </developer>
-        <!-- FILL IN THE REST OF YOUR DEVELOPERS -->
-    </developers>
-
-<!--
-    <distributionManagement>
-        <repository>
-            <id></id>
-            <name></name>
-            <url>scp://</url>
-        </repository>        
-    </distributionManagement>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id></id>
-            <url></url>
-        </pluginRepository>
-    </pluginRepositories>
--->
-	
-    <repositories>
-		<!-- Required for the use of org.cliffc.high_scale_lib.NonBlockingHashMap in river-platform -->
-        <repository>
-		    <id>boundary-site</id>
-		    <url>http://maven.boundary.com/artifactory/repo</url>
-        </repository>
-		
-        <repository>
-		    <id>hashnot</id>
-		    <url>http://mvn.hashnot.com/content/groups/public</url>
-        </repository>
-		
-    </repositories>
-	
-    <dependencyManagement>
-        <dependencies>
-
-            <dependency>
-                <groupId>org.codehaus.groovy</groupId>
-                <artifactId>groovy-all</artifactId>
-                <version>${groovy.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <version>${gma}</version>
-            </dependency>
-           
-        </dependencies>
-
-    </dependencyManagement>
-
-    <build>
-		<pluginManagement>
-		    <plugins>
-		        <plugin>
-		            <groupId>org.apache.maven.plugins</groupId>
-		            <artifactId>maven-jar-plugin</artifactId>
-		            <version>2.3</version>
-		        </plugin>
-
-		        <plugin>
-		            <groupId>org.apache.maven.plugins</groupId>
-		            <artifactId>maven-surefire-plugin</artifactId>
-		            <version>2.13</version>
-		        </plugin>
-
-		        <plugin>
-		            <groupId>org.apache.maven.plugins</groupId>
-		            <artifactId>maven-failsafe-plugin</artifactId>
-		            <version>2.13</version>
-		        </plugin>
-
-		        <plugin>
-		            <groupId>org.apache.maven.plugins</groupId>
-		            <artifactId>maven-source-plugin</artifactId>
-		            <version>2.1.1</version>
-		        </plugin>
-
-		        <plugin>
-		            <groupId>org.codehaus.gmaven</groupId>
-		            <artifactId>gmaven-plugin</artifactId>
-		            <version>${gmaven.version}</version>
-	            </plugin>
-            </plugins>
-        </pluginManagement>
-
-        <plugins>
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <version>3.3</version>
-                <inherited>false</inherited>
-                <configuration>
-                    <locales>en</locales>
-                    <outputDirectory>${basedir}/docs</outputDirectory>
-                </configuration>
-            </plugin>
-			<plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-	            <version>2.3.2</version>
-	            <configuration>
-	                <source>1.6</source>
-		            <target>1.6</target>
-		            <optimize>true</optimize>
-		            <encoding>UTF-8</encoding>
-		            <meminitial>128m</meminitial>
-		            <maxmem>1024m</maxmem>
-		        </configuration>
-		    </plugin>
-		    <plugin>
-		        <artifactId>maven-resources-plugin</artifactId>
-			    <version>2.5</version>
-		    </plugin>
-        </plugins>
-    </build>
-	
-	<properties>
-	        <groovy.version>2.2.1</groovy.version>
-	        <gmaven.version>1.4</gmaven.version>
-	        <gmavenProviderSelection>2.0</gmavenProviderSelection>
-	        <junit.version>4.8.2</junit.version>
-	        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-	    </properties>
-
-    <modules>
-        <module>browser</module>
-        <module>extra</module>
-        <module>groovy-config</module>
-        <module>river-activation</module>
-        <module>river-collections</module>
-        <module>river-destroy</module>
-        <module>river-discovery-providers</module>
-        <module>river-iiop</module>
-        <module>river-jeri</module>
-        <module>river-jrmp</module>
-        <module>river-phoenix</module>
-        <module>river-pref-loader</module>
-        <module>river-ui-factory</module>
-        <module>river-url-integrity</module>
-        <module>river-platform</module> 
-        <module>river-start</module>
-        <module>river-resources</module> 
-        <module>river-lib</module>
-        <module>river-dl</module>
-        <module>river-services/fiddler</module>
-        <module>river-services/group</module>
-        <module>river-services/outrigger</module>
-        <module>river-services/reggie</module>
-        <module>river-services/mahalo</module>
-        <module>river-services/mercury</module>
-        <module>river-services/norm</module>
-        <module>tools</module>
-        <module>dist</module>
-  </modules>
-    
+<?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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    
+    <groupId>org.apache</groupId>
+    <artifactId>river</artifactId>
+    <version>3.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>Apache River Project</name>
+    
+    <description>Apache River Project</description>
+    <inceptionYear>2008</inceptionYear>
+    <url>http://river.apache.org</url>
+
+    <licenses>
+        <license>
+            <name>Apache Software License 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <organization>
+        <name>Apache Software Foundation</name>
+        <url>http://www.apache.org</url>
+    </organization>
+
+    <issueManagement>
+        <system>JIRA</system>
+        <url>https://issues.apache.org/jira/browse/RIVER</url>
+    </issueManagement>
+
+    <scm>
+        <connection>scm:http://svn.apache.org/repos/asf/river/jtsk/trunk</connection>
+        <developerConnection>scm:https://svn.apache.org/repos/asf/river/jtsk/trunk</developerConnection>
+        <url>http://svn.apache.org/repos/asf/river/jtsk/trunk</url>
+    </scm>
+
+    <ciManagement>
+        <system>hudson</system>
+        <url>https://builds.apache.org/view/M-R/view/River/</url>
+    </ciManagement>
+
+    <reporting>
+        <excludeDefaults>true</excludeDefaults>
+        <plugins>        
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.4</version>
+                <inherited>false</inherited>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>modules</report>
+                            <report>cim</report>
+                            <report>issue-tracking</report>
+                            <report>mailing-list</report>
+                            <report>license</report>
+                            <report>project-team</report>
+                            <report>scm</report>
+                            <report>index</report>
+                            <!--<report>findbugs</report>-->
+                        </reports>
+                        <configuration>
+                            <aggregate>true</aggregate>
+                        </configuration>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.2</version>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.5</version>
+                <inherited>false</inherited>
+                <configuration><aggregate>true</aggregate></configuration>
+                <reportSets>
+                    <reportSet>
+                        <id>aggregate</id>
+                        <configuration>
+                            <links>
+                                <link>http://java.sun.com/j2se/1.6.0/docs/api/</link>
+                                <link>https://hudson.apache.org/hudson/view/River/job/River-trunk/javadoc/api/index.html</link>
+                            </links>
+                            <detectLinks>true</detectLinks>
+                            <breakiterator>true</breakiterator>
+                            <top><![CDATA[<h2>Apache River Project ${pom.version} API Documentation</h2>]]></top>
+                            <footer><![CDATA[<i>Copyright &copy;, multiple authors.</i>]]></footer>
+                            <excludePackageNames></excludePackageNames>
+                        </configuration>
+                        <reports>
+                            <report>aggregate</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+            <!--
+            <plugin>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <inherited>false</inherited>
+                <configuration>
+                    <aggregate>true</aggregate>
+                </configuration>
+            </plugin>
+            -->
+        </plugins>
+    </reporting>
+
+    <mailingLists>
+        <mailingList>
+            <name>River User List</name>
+            <archive>river-dev@apache.org</archive>
+        </mailingList>
+        <mailingList>
+            <name>River Developer List</name>
+            <archive>river-dev@apache.org</archive>
+        </mailingList>
+        <mailingList>
+            <name>River Commits List</name>
+	        <archive>river-commits@apache.org</archive>
+        </mailingList>
+    </mailingLists>
+
+    <developers>
+        <developer>
+            <id>peter_firmstone</id>
+            <name>Peter Firmstone</name>
+            <email></email>
+            <roles>
+                <role>Developer</role>
+            </roles>
+            <timezone>-5</timezone>
+        </developer>
+        <!-- FILL IN THE REST OF YOUR DEVELOPERS -->
+    </developers>
+
+<!--
+    <distributionManagement>
+        <repository>
+            <id></id>
+            <name></name>
+            <url>scp://</url>
+        </repository>        
+    </distributionManagement>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id></id>
+            <url></url>
+        </pluginRepository>
+    </pluginRepositories>
+-->
+	
+    <repositories>
+      <!-- Required for the use of org.cliffc.high_scale_lib.NonBlockingHashMap in river-platform -->
+
+      <!--
+        <repository>
+		    <id>boundary-site</id>
+		    <url>http://maven.boundary.com/artifactory/repo</url>
+        </repository>
+		
+        <repository>
+		    <id>hashnot</id>
+		    <url>http://mvn.hashnot.com/content/groups/public</url>
+        </repository>
+      -->
+      
+    </repositories>
+	
+    <dependencyManagement>
+        <dependencies>
+
+	    <!--
+            <dependency>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy-all</artifactId>
+                <version>${groovy.version}</version>
+            </dependency>
+	    -->
+	    
+	    <!--
+            <dependency>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
+                <version>${gma}</version>
+            </dependency>
+            -->
+	    
+        </dependencies>
+
+    </dependencyManagement>
+
+    <build>
+		<pluginManagement>
+		    <plugins>
+		        <plugin>
+		            <groupId>org.apache.maven.plugins</groupId>
+		            <artifactId>maven-jar-plugin</artifactId>
+		            <version>2.3</version>
+		        </plugin>
+
+		        <plugin>
+		            <groupId>org.apache.maven.plugins</groupId>
+		            <artifactId>maven-surefire-plugin</artifactId>
+		            <version>2.13</version>
+		        </plugin>
+
+		        <plugin>
+		            <groupId>org.apache.maven.plugins</groupId>
+		            <artifactId>maven-failsafe-plugin</artifactId>
+		            <version>2.13</version>
+		        </plugin>
+
+		        <plugin>
+		            <groupId>org.apache.maven.plugins</groupId>
+		            <artifactId>maven-source-plugin</artifactId>
+		            <version>2.1.1</version>
+		        </plugin>
+
+			<!--
+		        <plugin>
+		            <groupId>org.codehaus.gmaven</groupId>
+		            <artifactId>gmaven-plugin</artifactId>
+		            <version>${gmaven.version}</version>
+	            </plugin>
+			-->
+			
+            </plugins>
+        </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>3.3</version>
+                <inherited>false</inherited>
+                <configuration>
+                    <locales>en</locales>
+                    <outputDirectory>${basedir}/docs</outputDirectory>
+                </configuration>
+            </plugin>
+			<plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+	            <version>2.3.2</version>
+	            <configuration>
+	                <source>1.6</source>
+		            <target>1.6</target>
+		            <optimize>true</optimize>
+		            <encoding>UTF-8</encoding>
+		            <meminitial>128m</meminitial>
+		            <maxmem>1024m</maxmem>
+		        </configuration>
+		    </plugin>
+		    <plugin>
+		        <artifactId>maven-resources-plugin</artifactId>
+			    <version>2.5</version>
+		    </plugin>
+        </plugins>
+    </build>
+	
+	<properties>
+	        <groovy.version>2.2.1</groovy.version>
+	        <gmaven.version>1.4</gmaven.version>
+	        <gmavenProviderSelection>2.0</gmavenProviderSelection>
+	        <junit.version>4.8.2</junit.version>
+	        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+	    </properties>
+
+    <modules>
+        <module>browser</module>
+        <module>extra</module>
+        <!-- <module>groovy-config</module> -->
+        <module>river-activation</module>
+        <module>river-collections</module>
+        <module>river-destroy</module>
+<!--        <module>river-discovery-providers</module> -->
+        <module>river-iiop</module>
+        <module>river-jeri</module>
+        <module>river-jrmp</module>
+        <module>phoenix-activation</module>
+        <module>river-pref-loader</module>
+        <module>river-ui-factory</module>
+        <module>river-url-integrity</module>
+        <module>river-platform</module> 
+        <module>river-start</module>
+        <module>river-resources</module> 
+        <module>river-lib</module>
+        <module>river-dl</module>
+        <module>river-services/fiddler</module>
+        <module>river-services/group</module>
+        <module>river-services/outrigger</module>
+        <module>river-services/reggie</module>
+        <module>river-services/mahalo</module>
+        <module>river-services/mercury</module>
+        <module>river-services/norm</module>
+        <module>tools</module>
+        <module>dist</module>
+	<module>river-logging</module>
+<!--	<module>river-discovery-common</module> -->
+  </modules>
+    
 </project>
\ No newline at end of file

Modified: river/jtsk/modules/modularize/apache-river/river-activation/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/modules/modularize/apache-river/river-activation/pom.xml?rev=1879521&r1=1879520&r2=1879521&view=diff
==============================================================================
--- river/jtsk/modules/modularize/apache-river/river-activation/pom.xml (original)
+++ river/jtsk/modules/modularize/apache-river/river-activation/pom.xml Sun Jul  5 11:41:39 2020
@@ -1,212 +1,176 @@
-<?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-activation</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Module :: River Activation Platform</name>
-    <description>Apache River Activation Platform
-    </description>
-
-    <properties>
-        <high.scale.lib.version>1.0.3</high.scale.lib.version>
-    </properties>
-
-    <dependencies>  
-		 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>river-platform</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>river-jeri</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>river-url-integrity</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>
-                <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>
-            <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-activation</artifactId>
+	<packaging>jar</packaging>
+
+	<name>Module :: River Activation Platform</name>
+	<description>Apache River Activation Platform
+    </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>${project.groupId}</groupId>
+			<artifactId>river-platform</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>river-jeri</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>river-url-integrity</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> 
+				<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>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>findbugs-maven-plugin</artifactId>
+				<configuration>
+					<excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
+</project>