Skip to content
New issue

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

#

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

Already on GitHub? # to your account

review chore:Use Maven INRIA instead of Gforge to deploy snapshots #1900

Merged
merged 4 commits into from
Mar 13, 2018
Merged

review chore:Use Maven INRIA instead of Gforge to deploy snapshots #1900

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f9768a
Use Maven INRIA instead of Gforge to deploy snapshots
surli Mar 9, 2018
faa0177
Fix readme and remove old repository section in pom
surli Mar 9, 2018
67ce93f
Replace missing mentions of snapshots
surli Mar 12, 2018
f8d0163
Simplify pom.xml
surli Mar 13, 2018
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
9 changes: 4 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,10 @@ Snapshot version:
</dependencies>
<repositories>
<repository>
<id>gforge.inria.fr-snapshot</id>
<name>Maven Repository for Spoon Snapshot</name>
<url>http://spoon.gforge.inria.fr/repositories/snapshots/</url>
<snapshots />
</repository>
<id>maven.inria.fr-snapshot</id>
<name>Maven Repository for Spoon Snapshots</name>
<url>http://maven.inria.fr/artifactory/repo/spoon-public-snapshot</url>
</repository>
</repositories>
```

Expand Down
9 changes: 4 additions & 5 deletions doc/doc_homepage.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,10 @@ Snapshot version:
</dependencies>
<repositories>
<repository>
<id>gforge.inria.fr-snapshot</id>
<name>Maven Repository for Spoon Snapshot</name>
<url>http://spoon.gforge.inria.fr/repositories/snapshots/</url>
<snapshots />
</repository>
<id>maven.inria.fr-snapshot</id>
<name>Maven Repository for Spoon Snapshots</name>
<url>http://maven.inria.fr/artifactory/repo/spoon-public-snapshot</url>
</repository>
</repositories>
```

Expand Down
4 changes: 2 additions & 2 deletions doc/jenkins/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ echo " "
# Edits pom xml to prepare project to spoon project.
xmlstarlet ed -N x="http://maven.apache.org/POM/4.0.0" -s "/x:project" --type elem -n repositories -v "" pom.xml > pom.bak.xml
xmlstarlet ed -N x="http://maven.apache.org/POM/4.0.0" -s "/x:project/x:repositories" --type elem -n repository -v "" pom.bak.xml > pom.bak1.xml
xmlstarlet ed -N x="http://maven.apache.org/POM/4.0.0" -s "/x:project/x:repositories/x:repository[last()]" --type elem -n id -v "gforge.inria.fr-snapshot" pom.bak1.xml > pom.bak2.xml
xmlstarlet ed -N x="http://maven.apache.org/POM/4.0.0" -s "/x:project/x:repositories/x:repository[last()]" --type elem -n id -v "maven.inria.fr-snapshot" pom.bak1.xml > pom.bak2.xml
xmlstarlet ed -N x="http://maven.apache.org/POM/4.0.0" -s "/x:project/x:repositories/x:repository[last()]" --type elem -n name -v "Maven Repository for Spoon Snapshot" pom.bak2.xml > pom.bak3.xml
xmlstarlet ed -N x="http://maven.apache.org/POM/4.0.0" -s "/x:project/x:repositories/x:repository[last()]" --type elem -n url -v "http://spoon.gforge.inria.fr/repositories/snapshots/" pom.bak3.xml > pom.bak4.xml
xmlstarlet ed -N x="http://maven.apache.org/POM/4.0.0" -s "/x:project/x:repositories/x:repository[last()]" --type elem -n url -v "http://maven.inria.fr/artifactory/repo/spoon-public-snapshot/" pom.bak3.xml > pom.bak4.xml
xmlstarlet ed -N x="http://maven.apache.org/POM/4.0.0" -s "/x:project/x:repositories/x:repository[last()]" --type elem -n snapshots -v "" pom.bak4.xml > pom.bak5.xml
mv pom.bak5.xml pom.xml
rm pom.bak*.xml
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@
<url>http://spoon.gforge.inria.fr/repositories/releases</url>
</repository>
<repository>
<id>gforge.inria.fr-snapshot</id>
<id>maven.inria.fr-snapshot</id>
Copy link
Collaborator

Choose a reason for hiding this comment

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

I guess we can remove the whole repository tag since we release on Central, and lonly keep the snapshotRepository?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I suppose we can indeed. I just kept the same pattern as before.

<name>Maven Repository for Spoon Snapshots</name>
<url>http://spoon.gforge.inria.fr/repositories/snapshots</url>
<url>http://maven.inria.fr/artifactory/repo/spoon-public-snapshot</url>
</repository>
</repositories>

Expand All @@ -181,9 +181,9 @@
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
<snapshotRepository>
<id>gforge.inria.fr-snapshot</id>
<name>inria-snapshots</name>
<url>scp://scm.gforge.inria.fr/home/groups/spoon/htdocs/repositories/snapshots</url>
<id>maven.inria.fr-snapshot</id>
<name>http://maven.inria.fr-snapshots</name>
Copy link
Collaborator

Choose a reason for hiding this comment

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

What about avoiding http://, it may be confusing, looking like a URL and not a name.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Ok I'll change it.

<url>http://maven.inria.fr/artifactory/spoon-public-snapshot</url>
</snapshotRepository>
<site>
<id>gforge.inria.fr-site</id>
Expand Down