back from the dead

abstratt · Oct 14, 2021 · 2e41ca2 · 2e41ca2
1 parent cbeff58
commit 2e41ca2
Show file tree

Hide file tree

Showing 180 changed files with 281 additions and 248 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -0,0 +1,31 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-java@v2
+      with:
+        java-version: '11'
+        distribution: 'adopt'
+    - name: Start pre-reqs
+      run: docker-compose up -d        
+    - name: Build with Maven
+      run: |
+        
+        echo "<settings><servers><server><id>github</id><username>abstratt</username><password>${GITHUB_TOKEN}</password></server></servers></settings>" > tmp-deploy-settings.xml        
+        mvn -X -B package --settings tmp-deploy-settings.xml
+      env:
+        GITHUB_TOKEN: ${{ secrets.RELENG_GITHUB_TOKEN }}        
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,20 @@
+name: Publish package to GitHub Packages
+on:
+  release:
+    types: [created]
+jobs:
+  publish:
+    runs-on: ubuntu-latest 
+    permissions: 
+      contents: read
+      packages: write 
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+      - name: Publish package
+        run: mvn --batch-mode deploy -DskipTests
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELENG_GITHUB_TOKEN }}
diff --git a/README.md b/README.md
@@ -96,8 +96,7 @@ TBD
 
 ###  Continuous builds
 
-Continuous builds run on [TravisCI](https://travis-ci.org/abstratt/cloudfier?branch=master). Artifact repository is
-available at [Bintray](https://dl.bintray.com/abstratt-oss/abstratt-oss/).
+Continuous builds run as GitHub actions.
 
 ### Developing Cloudfier in the IDE
 

diff --git a/codegen/com.abstratt.kirra.mdd.target.base/META-INF/MANIFEST.MF b/codegen/com.abstratt.kirra.mdd.target.base/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Vendor: Abstratt Technologies
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-SymbolicName: com.abstratt.kirra.mdd.target.base;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.abstratt.mdd.target.core,

diff --git a/codegen/com.abstratt.kirra.mdd.target.base/pom.xml b/codegen/com.abstratt.kirra.mdd.target.base/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>codegen</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 

diff --git a/codegen/com.abstratt.mdd.target.core/META-INF/MANIFEST.MF b/codegen/com.abstratt.mdd.target.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: MDD Target Core
 Bundle-SymbolicName: com.abstratt.mdd.target.core;singleton:=true
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-Vendor: Abstratt Technologies
 Require-Bundle: 
  com.abstratt.mdd.core;visibility:=reexport,

diff --git a/codegen/com.abstratt.mdd.target.core/pom.xml b/codegen/com.abstratt.mdd.target.core/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>codegen</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 </project>
diff --git a/codegen/com.abstratt.mdd.target.doc/META-INF/MANIFEST.MF b/codegen/com.abstratt.mdd.target.doc/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Vendor: Abstratt Technologies
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-SymbolicName: com.abstratt.mdd.target.doc;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.abstratt.mdd.target.core,

diff --git a/codegen/com.abstratt.mdd.target.doc/pom.xml b/codegen/com.abstratt.mdd.target.doc/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>codegen</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 

diff --git a/codegen/com.abstratt.mdd.target.jee/META-INF/MANIFEST.MF b/codegen/com.abstratt.mdd.target.jee/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Vendor: Abstratt Technologies
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-SymbolicName: com.abstratt.mdd.target.jee;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.abstratt.mdd.target.core,

diff --git a/codegen/com.abstratt.mdd.target.jee/pom.xml b/codegen/com.abstratt.mdd.target.jee/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>codegen</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 

diff --git a/codegen/com.abstratt.mdd.target.jse/META-INF/MANIFEST.MF b/codegen/com.abstratt.mdd.target.jse/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Vendor: Abstratt Technologies
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-SymbolicName: com.abstratt.mdd.target.jse;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.abstratt.mdd.target.core,

diff --git a/codegen/com.abstratt.mdd.target.jse/pom.xml b/codegen/com.abstratt.mdd.target.jse/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>codegen</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 

diff --git a/codegen/pom.xml b/codegen/pom.xml
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.abstratt.mdd.kirra</groupId>
 	<artifactId>codegen</artifactId>
-	<version>2.12.6-SNAPSHOT</version>
+	<version>2.13.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<parent>
 		<artifactId>plugins</artifactId>
     	<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 	</parent>
 
 	<modules>
@@ -17,7 +17,6 @@
         <module>com.abstratt.mdd.target.doc</module>
         <module>com.abstratt.mdd.target.jee</module>          
         <module>com.abstratt.mdd.target.jse</module>                
-		<module>com.abstratt.mdd.target.tests</module>
 	</modules>
 </project>
 
diff --git a/deploy.settings.xml b/deploy.settings.xml
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -0,0 +1,16 @@
+version: '3.7'
+services:
+    postgres:
+        image: postgres:10.5
+        restart: always
+        environment:
+          - POSTGRES_USER=cloudfier
+          - POSTGRES_PASSWORD=cloudfier
+        logging:
+          options:
+            max-size: 10m
+            max-file: "3"
+        ports:
+          - '15432:5432'
+        volumes: 
+          - ./postgres-data:/var/lib/postgresql/data
diff --git a/kirra-dependencies/kirra-dependencies.target b/kirra-dependencies/kirra-dependencies.target
@@ -10,15 +10,9 @@
             <unit id="org.eclipse.ocl.all.sdk.feature.group" version="0.0.0" />
             <unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0" />
             <!-- Specific release to avoid Eclipse bug 430375 -->
-            <repository location="http://download.eclipse.org/releases/mars/201602261000/" />
+			<repository location="http://download.eclipse.org/releases/2021-09/202108271000" />
         </location>
-        <location includeAllPlatforms="false" includeMode="planner"
-            includeSource="true" type="InstallableUnit">
-            <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0" />
-            <unit id="org.eclipse.xtend.lib" version="0.0.0" />
-            <repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.11.0/" />
-        </location>
-
+
         <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.apache.commons.lang" version="0.0.0" />
             <unit id="org.apache.commons.lang3" version="0.0.0" />
@@ -28,33 +22,21 @@
             <unit id="org.apache.commons.collections" version="0.0.0" />
             <unit id="org.apache.commons.httpclient" version="0.0.0" />
 			<unit id="org.slf4j.api" version="0.0.0" />
-			<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository/" />
-        </location>
-        <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="org.restlet" version="0.0.0" />
-            <unit id="org.restlet.ext.servlet" version="0.0.0" />
-            <unit id="org.restlet.ext.xml" version="0.0.0" />
-            <unit id="org.restlet.ext.fileupload" version="0.0.0" />
-            <unit id="org.restlet.ext.crypto" version="0.0.0" />
-            <unit id="org.restlet.ext.jaxrs" version="0.0.0" />
-            <unit id="org.restlet.ext.jackson" version="0.0.0" />
-            <!-- piggybacking on Restlet's repo while we can for these. -->
-            <unit id="javax.ws.rs.jsr311-api" version="0.0.0" />
             <unit id="com.google.gson" version="0.0.0" />
+            <unit id="com.google.guava" version="0.0.0" />
             <unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0" />
             <unit id="com.fasterxml.jackson.core.jackson-core" version="0.0.0" />
             <unit id="com.fasterxml.jackson.core.jackson-databind" version="0.0.0" />
-<!--
-            <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-smile"  version="0.0.0"/>
-            <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml"  version="0.0.0"/>
-            <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml"  version="0.0.0"/>
-            <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv"  version="0.0.0"/>
-            <unit id="org.yaml.snakeyaml" version="0.0.0"/>
-			<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="0.0.0"/>
-			<unit id="stax2-api" version="0.0.0"/>
--->			
-            <repository location="jar:https://dl.bintray.com/abstratt-oss/abstratt-oss/com/abstratt/dependencies/com.abstratt.restlet.repository/1.0.0/com.abstratt.restlet.repository-1.0.0.zip!/" />
+            <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository" />
         </location>
+
+        <location includeAllPlatforms="false" includeMode="planner"
+            includeSource="true" type="InstallableUnit">
+            <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0" />
+            <unit id="org.eclipse.xtend.lib" version="0.0.0" />
+            <repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0/" />
+        </location>
+
         <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.jetty.client" version="0.0.0" />
             <unit id="org.eclipse.jetty.continuation" version="0.0.0" />
@@ -68,33 +50,43 @@
             <unit id="org.eclipse.jetty.security" version="0.0.0" />
             <repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-8.x/8.1.14.v20131031" />
         </location>
-        <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="org.codehaus.groovy23.feature.feature.group" version="0.0.0" />
-            <repository location="http://dist.springsource.com/release/TOOLS/update/3.6.1.RELEASE/e4.4/" />
-        </location>
-        <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="com.abstratt.eclipsegraphviz.feature.feature.group" version="0.0.0" />
-            <repository location="jar:https://dl.bintray.com/abstratt-oss/abstratt-oss/com/abstratt/eclipsegraphviz/com.abstratt.eclipsegraphviz.repository/2.9.0/com.abstratt.eclipsegraphviz.repository-2.9.0.zip!/" />
-        </location>
+
+		<location includeAllPlatforms="false" includeMode="planner"
+			includeSource="true" type="InstallableUnit">
+			<unit id="com.abstratt.eclipsegraphviz.feature.feature.group" version="0.0.0" />		
+			<repository location="mvn:com.abstratt.eclipsegraphviz:com.abstratt.eclipsegraphviz.repository:2.13.0:zip" />
+		</location>
+
+        <location includeAllPlatforms="false" includeMode="planner"
+			includeSource="true" type="InstallableUnit">
+			<unit id="com.abstratt.wrapped.postgresql" version="0.0.0" />
+			<unit id="com.abstratt.wrapped.schemacrawler"
+				version="0.0.0" />
+			<unit id="com.abstratt.wrapped.restlet"
+				version="0.0.0" />                
+			<repository 
+				location="mvn:com.abstratt.wrapped:com.abstratt.wrapped.repository:5.0.0:zip" />
+		</location>
+
         <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="com.abstratt.mdd.frontend.core.feature.feature.group" version="0.0.0" />
             <unit id="com.abstratt.mdd.frontend.ui.feature.feature.group" version="0.0.0" />
             <unit id="com.abstratt.mdd.frontend.ui.diagram.feature.feature.group" version="0.0.0" />
             <unit id="com.abstratt.mdd.importer.jdbc.feature.feature.group" version="0.0.0" />
-            <repository location="jar:https://dl.bintray.com/abstratt-oss/abstratt-oss/com/abstratt/mdd/com.abstratt.mdd.oss.repository/2.10.0/com.abstratt.mdd.oss.repository-2.10.0.zip!/" />
+			<repository 
+							location="mvn:com.abstratt.mdd:com.abstratt.mdd.oss.repository:2.13.0:zip" />
         </location>
         <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="com.abstratt.mdd.tests.feature.source.feature.group" version="0.0.0" />
-            <repository location="jar:https://dl.bintray.com/abstratt-oss/abstratt-oss/com/abstratt/mdd/com.abstratt.mdd.source.repository/2.10.0/com.abstratt.mdd.source.repository-2.10.0.zip!/" />
+			<repository 
+							location="mvn:com.abstratt.mdd:com.abstratt.mdd.source.repository:2.13.0:zip" />
         </location>
         <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="com.abstratt.kirra.feature.source.feature.group" version="0.0.0" />
-            <repository location="jar:https://dl.bintray.com/abstratt-oss/abstratt-oss/com/abstratt/kirra/com.abstratt.kirra.repository/2.10.0/com.abstratt.kirra.repository-2.10.0.zip!/" />
-        </location>
-        <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="com.abstratt.wrapped.postgresql" version="0.0.0" />
-            <unit id="com.abstratt.wrapped.schemacrawler" version="0.0.0" />
-            <repository location="jar:https://dl.bintray.com/abstratt-oss/abstratt-oss/com/abstratt/wrapped/com.abstratt.wrapped.repository/3.3/com.abstratt.wrapped.repository-3.3.zip!/" />
+			<repository 
+							location="mvn:com.abstratt.kirra:com.abstratt.kirra.repository:2.11.0:zip" />
         </location>
+
+
     </locations>
 </target>