Skip to content

Commit efc147e

Browse files
committed
put the base files back to normal for pr
1 parent 0348e64 commit efc147e

File tree

4 files changed

+41
-33
lines changed

4 files changed

+41
-33
lines changed

.classpath

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,7 @@
2727
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
2828
<attributes>
2929
<attribute name="maven.pomderived" value="true"/>
30-
</attributes>
31-
</classpathentry>
32-
<classpathentry kind="src" output="target/test-classes" path="src/integration-test/java">
33-
<attributes>
34-
<attribute name="optional" value="true"/>
35-
<attribute name="maven.pomderived" value="true"/>
36-
<attribute name="test" value="true"/>
30+
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
3731
</attributes>
3832
</classpathentry>
3933
<classpathentry kind="output" path="target/classes"/>

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,4 @@ rebel.xml
55
rebel-remote.xml
66
*.iml
77
*.idea
8-
release.properties
9-
.classpath
10-
.project
8+
release.properties

.project

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
</arguments>
1717
</buildCommand>
1818
<buildCommand>
19-
<name>org.eclipse.wst.validation.validationbuilder</name>
19+
<name>org.eclipse.m2e.core.maven2Builder</name>
2020
<arguments>
2121
</arguments>
2222
</buildCommand>
2323
<buildCommand>
24-
<name>org.eclipse.m2e.core.maven2Builder</name>
24+
<name>org.eclipse.wst.validation.validationbuilder</name>
2525
<arguments>
2626
</arguments>
2727
</buildCommand>

pom.xml

Lines changed: 37 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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">
53
<modelVersion>4.0.0</modelVersion>
64

75
<groupId>edu.ksu.canvas</groupId>
86
<artifactId>canvas-api</artifactId>
9-
<version>1.9.0-LONG-SNAPSHOT</version>
7+
<version>1.9.0-SNAPSHOT</version>
108
<packaging>jar</packaging>
119

1210
<parent>
@@ -19,7 +17,7 @@
1917
<description>A native Java library to talk to the Canvas REST API</description>
2018
<url>https://github.com/kstateome/canvas-api</url>
2119

22-
<licenses>
20+
<licenses>
2321
<license>
2422
<name>GNU Lesser General Public License (LGPL), Version 3</name>
2523
<url>http://www.fsf.org/licensing/licenses/lgpl.txt</url>
@@ -42,22 +40,31 @@
4240
<organization>Kansas State University, Office of Mediated Education</organization>
4341
</developer>
4442
</developers>
43+
44+
<scm>
45+
<connection>scm:git:ssh://[email protected]/kstateome/canvas-api.git</connection>
46+
<developerConnection>scm:git:ssh://[email protected]/kstateome/canvas-api.git</developerConnection>
47+
<url>https://github.com/kstateome/canvas-api</url>
48+
<tag>HEAD</tag>
49+
</scm>
50+
51+
<distributionManagement>
52+
<repository>
53+
<id>ome-appdev-release</id>
54+
<url>https://artifactory.ome.k-state.edu/artifactory/ome-appdev-release</url>
55+
</repository>
56+
<snapshotRepository>
57+
<id>ome-appdev-snapshot</id>
58+
<url>https://artifactory.ome.k-state.edu/artifactory/ome-appdev-snapshot</url>
59+
</snapshotRepository>
60+
<site>
61+
<id>canvas-api-site</id>
62+
<url>file:///var/www/maven-site/canvas-api</url>
63+
</site>
64+
</distributionManagement>
4565

4666
<build>
4767
<plugins>
48-
<plugin>
49-
<groupId>org.apache.maven.plugins</groupId>
50-
<artifactId>maven-source-plugin</artifactId>
51-
<version>3.0.1</version>
52-
<executions>
53-
<execution>
54-
<id>attach-sources</id>
55-
<goals>
56-
<goal>jar-no-fork</goal>
57-
</goals>
58-
</execution>
59-
</executions>
60-
</plugin>
6168
<plugin>
6269
<groupId>org.owasp</groupId>
6370
<artifactId>dependency-check-maven</artifactId>
@@ -158,6 +165,16 @@
158165
</profile>
159166
<profile>
160167
<id>ossrh-deploy</id>
168+
<distributionManagement>
169+
<snapshotRepository>
170+
<id>ossrh</id>
171+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
172+
</snapshotRepository>
173+
<repository>
174+
<id>ossrh</id>
175+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
176+
</repository>
177+
</distributionManagement>
161178
<build>
162179
<plugins>
163180
<plugin>
@@ -355,8 +372,7 @@
355372
<groupId>org.slf4j</groupId>
356373
<artifactId>slf4j-simple</artifactId>
357374
<version>1.7.27</version>
358-
<!-- This is so that TestLauncher has an implementation but projects
359-
using this library don't get it -->
375+
<!-- This is so that TestLauncher has an implementation but projects using this library don't get it -->
360376
<optional>true</optional>
361377
</dependency>
362378
<dependency>
@@ -384,7 +400,7 @@
384400
<version>4.13.1</version>
385401
<scope>test</scope>
386402
</dependency>
387-
<dependency>
403+
<dependency>
388404
<groupId>org.springframework</groupId>
389405
<artifactId>spring-beans</artifactId>
390406
<version>4.2.0.RELEASE</version>

0 commit comments

Comments
 (0)