Merge pull request JacORB#282 from rnc/BR1

rnc · Aug 30, 2021 · 961dfd6 · 961dfd6
2 parents 54c9cfb + cd22ae2
commit 961dfd6
Show file tree

Hide file tree

Showing 26 changed files with 82 additions and 145 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -11,10 +11,6 @@ on:
 
 jobs:
   build:
-    strategy:
-      fail-fast: false
-      matrix:
-        maven: [3.3.9, 3.5.4, 3.6.3, 3.8.1]
     # https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions#jobsjob_idif
     if: github.repository == 'JacORB/JacORB' && github.event_name == 'pull_request'
     runs-on: ubuntu-latest
@@ -27,18 +23,19 @@ jobs:
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ runner.os }}-maven-
-    - name: Set up JDK 11
+    - name: Set up JDK 8
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 8
     - name: Set up Maven
       uses: stCarolas/setup-maven@v4
       with:
-        maven-version:  ${{ matrix.maven }}
+        maven-version: 3.6.3
     - name: Build with Maven
-      run: mvn -B -V -Dtravis-ci=true -DskipJavadoc=true -DskipPDFGeneration clean install
-    # - name: Setup tmate session
-    #   uses: mxschmitt/action-tmate@v3
+      run: mvn -B -V -DskipPDFGeneration clean install
+    - name: Setup tmate session
+      uses: mxschmitt/action-tmate@v3
+      if: ${{ failure() }}
     - name: Codecov
       uses: codecov/codecov-action@v1
 
@@ -54,10 +51,14 @@ jobs:
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ runner.os }}-maven-
-    - name: Set up JDK 11
+    - name: Set up JDK 8
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 8
+    - name: Set up Maven
+      uses: stCarolas/setup-maven@v4
+      with:
+        maven-version: 3.6.3
     # https://github.com/marketplace/actions/maven-setings-action
     - name: Maven Settings
       uses: s4u/maven-settings-action@v2
@@ -71,6 +72,6 @@ jobs:
                 "password": "${{ secrets.SONATYPE_PASSWORD }}"
             }]
     - name: Deploy Snapshot
-      run: mvn -B -V org.apache.maven.plugins:maven-source-plugin:jar-no-fork -Dtravis-ci=true -DskipJavadoc=true -DskipPDFGeneration deploy
+      run: mvn -B -V org.apache.maven.plugins:maven-source-plugin:jar-no-fork -DskipPDFGeneration deploy -DskipTests=true
     - name: Codecov
       uses: codecov/codecov-action@v1
diff --git a/bin/dior b/bin/dior
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Decodes and prints the components of a stringified IOR
 #

diff --git a/bin/evc b/bin/evc
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Starts the JacORB event channel
 jaco org.jacorb.events.EventChannelImpl "$@"
diff --git a/bin/fixior b/bin/fixior
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Patches address and port information into IOR
 
 jaco org.jacorb.orb.util.FixIOR "$@"
diff --git a/bin/idl b/bin/idl
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 resolve()
 {

diff --git a/bin/imr b/bin/imr
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Starts the JacORB Implementation Repository
 jaco org.jacorb.imr.ImplementationRepositoryImpl "$@"
diff --git a/bin/imr_mg b/bin/imr_mg
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Starts the JacORB Implementation repository manager
 jaco org.jacorb.imr.util.ImRManager "$@"
diff --git a/bin/imr_ssd b/bin/imr_ssd
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Starts the JacORB ImR server startup daemon
 jaco org.jacorb.imr.ServerStartupDaemonImpl "$@"
diff --git a/bin/ir b/bin/ir
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Starts the JacORB Interface Repository
 jaco org.jacorb.ir.IRServer "$@"
diff --git a/bin/irbrowser b/bin/irbrowser
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Starts the JacORB Interface Repositor Browser
 

diff --git a/bin/jacapplet b/bin/jacapplet
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # call appletviewer with appropriate options
 #appletviewer -J"-Xbootclasspath:/home/bwana/brose/Work/jacorb/classes:/home/bwana/brose/Work/jacorb/classes/org.jacorb.jar:/import/java2/jre/lib/rt.jar:${CLASSPATH}"    "$@"
 echo "Please edit this script to match your installation"

diff --git a/bin/jaco b/bin/jaco
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 resolve()
 {

diff --git a/bin/lsns b/bin/lsns
@@ -1,4 +1,4 @@
-#!/bin/sh -f
+#!/bin/bash -f
 # List bindings in the JacORB Name Server
 
 jaco org.jacorb.naming.ContextLister "$@"
diff --git a/bin/nmg b/bin/nmg
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Starts the JacORB name server
 jaco org.jacorb.naming.namemanager.NameManager "$@"
diff --git a/bin/ns b/bin/ns
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Starts the JacORB name server
 jaco org.jacorb.naming.NameServer "$@"
diff --git a/bin/ns-wrapper b/bin/ns-wrapper
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 #
 # sh script suitable for starting and stopping
 # the JacORB Naming Service controlled by the Java Service Wrapper

diff --git a/bin/ntfy b/bin/ntfy
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # JacORB Notification Service
 

diff --git a/bin/ntfy-wrapper b/bin/ntfy-wrapper
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 #
 # shell script suitable for starting and stopping
 # the JacORB Notification Service controlled by the Java Service Wrapper

diff --git a/bin/pingo b/bin/pingo
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # decodes and prints the components of a stringified IOR
 
 jaco org.jacorb.orb.util.PingObject "$@"
diff --git a/bin/qir b/bin/qir
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Starts the JacORB Interface Repository Query Tool
 jaco org.jacorb.ir.QueryIR "$@"
diff --git a/bin/ts b/bin/ts
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Starts the JacORB TransactionService
 jaco org.jacorb.transaction.TransactionService "$@"
diff --git a/bin/version b/bin/version
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 resolve()
 {

diff --git a/core/pom.xml b/core/pom.xml
@@ -85,6 +85,9 @@
                                         <include>TransportCurrent.idl</include>
                                         <include>IIOPTransportCurrent.idl</include>
                                     </includes>
+                                    <additionalArguments>
+                                      <additionalArgument>-sloppy_names</additionalArgument>
+                                    </additionalArguments>
                                 </source>
                             </sources>
                         </configuration>

diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
 
     <name>JacORB</name>
     <description>JacORB CORBA Object Request Broker (ORB)</description>
-    <url>http://www.jacorb.org</url>
+    <url>https://www.jacorb.org</url>
 
     <licenses>
         <license>
@@ -45,13 +45,13 @@
     </scm>
 
     <issueManagement>
-        <system>Bugzilla</system>
-        <url>http://www.jacorb.org/cgi-bin/bugzilla/index.cgi</url>
+        <system>GitHub</system>
+        <url>https://github.com/JacORB/JacORB/issues</url>
     </issueManagement>
 
     <organization>
         <name>JacORB</name>
-        <url>http://www.jacorb.org</url>
+        <url>https://www.jacorb.org</url>
     </organization>
 
     <developers>
@@ -256,7 +256,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.1.2</version>
+                    <version>3.2.0</version>
                 </plugin>
 
                 <plugin>