bump version

pahjbo · Dec 13, 2023 · 6e56611 · 6e56611
1 parent 3bd98e3
commit 6e56611
Show file tree

Hide file tree

Showing 18 changed files with 102 additions and 30 deletions.
diff --git a/Readme.md b/Readme.md
@@ -54,7 +54,7 @@ This jar (only) is published to maven central so you do not to have to build it.
 
 Use the following command to run the parser
 
-    java -jar vodslparser-0.4.5-standalone.jar model.vodsl
+    java -jar vodslparser-0.4.6-standalone.jar model.vodsl
 
 which will produce a file `model.vo-dml.xml` of the equivalent VO-DML.
 

diff --git a/VODSLEditor.setup b/VODSLEditor.setup
@@ -48,9 +48,9 @@
       <repository
           url="http://download.eclipse.org/releases/2021-06"/>
       <repository
-          url="http://vo.jb.man.ac.uk/eclipse/vodsleditor/"/>
+          url="https://vo.jb.man.ac.uk/eclipse/vodsleditor/"/>
       <repository
-          url="http://vo.jb.man.ac.uk/eclipse/fxdiagram/"/>
+          url="https://vo.jb.man.ac.uk/eclipse/fxdiagram/"/>
       <repository
           url="http://rtsys.informatik.uni-kiel.de/~kieler/updatesite/release_pragmatics_2016-02/"/>
       <repository

diff --git a/eclipse.repository/category.xml b/eclipse.repository/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature id="net.ivoa.vodsl.feature" version="0.4.5.qualifier">
+   <feature id="net.ivoa.vodsl.feature" version="0.4.6.qualifier">
       <category name="main"/>
    </feature>
    <feature id="net.ivoa.vodsl.feature.source" version="0.0.0">
@@ -9,5 +9,5 @@
    <category-def name="main" label="VODSL"/>
    <category-def name="main.source" label="VODSL (Sources)"/>
    <repository-reference location="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/" enabled="true" />
-   <repository-reference location="http://emcc.ast.man.ac.uk/doc/eclipse/fxdiagram" enabled="true" />
+   <repository-reference location="https://vo.jb.man.ac.uk/eclipse/fxdiagram" enabled="true" />
 </site>
diff --git a/eclipse.repository/pom.xml b/eclipse.repository/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <groupId>org.javastro.vodsl</groupId>
     <artifactId>mavenbase</artifactId>
-      <version>0.4.5</version>
+      <version>0.4.6</version>
       <relativePath>../mavenbase/pom.xml</relativePath>
 	</parent>
 
-  <version>0.4.5-SNAPSHOT</version>
+  <version>0.4.6-SNAPSHOT</version>
   <artifactId>vodsl.repository</artifactId>
   <name>vodsl eclipse plugin repository</name>
   <description>the eclipse repository for the VODSL plugin</description>

diff --git a/eclipse.target/eclipse.vodsl.target.target b/eclipse.target/eclipse.vodsl.target.target
@@ -17,7 +17,7 @@
 -->
 	<!-- this is a hack for a local build -->
 	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<repository location="http://vo.jb.man.ac.uk/eclipse/fxdiagram"/>
+		<repository location="https://vo.jb.man.ac.uk/eclipse/fxdiagram"/>
 		<unit id="de.fxdiagram.base.feature.feature.group" version="0.36.1.202106281643"/>
 		<unit id="de.fxdiagram.sdk.feature.feature.group" version="0.36.1.202106281643"/>
 	</location>

diff --git a/eclipse.target/pom.xml b/eclipse.target/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<groupId>org.javastro.vodsl</groupId>
 		<artifactId>mavenbase</artifactId>
-      <version>0.4.5</version>
+      <version>0.4.6</version>
       <relativePath>../mavenbase/pom.xml</relativePath>
 	</parent>
 
-    <version>0.4.5-SNAPSHOT</version>
+    <version>0.4.6-SNAPSHOT</version>
 	<artifactId>eclipse.vodsl.target</artifactId>
 	<packaging>eclipse-target-definition</packaging>
 

diff --git a/javafxbundle/pom.xml b/javafxbundle/pom.xml
@@ -0,0 +1,72 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+<!-- not needed - see https://tomsondev.bestsolution.at/2020/01/28/setting-up-efxclipse-rcp-development-for-java11-and-pde/
+ -->
+    <groupId>org.javastro.vodsl</groupId>
+    <version>11.0.2</version>
+    <artifactId>javafxbundle</artifactId>
+   <build>
+        <plugins>
+            <plugin>
+                <groupId>org.reficio</groupId>
+                <artifactId>p2-maven-plugin</artifactId>
+                <version>1.7.0</version>
+                <executions>
+                    <execution>
+                        <id>default-cli</id>
+                        <configuration>
+                            <artifacts>
+                                <!-- groupId:artifactId:version -->
+                                <artifact><id>org.openjfx:javafx-controls:jar:11.0.2</id></artifact>
+                                <artifact><id>org.openjfx:javafx-fxml:11.0.2</id></artifact>
+                            </artifacts>
+                        </configuration>
+                        <phase>site</phase>
+                        <goals>
+                           <goal>site</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+		     <plugin>
+		      <groupId>org.apache.maven.plugins</groupId>
+		      <artifactId>maven-site-plugin</artifactId>
+		      <version>3.9.1</version>
+		      <configuration>
+		       <inputDirectory>${project.basedir}/target/repository</inputDirectory>
+		       <skip>false</skip>
+		      </configuration>
+		     </plugin>
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>8.1.5.v20120716</version>
+                <configuration>
+                    <scanIntervalSeconds>10</scanIntervalSeconds>
+                    <webAppSourceDirectory>${project.basedir}/target/repository/</webAppSourceDirectory>
+                    <webApp>
+                        <contextPath>/site</contextPath>
+                    </webApp>
+                </configuration>
+            </plugin>
+
+        </plugins>
+      <extensions>
+         <!-- Enabling the use of external ssh - alternative is to put jars 
+            in $MAVEN_HOME/lib/ext -->
+         <extension>
+            <groupId>org.apache.maven.wagon</groupId>
+            <artifactId>wagon-ssh-external</artifactId>
+            <version>2.10</version>
+         </extension>
+      </extensions>
+   </build>
+
+   <distributionManagement>
+      <site>
+         <id>javafx</id>
+         <name>site for p2 repository</name>
+         <url>scpexe://emcc.ast.man.ac.uk/home/emerlin/documentation/eclipse/javafx/</url>
+      </site>
+   </distributionManagement>  
+</project>
diff --git a/mavenbase/pom.xml b/mavenbase/pom.xml
@@ -2,13 +2,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.javastro.vodsl</groupId>
   <artifactId>mavenbase</artifactId>
-  <version>0.4.5</version>
+  <version>0.4.6</version>
   <name>maven-base</name>
   <description>Base POM for Maven</description>
   <packaging>pom</packaging>
   <url>https://javastro.github.io</url>
    <properties>
-      <vodsl.version>0.4.5-SNAPSHOT</vodsl.version>
+      <vodsl.version>0.4.6-SNAPSHOT</vodsl.version>
       <xtextVersion>2.25.0</xtextVersion>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <maven.compiler.source>1.8</maven.compiler.source>
@@ -307,7 +307,7 @@
       </repository>
       <repository>
         <id>fxdiagram</id>
-        <url>http://vo.jb.man.ac.uk/eclipse/fxdiagram</url>
+        <url>https://vo.jb.man.ac.uk/eclipse/fxdiagram</url>
         <layout>p2</layout>
         <releases>
            <enabled>true</enabled> 

diff --git a/net.ivoa.vodsl.ide/META-INF/MANIFEST.MF b/net.ivoa.vodsl.ide/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: VODSL IDE
 Bundle-Vendor: JBO, University of Manchester
-Bundle-Version: 0.4.5.qualifier
+Bundle-Version: 0.4.6.qualifier
 Bundle-SymbolicName: net.ivoa.vodsl.ide;singleton:=true
 Require-Bundle: net.ivoa.vodsl,
  org.eclipse.xtext.ide;bundle-version="2.25.0",

diff --git a/net.ivoa.vodsl.ide/pom.xml b/net.ivoa.vodsl.ide/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<groupId>org.javastro.vodsl</groupId>
 		<artifactId>mavenbase</artifactId>
-      <version>0.4.5</version>
+      <version>0.4.6</version>
       <relativePath>../mavenbase/pom.xml</relativePath>
 	</parent>
 
-    <version>0.4.5-SNAPSHOT</version>
+    <version>0.4.6-SNAPSHOT</version>
 	<artifactId>net.ivoa.vodsl.ide</artifactId>
 	<packaging>eclipse-plugin</packaging>
 

diff --git a/net.ivoa.vodsl.sdk/feature.xml b/net.ivoa.vodsl.sdk/feature.xml
@@ -3,7 +3,7 @@
 <feature
       id="net.ivoa.vodsl.feature"
       label="VODSL  Feature"
-      version="0.4.5.qualifier"
+      version="0.4.6.qualifier"
       provider-name="JBO, University of Manchester">
 
    <description>
@@ -15,7 +15,7 @@
    </copyright>
 
    <url>
-      <update label="vodsl" url="http://vo.jb.man.ac.uk/eclipse/vodsleditor/"/>
+      <update label="vodsl" url="https://vo.jb.man.ac.uk/eclipse/vodsleditor/"/>
       <discovery label="latest xtext releases" url="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
    </url>
 

diff --git a/net.ivoa.vodsl.sdk/pom.xml b/net.ivoa.vodsl.sdk/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<groupId>org.javastro.vodsl</groupId>
 		<artifactId>mavenbase</artifactId>
-      <version>0.4.5</version>
+      <version>0.4.6</version>
       <relativePath>../mavenbase/pom.xml</relativePath>
 	</parent>
 
-    <version>0.4.5-SNAPSHOT</version>
+    <version>0.4.6-SNAPSHOT</version>
 	<artifactId>net.ivoa.vodsl.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
 

diff --git a/net.ivoa.vodsl.ui/META-INF/MANIFEST.MF b/net.ivoa.vodsl.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: VODSL UI
 Bundle-Vendor: JBO,
   University of Manchester
-Bundle-Version: 0.4.5.qualifier
+Bundle-Version: 0.4.6.qualifier
 Bundle-SymbolicName: net.ivoa.vodsl.ui;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: net.ivoa.vodsl.ui;uses:="com.google.inject,org.eclipse.ui.plugin",

diff --git a/net.ivoa.vodsl.ui/pom.xml b/net.ivoa.vodsl.ui/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<groupId>org.javastro.vodsl</groupId>
 		<artifactId>mavenbase</artifactId>
-      <version>0.4.5</version>
+      <version>0.4.6</version>
       <relativePath>../mavenbase/pom.xml</relativePath>
 	</parent>
 
-    <version>0.4.5-SNAPSHOT</version>
+    <version>0.4.6-SNAPSHOT</version>
 	<artifactId>net.ivoa.vodsl.ui</artifactId>
 	<packaging>eclipse-plugin</packaging>
 

diff --git a/net.ivoa.vodsl/META-INF/MANIFEST.MF b/net.ivoa.vodsl/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: VODSL core
 Bundle-Vendor: JBO,
   University of Manchester
-Bundle-Version: 0.4.5
+Bundle-Version: 0.4.6
 Bundle-SymbolicName: net.ivoa.vodsl;singleton:=true
 Require-Bundle: org.eclipse.xtext,
  org.eclipse.xtext.xbase,

diff --git a/net.ivoa.vodsl/pom.xml b/net.ivoa.vodsl/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<groupId>org.javastro.vodsl</groupId>
 		<artifactId>mavenbase</artifactId>
-      <version>0.4.5</version>
+      <version>0.4.6</version>
       <relativePath>../mavenbase/pom.xml</relativePath>
 	</parent>
 
-    <version>0.4.5</version>
+    <version>0.4.6</version>
 	<artifactId>net.ivoa.vodsl</artifactId>
 
 	<packaging>eclipse-plugin</packaging>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 >
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.javastro.vodsl</groupId>
-   <version>0.4.5-SNAPSHOT</version>
+   <version>0.4.6-SNAPSHOT</version>
    <artifactId>vodsl.parent</artifactId>
    <packaging>pom</packaging>
 
@@ -13,7 +13,7 @@
       <module>net.ivoa.vodsl.ide</module>
       <module>eclipse.target</module>
       <module>net.ivoa.vodsl.sdk</module>
-      <module>eclipse.repository</module>
+    <!--  <module>eclipse.repository</module> -->
 	<!--       <module>net.ivoa.vodsl.tests</module> -->
 	<!--       <module>net.ivoa.vodsl.ui.tests</module> -->
 

diff --git a/vodsl.standalone/pom.xml b/vodsl.standalone/pom.xml
@@ -6,10 +6,10 @@
    <parent>
       <groupId>org.javastro.vodsl</groupId>
       <artifactId>mavenbase</artifactId>
-      <version>0.4.5</version>
+      <version>0.4.6</version>
       <relativePath>../mavenbase/pom.xml</relativePath>
    </parent>
-   <version>0.4.5</version>
+   <version>0.4.6</version>
    <artifactId>vodslparser</artifactId>
    <name>VO-DSL parser</name>
    <description>a standalone implementation of the VO-DSL parser and converter to VO-DML</description>