Skip to content

Commit 46eeb39

Browse files
GEODE-1410: Fix artifacts published for modules
1 parent d757521 commit 46eeb39

30 files changed

Lines changed: 29 additions & 20 deletions

extensions/geode-modules-assembly/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,8 @@ task distAppServer(type: Zip, dependsOn: ':extensions/geode-modules-session:asse
167167
archiveName = "Apache_Geode_Modules-${version}-AppServer.zip"
168168

169169
into('lib') {
170-
// Use a closure here so that the evaluation is deferred. Without this the 'internal'
171-
// jar won't be picked up.
172-
from { getJarArtifact(':extensions/geode-modules-session') }
170+
from getJarArtifact(':extensions/geode-modules-session')
171+
from getJarArtifact(':extensions/geode-modules-session-internal')
173172
from getJarArtifact(':extensions/geode-modules')
174173
from configurations.slf4jDeps
175174
}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
dependencies {
19+
compile project(':extensions/geode-modules')
20+
compile project(':geode-core')
21+
}
22+
23+
jar {
24+
baseName = 'geode-modules-session-internal'
25+
}

extensions/geode-modules-session/src/main/java/com/gemstone/gemfire/modules/session/internal/common/AbstractSessionCache.java renamed to extensions/geode-modules-session-internal/src/main/java/com/gemstone/gemfire/modules/session/internal/common/AbstractSessionCache.java

File renamed without changes.

extensions/geode-modules-session/src/main/java/com/gemstone/gemfire/modules/session/internal/common/CacheProperty.java renamed to extensions/geode-modules-session-internal/src/main/java/com/gemstone/gemfire/modules/session/internal/common/CacheProperty.java

File renamed without changes.

extensions/geode-modules-session/src/main/java/com/gemstone/gemfire/modules/session/internal/common/ClientServerSessionCache.java renamed to extensions/geode-modules-session-internal/src/main/java/com/gemstone/gemfire/modules/session/internal/common/ClientServerSessionCache.java

File renamed without changes.

extensions/geode-modules-session/src/main/java/com/gemstone/gemfire/modules/session/internal/common/PeerToPeerSessionCache.java renamed to extensions/geode-modules-session-internal/src/main/java/com/gemstone/gemfire/modules/session/internal/common/PeerToPeerSessionCache.java

File renamed without changes.

extensions/geode-modules-session/src/main/java/com/gemstone/gemfire/modules/session/internal/common/SessionCache.java renamed to extensions/geode-modules-session-internal/src/main/java/com/gemstone/gemfire/modules/session/internal/common/SessionCache.java

File renamed without changes.

extensions/geode-modules-session/src/main/java/com/gemstone/gemfire/modules/session/internal/common/SessionExpirationCacheListener.java renamed to extensions/geode-modules-session-internal/src/main/java/com/gemstone/gemfire/modules/session/internal/common/SessionExpirationCacheListener.java

File renamed without changes.

extensions/geode-modules-session/src/main/java/com/gemstone/gemfire/modules/session/internal/filter/Constants.java renamed to extensions/geode-modules-session-internal/src/main/java/com/gemstone/gemfire/modules/session/internal/filter/Constants.java

File renamed without changes.

extensions/geode-modules-session/src/main/java/com/gemstone/gemfire/modules/session/internal/filter/DummySessionManager.java renamed to extensions/geode-modules-session-internal/src/main/java/com/gemstone/gemfire/modules/session/internal/filter/DummySessionManager.java

File renamed without changes.

0 commit comments

Comments
 (0)