v0.4 update release

VitexSoftware · Oct 11, 2023 · cf52110 · cf52110
1 parent 0b05091
commit cf52110
Show file tree

Hide file tree

Showing 10 changed files with 100 additions and 28 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -13,6 +13,12 @@
         "statusBar.debuggingForeground": "#000000",
         "tab.activeBorder": "#6233af",
         "iLoveWorkSpaceColors": true,
-        "iLoveWorkSpaceRandom": false
-    }
+        "iLoveWorkSpaceRandom": false,
+        "activityBar.inactiveForeground": "#b4b4b4",
+        "activityBar.activeBorder": "#9ec9a6",
+        "activityBar.activeBackground": "#D3B1C2",
+        "activityBar.border": "#D3B1C2",
+        "statusBar.border": "#D3B1C2"
+    },
+    "java.configuration.updateBuildConfiguration": "automatic"
 }
diff --git a/debian/.debhelper/generated/jaspercompiler/installed-by-dh_install b/debian/.debhelper/generated/jaspercompiler/installed-by-dh_install
@@ -1,2 +1,3 @@
 ./src/main/resources/usr/bin/jaspercompiler
 ./target/jaspercompiler-0.3-jar-with-dependencies.jar
+./target/jaspercompiler-0.4-jar-with-dependencies.jar
diff --git a/debian/Jenkinsfile b/debian/Jenkinsfile
@@ -35,11 +35,11 @@ distributions.each {
             stage('Checkout ' + distribution) {
                 buildImage = docker.image(vendor + '/' + distribution)
 		sh 'git checkout debian/changelog'
-                def VERSION = sh (
+                def version = sh (
                     script: 'dpkg-parsechangelog --show-field Version',
                     returnStdout: true
                 ).trim()
-                ver = VERSION + '.' + env.BUILD_NUMBER  + '~' + distroCodename
+                ver = version + '.' + env.BUILD_NUMBER  + '~' + distroCodename
             }
             stage('Build ' + distribution) {
                 buildImage.inside {

diff --git a/debian/changelog b/debian/changelog
@@ -1,4 +1,4 @@
-jaspercompiler (0.3) UNRELEASED; urgency=medium
+jaspercompiler (0.4) UNRELEASED; urgency=medium
 
   [ CyberVitexus ]
   * Initial release.

diff --git a/debian/control b/debian/control
@@ -3,15 +3,18 @@ Section: devel
 Priority: optional
 Maintainer: Vítězslav Dvořák <info@vitexsoftware.cz>
 Build-Depends: debhelper (>= 5), cdbs, default-jdk-headless, quilt, maven-debian-helper,
- libslf4j-java, libjdom1-java
+ libslf4j-java, libjdom1-java, libxml2-utils
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper, libplexus-utils-java,
+ libplexus-container-default-java
 Standards-Version: 4.3.0
 Homepage: https://github.com/VitexSoftware/jaspercompiler
 Vcs-Git: git@github.com:VitexSoftware/jaspercompiler.git
 Vcs-Browser: https://github.com/VitexSoftware/jaspercompiler
 
 Package: jaspercompiler
 Architecture: all
-Depends: ${misc:Depends},flexibee-client|flexibee-server|abraflexi-client|abraflexi-server
+Depends: ${misc:Depends}, default-jre-headless
+Recommends: flexibee-client|flexibee-server|abraflexi-client|abraflexi-server
 Description: Commandline Jasper compiler
     Compile jrxml to binary jasper files
 
diff --git a/debian/files b/debian/files
@@ -1,2 +1,3 @@
-jaspercompiler_0.3_all.deb devel optional
 jaspercompiler_0.3_amd64.buildinfo devel optional
+jaspercompiler_0.4_all.deb devel optional
+jaspercompiler_0.4_amd64.buildinfo devel optional
diff --git a/debian/jaspercompiler.substvars b/debian/jaspercompiler.substvars
@@ -1,2 +1,4 @@
+java:Depends=
+java:Recommends=
 misc:Depends=
 misc:Pre-Depends=
diff --git a/debian/rules b/debian/rules
@@ -4,6 +4,8 @@
 
 export JAVA_HOME = /usr/lib/jvm/default-java
 
+PROJECT_VERSION := $(shell mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+
 override_dh_auto_configure:
 override_dh_auto_test:
 override_dh_auto_clean:
@@ -13,6 +15,17 @@ override_dh_auto_build:
 	mvn install
 
 override_dh_auto_install:
+#	sed -i 's/VERSION/$(PROJECT_VERSION)/' debian/jaspercompiler/usr/bin/jaspercompiler
+#	cat debian/jaspercompiler/usr/bin/jaspercompiler
+
+binary-post-install/lib$(PACKAGE)-java::
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l pom.xml build/$(PACKAGE)-$(VERSION).jar 
+
+clean::
+	mh_clean
+
 
 %:
-	dh $@
+	dh $@  --with javahelper
+
diff --git a/pom.xml b/pom.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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>
     <groupId>com.vitexsoftware</groupId>
     <artifactId>jaspercompiler</artifactId>
-    <version>0.3</version>
+    <version>0.4</version>
     <packaging>jar</packaging>
     <name>jaspercompiler</name>
     <description>Commandline compiler from jrxml file to jasper binary with AbraFlexi support</description>
@@ -14,11 +15,39 @@
         </developer>
     </developers>
     <repositories>
-	<repository>
-	    <id>jaspersoft-third-party</id>
-	    <url>https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts/</url>
-	</repository>
+        <repository>
+            <id>jaspersoft-third-party</id>
+            <url>https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts/</url>
+        </repository>
+
+        <repository>
+            <id>central</id>
+            <name>Central Repository</name>
+            <url>https://repo.maven.apache.org/maven2</url>
+            <layout>default</layout>
+            <snapshots>
+              <enabled>false</enabled>
+            </snapshots>
+          </repository>
+
     </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+          <id>central</id>
+          <name>Central Repository</name>
+          <url>https://repo.maven.apache.org/maven2</url>
+          <layout>default</layout>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <releases>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+        </pluginRepository>
+      </pluginRepositories>
+
+
     <dependencies>
         <dependency>
             <groupId>net.sf.jasperreports</groupId>
@@ -31,6 +60,23 @@
             <version>2.7</version>
             <type>jar</type>
         </dependency>
+
+        <!-- SLF4J API -->
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>2.0.9</version>
+        </dependency>
+
+        <!-- LOG4J -->
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>2.0.9</version>
+        </dependency>
+
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,8 +113,8 @@
                 </configuration>
 
 
-            </plugin> 
-            
+            </plugin>
+
             <plugin>
                 <artifactId>maven-source-plugin</artifactId>
                 <version>3.2.1</version>
@@ -82,11 +128,11 @@
                     </execution>
                 </executions>
             </plugin>
-  
-            <plugin>
+
+            <!-- <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -95,8 +141,8 @@
                         </goals>
                     </execution>
                 </executions>
-            </plugin>                          
-            
+            </plugin> -->
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
@@ -110,8 +156,8 @@
                         </goals>
                     </execution>
                 </executions>
-            </plugin>            
-            
+            </plugin>
+
         </plugins>
     </build>
     <distributionManagement>
@@ -123,7 +169,7 @@
             <id>sonatype-nexus-staging</id>
             <name>Nexus Release Repository</name>
             <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
-        </repository>        
-    </distributionManagement>    
-    
+        </repository>
+    </distributionManagement>
+
 </project>
diff --git a/src/main/resources/usr/bin/jaspercompiler b/src/main/resources/usr/bin/jaspercompiler
@@ -1,4 +1,4 @@
 #!/bin/sh
-/usr/lib/jvm/default-java/bin/java -jar /usr/share/java/jaspercompiler-*-jar-with-dependencies.jar $1 $2
+/usr/lib/jvm/default-java/bin/java -jar /usr/share/java/jaspercompiler-0.4-jar-with-dependencies.jar $1 $2