Release 1.0.0-alpha2

Another milestone achieved towards the beta release.
qbicsoftware · Feb 16, 2021 · c65ec1b · c65ec1b
2 parents 89dfb5e + 595093e
commit c65ec1b
Show file tree

Hide file tree

Showing 168 changed files with 3,737 additions and 2,353 deletions.
diff --git a/.github/workflows/nexus-publish-release.yml b/.github/workflows/nexus-publish-release.yml
@@ -15,10 +15,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.11
+    - name: Set up JDK 1.8
       uses: actions/setup-java@v1
       with:
-        java-version: 1.11
+        java-version: 1.8
         server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
         settings-path: ${{ github.workspace }}
 

diff --git a/.github/workflows/nexus-publish.yml b/.github/workflows/nexus-publish.yml
@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.11
+      - name: Set up JDK 1.8
         uses: actions/setup-java@v1
         with:
-          java-version: 1.11
+          java-version: 1.8
           settings-path: ${{ github.workspace }}
 
       - name: Load local Maven repository cache

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -28,7 +28,17 @@ This project adheres to `Semantic Versioning <https://semver.org/>`_.
 * Dynamic cost overview upon offer creation
 * Calculate prices of an offer (VAT, overheads, net price)
 * Create an unique offer id
-
+* Addressed `#124 <https://github.com/qbicsoftware/offer-manager-2-portlet/issues/124>`_
+* Addressed `#234 <https://github.com/qbicsoftware/offer-manager-2-portlet/issues/234>`_
+* Addressed `#246 <https://github.com/qbicsoftware/offer-manager-2-portlet/issues/246>`_
+* Addressed `#260 <https://github.com/qbicsoftware/offer-manager-2-portlet/issues/260>`_
+* Addressed `#269 <https://github.com/qbicsoftware/offer-manager-2-portlet/issues/269>`_
+* Addressed `#270 <https://github.com/qbicsoftware/offer-manager-2-portlet/issues/270>`_
+* Addressed `#271 <https://github.com/qbicsoftware/offer-manager-2-portlet/issues/270>`_
+* Addressed `#275 <https://github.com/qbicsoftware/offer-manager-2-portlet/issues/275>`_
+* Addressed `#282 <https://github.com/qbicsoftware/offer-manager-2-portlet/issues/282>`_
+* Addressed `#295 <https://github.com/qbicsoftware/offer-manager-2-portlet/issues/295>`_
+* Addressed `#309 <https://github.com/qbicsoftware/offer-manager-2-portlet/issues/309>`_
 
 **Fixed**
 

diff --git a/qoffer-infrastructure/pom.xml → offer-manager-app/pom.xml b/qoffer-infrastructure/pom.xml → offer-manager-app/pom.xml
@@ -3,35 +3,18 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>qOffer_2.0</artifactId>
+        <artifactId>offer-manager</artifactId>
         <groupId>life.qbic</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-alpha2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
-    <artifactId>qoffer-infrastructure</artifactId>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>maven-central-plugins</id>
-            <url>
-                https://repo.maven.apache.org/maven2
-            </url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>liferay-releases-plugins</id>
-            <url>
-                https://repository.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/portal/
-            </url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>qbic-plugins-2</id>
-            <url>https://qbic-repo.qbic.uni-tuebingen.de/repository/maven-releases</url>
-        </pluginRepository>
-    </pluginRepositories>
+    <artifactId>offer-manager-app</artifactId>
+    <name>The new offer manager</name>
     <dependencies>
         <dependency>
             <groupId>life.qbic</groupId>
-            <artifactId>qoffer-domain</artifactId>
+            <artifactId>offer-manager-domain</artifactId>
             <version>1.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
@@ -47,12 +30,12 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>2.6.0</version>
+            <version>2.7.2</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.22</version>
+            <version>8.0.23</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-dbcp2 -->
         <dependency>
@@ -100,6 +83,12 @@
             <artifactId>jsoup</artifactId>
             <version>1.13.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-resources-plugin</artifactId>
+            <version>3.2.0</version>
+            <type>maven-plugin</type>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -111,6 +100,18 @@
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                     <!-- Exclude an unnecessary file generated by the GWT compiler. -->
                     <packagingExcludes>WEB-INF/classes/VAADIN/widgetsets/WEB-INF/**</packagingExcludes>
+                    <webResources>
+                        <resource>
+                            <filtering>true</filtering>
+                            <directory>src/main/resources</directory>
+                            <targetPath>WEB-INF/classes</targetPath>
+                        </resource>
+                        <resource>
+                            <filtering>true</filtering>
+                            <directory>src/main/webapp/WEB-INF</directory>
+                            <targetPath>WEB-INF</targetPath>
+                        </resource>
+                    </webResources>
                 </configuration>
             </plugin>
 
@@ -135,16 +136,33 @@
             <groupId>com.vaadin</groupId>
             <artifactId>vaadin-maven-plugin</artifactId>
             <version>${vaadin.plugin.version}</version>
-            <executions>
-                <execution>
-                    <goals>
-                        <goal>update-theme</goal>
-                        <goal>update-widgetset</goal>
-                        <goal>compile</goal>
-                        <goal>compile-theme</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin></plugins>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>update-theme</goal>
+                            <goal>update-widgetset</goal>
+                            <goal>compile</goal>
+                            <goal>compile-theme</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.gmavenplus</groupId>
+                <artifactId>gmavenplus-plugin</artifactId>
+                <configuration>
+                    <groovyDocOutputDirectory>${project.build.directory}/site/gapidocs</groovyDocOutputDirectory>
+                    <testGroovyDocOutputDirectory>${project.build.directory}/site/testgapidocs</testGroovyDocOutputDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>life.qbic</groupId>
+                <artifactId>groovydoc-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </reporting>
 </project>