Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main #51

Merged
merged 31 commits into from
Sep 27, 2023
Merged

Main #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
07bc5e0
Added new release workflow
joaocatalao Jun 12, 2023
d218ad0
Merge 07bc5e017004a0c25a6e87c85eb2b37d0b76eb1c into 8edbc5fd56d802077…
joaocatalao Jun 12, 2023
95fef79
Commit from GitHub Actions (Update POM files version)
github-actions[bot] Jun 12, 2023
690b009
Merge 95fef796263347841fb6fe9cf54dd278f9683ff1 into 8edbc5fd56d802077…
joaocatalao Jun 12, 2023
5d9950e
Commit from GitHub Actions (Update POM files version)
github-actions[bot] Jun 12, 2023
0890178
Merge pull request #16 from assimbly/develop
skin27 Jun 12, 2023
1ee91ca
Update version to 4.0.3
skin27 Sep 26, 2023
457b191
resolve conflicts
skin27 Sep 26, 2023
10b676d
update version
skin27 Sep 26, 2023
ae9eadd
Update version to 4.0.3
skin27 Sep 26, 2023
1c35209
Merge branch 'main' into 4.0.3
skin27 Sep 26, 2023
f387bf9
Merge pull request #46 from assimbly/4.0.3
skin27 Sep 26, 2023
7111f87
Update version to 4.0.3
skin27 Sep 26, 2023
eaada99
Merge remote-tracking branch 'origin/4.0.3'
skin27 Sep 26, 2023
88036b1
Update pom.xml
skin27 Sep 26, 2023
e75a410
Merge pull request #47 from assimbly/skin27-patch-1
skin27 Sep 26, 2023
77ba9b5
Update new-release.yml
skin27 Sep 26, 2023
097a452
delete back workflow github actions
skin27 Sep 26, 2023
8de0eca
tenant variables pom.xml
skin27 Sep 26, 2023
4d79a17
pom.xml
skin27 Sep 26, 2023
f47248e
Update version to 4.0.3
skin27 Sep 26, 2023
b11ef4d
Merge branch 'main' into 4.0.3
skin27 Sep 26, 2023
70dac4c
Merge pull request #49 from assimbly/4.0.3
skin27 Sep 26, 2023
dd5581d
Update version to 4.0.3
skin27 Sep 26, 2023
b33a5f1
Merge remote-tracking branch 'origin/4.0.3'
skin27 Sep 26, 2023
fc6ed58
Update pom.xml
skin27 Sep 26, 2023
95c2bbe
Merge pull request #50 from assimbly/skin27-patch-1
skin27 Sep 26, 2023
6ac76e4
Update version to 4.0.3
skin27 Sep 26, 2023
d228b0a
Merge remote-tracking branch 'origin/4.0.3'
skin27 Sep 26, 2023
d2fe658
Update version to 4.0.3
skin27 Sep 26, 2023
13e6a6c
Merge remote-tracking branch 'origin/4.0.3'
skin27 Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .github/workflows/.new-release.yml.swp
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion .github/workflows/new-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,3 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}


2 changes: 1 addition & 1 deletion aggregate/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>custom-components</artifactId>
<groupId>org.assimbly</groupId>
<version>4.0.3-SNAPSHOT</version>
<version>4.0.3</version>
</parent>

<artifactId>aggregate</artifactId>
Expand Down
78 changes: 39 additions & 39 deletions aleris/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,53 @@
<parent>
<artifactId>custom-components</artifactId>
<groupId>org.assimbly</groupId>
<version>4.0.3-SNAPSHOT</version>
<version>4.0.3</version>
</parent>

<artifactId>aleris</artifactId>
<artifactId>aleris</artifactId>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.versions.rules>file:///${project.basedir}/../rules.xml</maven.versions.rules>
</properties>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.versions.rules>file:///${project.basedir}/../rules.xml</maven.versions.rules>
</properties>

<distributionManagement>
<distributionManagement>
<repository>
<id>github</id>
<name>Temporary Staging Repository</name>
<id>github</id>
<name>Temporary Staging Repository</name>
<url>https://maven.pkg.github.com/assimbly/custom-components</url>
</repository>
</distributionManagement>
</repository>
</distributionManagement>

<dependencies>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>${java-assist.version}</version>
</dependency>
<dependencies>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>${java-assist.version}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
</dependency>

</dependencies>
</dependencies>

<build>
<plugins>
Expand All @@ -75,4 +75,4 @@
</plugins>
</build>

</project>
</project>
2 changes: 1 addition & 1 deletion amazon/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>custom-components</artifactId>
<groupId>org.assimbly</groupId>
<version>4.0.3-SNAPSHOT</version>
<version>4.0.3</version>
</parent>

<artifactId>amazon</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion archive/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>custom-components</artifactId>
<groupId>org.assimbly</groupId>
<version>4.0.3-SNAPSHOT</version>
<version>4.0.3</version>
</parent>

<artifactId>archive</artifactId>
Expand Down
66 changes: 33 additions & 33 deletions auth/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
<?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">
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>custom-components</artifactId>
<groupId>org.assimbly</groupId>
<version>4.0.3-SNAPSHOT</version>
<version>4.0.3</version>
</parent>

<artifactId>auth</artifactId>
<artifactId>auth</artifactId>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.versions.rules>file:///${project.basedir}/../rules.xml</maven.versions.rules>
</properties>

<distributionManagement>
<distributionManagement>
<repository>
<id>github</id>
<name>Temporary Staging Repository</name>
<id>github</id>
<name>Temporary Staging Repository</name>
<url>https://maven.pkg.github.com/assimbly/custom-components</url>
</repository>
</distributionManagement>
</repository>
</distributionManagement>

<dependencies>
<dependencies>

<!-- Google Authenticator -->
<dependency>
<groupId>com.warrenstrange</groupId>
<artifactId>googleauth</artifactId>
<version>${google.auth.version}</version>
</dependency>
<!-- Google Authenticator -->
<dependency>
<groupId>com.warrenstrange</groupId>
<artifactId>googleauth</artifactId>
<version>${google.auth.version}</version>
</dependency>

<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
</dependency>

<!-- MongoDB connection -->
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
<version>${mongo.version}</version>
</dependency>
<dependency>
<groupId>org.mongodb.morphia</groupId>
<artifactId>morphia</artifactId>
<version>${morphia.version}</version>
</dependency>
<!-- MongoDB connection -->
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
<version>${mongo.version}</version>
</dependency>
<dependency>
<groupId>org.mongodb.morphia</groupId>
<artifactId>morphia</artifactId>
<version>${morphia.version}</version>
</dependency>

</dependencies>
</dependencies>

<build>
<plugins>
Expand All @@ -74,4 +74,4 @@
</plugins>
</build>

</project>
</project>
2 changes: 1 addition & 1 deletion cookies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>custom-components</artifactId>
<groupId>org.assimbly</groupId>
<version>4.0.3-SNAPSHOT</version>
<version>4.0.3</version>
</parent>

<artifactId>cookies</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion csvtoxml/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>custom-components</artifactId>
<groupId>org.assimbly</groupId>
<version>4.0.3-SNAPSHOT</version>
<version>4.0.3</version>
</parent>

<artifactId>csvtoxml</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion docconverter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>custom-components</artifactId>
<groupId>org.assimbly</groupId>
<version>4.0.3-SNAPSHOT</version>
<version>4.0.3</version>
</parent>

<artifactId>docconverter</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion edi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>custom-components</artifactId>
<groupId>org.assimbly</groupId>
<version>4.0.3-SNAPSHOT</version>
<version>4.0.3</version>
</parent>


Expand Down
Loading