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

Jump to bottom

Remove georchestra submodule #69

Merged
merged 1 commit into from
Nov 3, 2023
Merged

Remove georchestra submodule #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ jobs:
java-version: '11'
cache: 'maven'

- name: "Build georchestra dependencies"
run: make deps

- name: "Build gateway"
run: make install test

Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ jobs:
java-version: '11'
cache: 'maven'

- name: "Build georchestra dependencies"
run: make deps

- name: "Build gateway"
run: make install

Expand Down
5 changes: 0 additions & 5 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
[submodule "georchestra"]
path = georchestra
url = https://github.com/georchestra/georchestra.git
shallow = true
branch = master
[submodule "datadir"]
path = datadir
url = https://github.com/georchestra/datadir.git
Expand Down
5 changes: 1 addition & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
all: deps install test docker

deps:
./mvnw -f georchestra/ clean install -pl :georchestra-ldap-account-management -am -DskipTests -P-all -ntp
all: install test docker

install:
./mvnw clean install -pl :georchestra-gateway -ntp -DskipTests
Expand Down
1 change: 0 additions & 1 deletion georchestra
Open in desktop
Submodule georchestra deleted from 8e0a71
27 changes: 15 additions & 12 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<dependency>
<groupId>org.georchestra</groupId>
<artifactId>georchestra-ldap-account-management</artifactId>
<version>23.1-SNAPSHOT</version>
<version>${project.version}</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so you stick the gateway with the georchestra version ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

kind of makes sense? dunno, for the time being I didn't want to think to hard about it

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, it was just a remark while reviewing, it sounds ok to me

</dependency>
<!--spring-security-oauth2 dependencies version forced to 5.6.2
since later version have issues when extracting users information
Expand Down Expand Up @@ -72,6 +72,20 @@
</dependencies>
</dependencyManagement>
<repositories>
<repository>
<snapshots>
<enabled>true</enabled>
<checksumPolicy>ignore</checksumPolicy>
<updatePolicy>always</updatePolicy>
</snapshots>
<releases>
<enabled>true</enabled>
<checksumPolicy>ignore</checksumPolicy>
<updatePolicy>always</updatePolicy>
</releases>
<id>georchestra</id>
<url>https://artifactory.georchestra.org/artifactory/maven</url>
</repository>
<repository>
<snapshots>
<enabled>false</enabled>
Expand Down Expand Up @@ -114,15 +128,4 @@
</plugins>
</pluginManagement>
</build>
<profiles>
<profile>
<id>georchestra</id>
<activation><activeByDefault>true</activeByDefault></activation>
<modules>
<module>georchestra/commons</module>
<module>georchestra/testcontainers</module>
<module>georchestra/ldap-account-management</module>
</modules>
</profile>
</profiles>
</project>
Loading